firebase-tools 14.25.1 → 14.26.0

package/lib/dataconnect/freeTrial.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgradeInstructions = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
 const clc = require("colorette");
 const cloudmonitoring_1 = require("../gcp/cloudmonitoring");
-const utils = require("../utils");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
@@ -27,17 +26,11 @@ async function checkFreeTrialInstanceUsed(projectId) {
     catch (err) {
         used = false;
     }
-    if (used) {
-        utils.logLabeledWarning("dataconnect", "CloudSQL no cost trial has already been used on this project.");
-    }
-    else {
-        utils.logLabeledSuccess("dataconnect", "CloudSQL no cost trial available!");
-    }
     return used;
 }
 exports.checkFreeTrialInstanceUsed = checkFreeTrialInstanceUsed;
-function upgradeInstructions(projectId) {
-    return `To provision a CloudSQL Postgres instance on the Firebase Data Connect no-cost trial:
+function upgradeInstructions(projectId, trialUsed) {
+    return `To provision a ${trialUsed ? "paid CloudSQL Postgres instance" : "CloudSQL Postgres instance on the Firebase Data Connect no-cost trial"}:
 
   1. Please upgrade to the pay-as-you-go (Blaze) billing plan. Visit the following page:
 

package/lib/dataconnect/provisionCloudSql.js

@@ -9,6 +9,7 @@ const freeTrial_1 = require("./freeTrial");
 const utils_1 = require("../utils");
 const track_1 = require("../track");
 const utils = require("../utils");
+const cloudbilling_1 = require("../gcp/cloudbilling");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 async function setupCloudSql(args) {
     var _a;
@@ -86,19 +87,22 @@ async function createInstance(args) {
             enableGoogleMlIntegration: requireGoogleMlIntegration,
             freeTrialLabel,
         });
-        utils.logLabeledBullet("dataconnect", cloudSQLBeingCreated(projectId, instanceId, freeTrialLabel === "ft"));
+        utils.logLabeledBullet("dataconnect", cloudSQLBeingCreated(projectId, instanceId, freeTrialLabel === "ft", await (0, cloudbilling_1.checkBillingEnabled)(projectId)));
     }
 }
-function cloudSQLBeingCreated(projectId, instanceId, includeFreeTrialToS) {
+function cloudSQLBeingCreated(projectId, instanceId, isFreeTrial, billingEnabled) {
     return (`Cloud SQL Instance ${clc.bold(instanceId)} is being created.` +
-        (includeFreeTrialToS
+        (isFreeTrial
             ? `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}`
             : "") +
-        `
-   Meanwhile, your data are saved in a temporary database and will be migrated once complete. Monitor its progress at
-
-   ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}
-`);
+        `\n
+   Meanwhile, your data are saved in a temporary database and will be migrated once complete.` +
+        (isFreeTrial && !billingEnabled
+            ? ` 
+   Your free trial instance won't show in google cloud console until a billing account is added.
+   However, you can still use the gcloud cli to monitor your database instance:\n\n\te.g. gcloud sql instances list --project ${projectId}\n`
+            : ` 
+   Monitor its progress at\n\n\t${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}\n`));
 }
 exports.cloudSQLBeingCreated = cloudSQLBeingCreated;
 async function upsertDatabase(args) {

package/lib/deploy/dataconnect/prepare.js

@@ -11,12 +11,11 @@ const ensureApis_1 = require("../../dataconnect/ensureApis");
 const requireTosAcceptance_1 = require("../../requireTosAcceptance");
 const firedata_1 = require("../../gcp/firedata");
 const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
-const cloudbilling_1 = require("../../gcp/cloudbilling");
 const names_1 = require("../../dataconnect/names");
 const error_1 = require("../../error");
 const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
-const freeTrial_1 = require("../../dataconnect/freeTrial");
+const cloudbilling_1 = require("../../gcp/cloudbilling");
 const context_1 = require("./context");
 async function default_1(context, options) {
     var _a, _b, _c;
@@ -30,7 +29,6 @@ async function default_1(context, options) {
     const { serviceInfos, filters, deployStats } = context.dataconnect;
     if (!(await (0, cloudbilling_1.checkBillingEnabled)(projectId))) {
         deployStats.missingBilling = true;
-        throw new error_1.FirebaseError((0, freeTrial_1.upgradeInstructions)(projectId));
     }
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
     for (const si of serviceInfos) {

package/lib/deploy/functions/remoteSource.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireFunctionsYaml = exports.getRemoteSource = void 0;
+const fs = require("fs");
+const path = require("path");
+const url_1 = require("url");
+const error_1 = require("../../error");
+const logger_1 = require("../../logger");
+const utils_1 = require("../../utils");
+const fsutils_1 = require("../../fsutils");
+const downloadUtils = require("../../downloadUtils");
+const unzipModule = require("../../unzip");
+async function getRemoteSource(repository, ref, destDir, subDir) {
+    logger_1.logger.debug(`Downloading remote source: ${repository}@${ref} (destDir: ${destDir}, subDir: ${subDir || "."})`);
+    const gitHubInfo = parseGitHubUrl(repository);
+    if (!gitHubInfo) {
+        throw new error_1.FirebaseError(`Could not parse GitHub repository URL: ${repository}. ` +
+            `Only GitHub repositories are supported.`);
+    }
+    let rootDir = destDir;
+    try {
+        logger_1.logger.debug(`Attempting to download via GitHub Archive API for ${repository}@${ref}...`);
+        const archiveUrl = `https://github.com/${gitHubInfo.owner}/${gitHubInfo.repo}/archive/${ref}.zip`;
+        const archivePath = await downloadUtils.downloadToTmp(archiveUrl);
+        logger_1.logger.debug(`Downloaded archive to ${archivePath}, unzipping...`);
+        await unzipModule.unzip(archivePath, destDir);
+        const files = fs.readdirSync(destDir);
+        if (files.length === 1 && fs.statSync(path.join(destDir, files[0])).isDirectory()) {
+            rootDir = path.join(destDir, files[0]);
+            logger_1.logger.debug(`Found top-level directory in archive: ${files[0]}`);
+        }
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to download GitHub archive for ${repository}@${ref}. ` +
+            `Make sure the repository is public and the ref exists. ` +
+            `Private repositories are not supported via this method.`, { original: err });
+    }
+    const sourceDir = subDir
+        ? (0, utils_1.resolveWithin)(rootDir, subDir, `Subdirectory '${subDir}' in remote source must not escape the repository root.`)
+        : rootDir;
+    if (subDir && !(0, fsutils_1.dirExistsSync)(sourceDir)) {
+        throw new error_1.FirebaseError(`Directory '${subDir}' not found in repository ${repository}@${ref}`);
+    }
+    const origin = `${repository}@${ref}${subDir ? `/${subDir}` : ""}`;
+    (0, utils_1.logLabeledBullet)("functions", `downloaded remote source (${origin})`);
+    return sourceDir;
+}
+exports.getRemoteSource = getRemoteSource;
+function parseGitHubUrl(url) {
+    const shorthandMatch = /^[a-zA-Z0-9-]+\/[a-zA-Z0-9-_.]+$/.exec(url);
+    if (shorthandMatch) {
+        const [owner, repo] = url.split("/");
+        return { owner, repo };
+    }
+    try {
+        const u = new url_1.URL(url);
+        if (u.hostname !== "github.com") {
+            return undefined;
+        }
+        const parts = u.pathname.split("/").filter((p) => !!p);
+        if (parts.length < 2) {
+            return undefined;
+        }
+        const owner = parts[0];
+        let repo = parts[1];
+        if (repo.endsWith(".git")) {
+            repo = repo.slice(0, -4);
+        }
+        return { owner, repo };
+    }
+    catch (_a) {
+        return undefined;
+    }
+}
+function requireFunctionsYaml(codeDir) {
+    const functionsYamlPath = path.join(codeDir, "functions.yaml");
+    if (!(0, fsutils_1.fileExistsSync)(functionsYamlPath)) {
+        throw new error_1.FirebaseError(`The remote repository is missing a required deployment manifest (functions.yaml).\n\n` +
+            `For your security, Firebase requires a static manifest to deploy functions from a remote source. ` +
+            `This prevents the execution of arbitrary code on your machine during the function discovery process.\n\n` +
+            `If you trust this repository and want to use it anyway, clone the repository locally, inspect the code for safety, and deploy it as a local source.`);
+    }
+}
+exports.requireFunctionsYaml = requireFunctionsYaml;

package/lib/deploy/functions/runtimes/supported/types.js

@@ -59,6 +59,12 @@ exports.RUNTIMES = runtimes({
         deprecationDate: "2027-04-30",
         decommissionDate: "2028-10-31",
     },
+    nodejs24: {
+        friendly: "Node.js 24",
+        status: "beta",
+        deprecationDate: "2028-04-30",
+        decommissionDate: "2028-10-31",
+    },
     python310: {
         friendly: "Python 3.10",
         status: "GA",

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.17.1",
-            "expectedSize": 30004064,
-            "expectedChecksum": "89314d496595b250e149d8705ccd2ddc",
-            "expectedChecksumSHA256": "1e95733bf75fd433047345cb4c069ff4ddd2a2e296c53da3787dd708a26a8642",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+            "version": "2.17.2",
+            "expectedSize": 30012256,
+            "expectedChecksum": "9e8d43abb6e93f4c969088078fdaf780",
+            "expectedChecksumSHA256": "6001b86795f727f90755b497cba7ebcd2f50d024b0e56d1d6e957fcb98ff463c",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
         },
         "darwin_arm64": {
-            "version": "2.17.1",
-            "expectedSize": 29476450,
-            "expectedChecksum": "038125be57400e11f5013001cf68ce9e",
-            "expectedChecksumSHA256": "a11f6ea1f8b8d80f502df6e9b34865fb12186b4157f2c282a0e6f99c53077ca2",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+            "version": "2.17.2",
+            "expectedSize": 29475730,
+            "expectedChecksum": "1a82213baded25c2a6c584a72a5600f2",
+            "expectedChecksumSHA256": "c51a6810e975e13ac5ea5f038addf259da8b0d17b0b739dab1267dca133e5a54",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
         },
         "win32": {
-            "version": "2.17.1",
-            "expectedSize": 30496768,
-            "expectedChecksum": "939a77bb9a549bc9460f888ac3442397",
-            "expectedChecksumSHA256": "04d6859668c4afc1fa301f5cc892623669bcbf26ce5195bc80dc208783c33853",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1.exe"
+            "version": "2.17.2",
+            "expectedSize": 30507008,
+            "expectedChecksum": "1a071a45267279463516f8264aaa5a97",
+            "expectedChecksumSHA256": "8f84b312a049f80e2f9466eb1f77d15e1dedec8ce0696c51fc221fbb3b436eee",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2.exe"
         },
         "linux": {
-            "version": "2.17.1",
-            "expectedSize": 29925560,
-            "expectedChecksum": "239d20f4aedf0bf6f79caca7453bf5cf",
-            "expectedChecksumSHA256": "756fa6343a659a8a2606ee0df2a321ffaf47645fff8f4b209286681ee36820e3",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
+            "version": "2.17.2",
+            "expectedSize": 29937848,
+            "expectedChecksum": "70bc4fc8eecc1c1c6dd4f404ed7e2b89",
+            "expectedChecksumSHA256": "9b90874daf84f0cfb7ae72f3a8c4ccec523593ccd318cd967f5bef7d574efa77",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.2"
         }
     }
 }

package/lib/experiments.js

@@ -114,6 +114,11 @@ exports.ALL_EXPERIMENTS = experiments({
         default: false,
         public: true,
     },
+    fdcift: {
+        shortDescription: "Enable instrumentless trial for Data Connect",
+        public: false,
+        default: false,
+    },
     apptesting: {
         shortDescription: "Adds experimental App Testing feature",
         public: true,

package/lib/fsAsync.js

@@ -19,7 +19,9 @@ async function readdirRecursiveHelper(options) {
         if (!fstat.isDirectory()) {
             continue;
         }
-        filePromises.push(readdirRecursiveHelper({ path: p, filter: options.filter }));
+        if (options.maxDepth > 1) {
+            filePromises.push(readdirRecursiveHelper({ path: p, filter: options.filter, maxDepth: options.maxDepth - 1 }));
+        }
     }
     const files = await Promise.all(filePromises);
     let flatFiles = _.flattenDeep(files);
@@ -42,9 +44,11 @@ async function readdirRecursive(options) {
             return rule(t);
         });
     };
+    const maxDepth = options.maxDepth && options.maxDepth > 0 ? options.maxDepth : Infinity;
     return await readdirRecursiveHelper({
         path: options.path,
         filter: filter,
+        maxDepth,
     });
 }
 exports.readdirRecursive = readdirRecursive;

package/lib/gcp/runv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceFromEndpoint = exports.endpointFromService = exports.FIREBASE_FUNCTION_METADTA_ANNOTATION = exports.FUNCTION_SIGNATURE_TYPE_ENV = exports.FUNCTION_TARGET_ENV = exports.FUNCTION_ID_ANNOTATION = exports.FUNCTION_TARGET_ANNOTATION = exports.TRIGGER_TYPE_ANNOTATION = exports.CLIENT_NAME_LABEL = exports.RUNTIME_LABEL = exports.updateService = exports.submitBuild = exports.API_VERSION = void 0;
+exports.serviceFromEndpoint = exports.endpointFromService = exports.FIREBASE_FUNCTION_METADTA_ANNOTATION = exports.FUNCTION_SIGNATURE_TYPE_ENV = exports.FUNCTION_TARGET_ENV = exports.FUNCTION_ID_ANNOTATION = exports.FUNCTION_TARGET_ANNOTATION = exports.TRIGGER_TYPE_ANNOTATION = exports.CLIENT_NAME_LABEL = exports.RUNTIME_LABEL = exports.listServices = exports.updateService = exports.submitBuild = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -48,6 +48,34 @@ async function updateService(service) {
     return svc;
 }
 exports.updateService = updateService;
+async function listServices(projectId) {
+    var _a, _b;
+    const allServices = [];
+    let pageToken = undefined;
+    do {
+        const queryParams = {};
+        if (pageToken) {
+            queryParams["pageToken"] = pageToken;
+        }
+        const res = await client.get(`/projects/${projectId}/locations/-/services`, { queryParams });
+        if (res.status !== 200) {
+            throw new error_1.FirebaseError(`Failed to list services. HTTP Error: ${res.status}`, {
+                original: res.body,
+            });
+        }
+        if (res.body.services) {
+            for (const service of res.body.services) {
+                if (((_a = service.labels) === null || _a === void 0 ? void 0 : _a[exports.CLIENT_NAME_LABEL]) === "cloud-functions" ||
+                    ((_b = service.labels) === null || _b === void 0 ? void 0 : _b[exports.CLIENT_NAME_LABEL]) === "firebase-functions") {
+                    allServices.push(service);
+                }
+            }
+        }
+        pageToken = res.body.nextPageToken;
+    } while (pageToken);
+    return allServices;
+}
+exports.listServices = listServices;
 function functionNameToServiceName(id) {
     return id.toLowerCase().replace(/_/g, "-");
 }
@@ -60,7 +88,7 @@ exports.FUNCTION_TARGET_ENV = "FUNCTION_TARGET";
 exports.FUNCTION_SIGNATURE_TYPE_ENV = "FUNCTION_SIGNATURE_TYPE";
 exports.FIREBASE_FUNCTION_METADTA_ANNOTATION = "firebase-functions-metadata";
 function endpointFromService(service) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const [, project, , location, , svcId] = service.name.split("/");
     const metadata = JSON.parse(((_a = service.annotations) === null || _a === void 0 ? void 0 : _a[exports.FIREBASE_FUNCTION_METADTA_ANNOTATION]) || "{}");
     const [env, secretEnv] = (0, functional_1.partition)(service.template.containers[0].env || [], (e) => "value" in e);
@@ -74,21 +102,18 @@ function endpointFromService(service) {
         __1.logger.debug("Converting a service to an endpoint with an invalid memory option", memory);
     }
     const cpu = Number(service.template.containers[0].resources.limits.cpu);
-    const endpoint = {
-        platform: ((_e = service.labels) === null || _e === void 0 ? void 0 : _e[exports.CLIENT_NAME_LABEL]) === "cloud-functions" ? "gcfv2" : "run",
-        id,
-        project,
-        labels: service.labels || {},
-        region: location,
-        runtime: ((_f = service.labels) === null || _f === void 0 ? void 0 : _f[exports.RUNTIME_LABEL]) || (0, supported_1.latest)("nodejs"),
-        availableMemoryMb: memory,
-        cpu: cpu,
-        entryPoint: ((_g = env.find((e) => e.name === exports.FUNCTION_TARGET_ENV)) === null || _g === void 0 ? void 0 : _g.value) ||
+    const endpoint = Object.assign({ platform: ((_e = service.labels) === null || _e === void 0 ? void 0 : _e[exports.CLIENT_NAME_LABEL]) === "cloud-functions" ? "gcfv2" : "run", id,
+        project, labels: service.labels || {}, region: location, runtime: ((_f = service.labels) === null || _f === void 0 ? void 0 : _f[exports.RUNTIME_LABEL]) || (0, supported_1.latest)("nodejs"), availableMemoryMb: memory, cpu: cpu, entryPoint: ((_g = env.find((e) => e.name === exports.FUNCTION_TARGET_ENV)) === null || _g === void 0 ? void 0 : _g.value) ||
             ((_h = service.annotations) === null || _h === void 0 ? void 0 : _h[exports.FUNCTION_TARGET_ANNOTATION]) ||
             ((_j = service.annotations) === null || _j === void 0 ? void 0 : _j[exports.FUNCTION_ID_ANNOTATION]) ||
-            id,
-        httpsTrigger: {},
-    };
+            id }, (((_k = service.annotations) === null || _k === void 0 ? void 0 : _k[exports.TRIGGER_TYPE_ANNOTATION]) === "HTTP_TRIGGER"
+        ? { httpsTrigger: {} }
+        : {
+            eventTrigger: {
+                eventType: ((_l = service.annotations) === null || _l === void 0 ? void 0 : _l[exports.TRIGGER_TYPE_ANNOTATION]) || "unknown",
+                retry: false,
+            },
+        }));
     proto.renameIfPresent(endpoint, service.template, "concurrency", "containerConcurrency");
     proto.renameIfPresent(endpoint, service.labels || {}, "codebase", constants_1.CODEBASE_LABEL);
     proto.renameIfPresent(endpoint, service.scaling || {}, "minInstances", "minInstanceCount");

package/lib/init/features/dataconnect/index.js

@@ -22,9 +22,11 @@ const sdk = require("./sdk");
 const fdcExperience_1 = require("../../../gemini/fdcExperience");
 const configstore_1 = require("../../../configstore");
 const track_1 = require("../../../track");
+const experiments_1 = require("../../../experiments");
 exports.FDC_DEFAULT_REGION = "us-east4";
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
 const DATACONNECT_WEBHOOKS_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdcwebhooks.yaml");
+const SECONDARY_SCHEMA_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/secondary_schema.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
@@ -61,7 +63,6 @@ async function askQuestions(setup) {
         shouldProvisionCSQL: false,
     };
     if (setup.projectId) {
-        const hasBilling = await (0, cloudbilling_1.isBillingEnabled)(setup);
         await (0, ensureApis_1.ensureApis)(setup.projectId);
         await promptForExistingServices(setup, info);
         if (!info.serviceGql) {
@@ -86,12 +87,7 @@ async function askQuestions(setup) {
                 });
             }
         }
-        if (hasBilling) {
-            await promptForCloudSQL(setup, info);
-        }
-        else if (info.appDescription) {
-            await promptForLocation(setup, info);
-        }
+        await promptForCloudSQL(setup, info);
     }
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnect = info;
@@ -132,9 +128,6 @@ async function actuate(setup, config, options) {
 
     https://console.firebase.google.com/project/${setup.projectId}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`);
     }
-    if (!(await (0, cloudbilling_1.isBillingEnabled)(setup))) {
-        setup.instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId || "your-firebase-project"));
-    }
     setup.instructions.push(`Install the Data Connect VS Code Extensions. You can explore Data Connect Query on local pgLite and Cloud SQL Postgres Instance.`);
 }
 exports.actuate = actuate;
@@ -146,8 +139,7 @@ async function actuateWithInfo(setup, config, info, options) {
         return await writeFiles(config, info, templateServiceInfo, options);
     }
     await (0, ensureApis_1.ensureApis)(projectId, true);
-    const provisionCSQL = info.shouldProvisionCSQL && (await (0, cloudbilling_1.isBillingEnabled)(setup));
-    if (provisionCSQL) {
+    if (info.shouldProvisionCSQL) {
         await (0, provisionCloudSql_1.setupCloudSql)({
             projectId: projectId,
             location: info.locationId,
@@ -178,7 +170,7 @@ async function actuateWithInfo(setup, config, info, options) {
         return await writeFiles(config, info, { schemaGql: schemaFiles, connectors: [] }, options);
     }
     await (0, utils_1.promiseWithSpinner)(async () => {
-        const [saveSchemaGql, waitForCloudSQLProvision] = schemasDeploySequence(projectId, info, schemaFiles, provisionCSQL);
+        const [saveSchemaGql, waitForCloudSQLProvision] = schemasDeploySequence(projectId, info, schemaFiles, info.shouldProvisionCSQL);
         await (0, client_1.upsertSchema)(saveSchemaGql);
         if (waitForCloudSQLProvision) {
             void (0, client_1.upsertSchema)(waitForCloudSQLProvision);
@@ -262,8 +254,9 @@ function schemasDeploySequence(projectId, info, schemaFiles, linkToCloudSql) {
     ];
 }
 async function writeFiles(config, info, serviceGql, options) {
+    var _a, _b;
     const dir = config.get("dataconnect.source") || "dataconnect";
-    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: serviceGql.connectors.map((c) => c.path) }));
+    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: serviceGql.connectors.map((c) => c.path) }), (_a = serviceGql.secondarySchemaGqls) === null || _a === void 0 ? void 0 : _a.map((sch) => ({ id: sch.id, uri: sch.uri })));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, !!options.force, true);
     if (serviceGql.seedDataGql) {
@@ -277,6 +270,13 @@ async function writeFiles(config, info, serviceGql, options) {
     else {
         fs.ensureFileSync((0, path_1.join)(dir, "schema", "schema.gql"));
     }
+    if ((_b = serviceGql.secondarySchemaGqls) === null || _b === void 0 ? void 0 : _b.length) {
+        for (const sch of serviceGql.secondarySchemaGqls) {
+            for (const f of sch.files) {
+                await config.askWriteProjectFile((0, path_1.join)(dir, `schema_${sch.id}`, f.path), f.content, !!options.force);
+            }
+        }
+    }
     for (const c of serviceGql.connectors) {
         await writeConnectorFiles(config, c, options);
     }
@@ -289,17 +289,33 @@ async function writeConnectorFiles(config, connectorInfo, options) {
         await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, f.path), f.content, !!options.force);
     }
 }
-function subDataconnectYamlValues(replacementValues) {
+function subDataconnectYamlValues(replacementValues, secondarySchemas) {
     const replacements = {
         serviceId: "__serviceId__",
         locationId: "__location__",
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
         connectorDirs: "__connectorDirs__",
+        secondarySchemaId: "__secondarySchemaId__",
+        secondarySchemaSource: "__secondarySchemaSource__",
+        secondarySchemaUri: "__secondarySchemaUri__",
     };
     let replaced = experiments.isEnabled("fdcwebhooks")
         ? DATACONNECT_WEBHOOKS_YAML_TEMPLATE
         : DATACONNECT_YAML_TEMPLATE;
+    if (secondarySchemas && secondarySchemas.length > 0) {
+        let secondaryReplaced = "";
+        for (const schema of secondarySchemas) {
+            secondaryReplaced += SECONDARY_SCHEMA_YAML_TEMPLATE;
+            secondaryReplaced = secondaryReplaced.replace(replacements.secondarySchemaId, JSON.stringify(schema.id));
+            secondaryReplaced = secondaryReplaced.replace(replacements.secondarySchemaSource, `"./schema_${schema.id}"`);
+            secondaryReplaced = secondaryReplaced.replace(replacements.secondarySchemaUri, JSON.stringify(schema.uri));
+        }
+        replaced = replaced.replace("#__secondarySchemaPlaceholder__\n", secondaryReplaced);
+    }
+    else {
+        replaced = replaced.replace("#__secondarySchemaPlaceholder__\n", "");
+    }
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
@@ -337,7 +353,7 @@ async function promptForExistingServices(setup, info) {
     await downloadService(info, choice.name);
 }
 async function downloadService(info, serviceName) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     let schemas = [];
     try {
         schemas = await (0, client_1.listSchemas)(serviceName, [
@@ -364,16 +380,29 @@ async function downloadService(info, serviceName) {
             },
         ],
     };
-    const mainSch = (0, types_1.mainSchema)(schemas);
-    const primaryDatasource = mainSch.datasources.find((d) => d.postgresql);
-    if ((_b = (_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance) {
-        const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
-        info.cloudSqlInstanceId = instanceName.instanceId;
-    }
-    if ((_c = mainSch.source.files) === null || _c === void 0 ? void 0 : _c.length) {
-        info.serviceGql.schemaGql = mainSch.source.files;
+    for (const sch of schemas) {
+        if ((0, types_1.isMainSchema)(sch)) {
+            const primaryDatasource = sch.datasources.find((d) => d.postgresql);
+            if ((_b = (_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance) {
+                const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
+                info.cloudSqlInstanceId = instanceName.instanceId;
+            }
+            info.cloudSqlDatabase = (_d = (_c = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
+            if ((_e = sch.source.files) === null || _e === void 0 ? void 0 : _e.length) {
+                info.serviceGql.schemaGql = sch.source.files;
+            }
+        }
+        else {
+            if (!info.serviceGql.secondarySchemaGqls) {
+                info.serviceGql.secondarySchemaGqls = [];
+            }
+            info.serviceGql.secondarySchemaGqls.push({
+                id: sch.name.split("/").pop(),
+                files: sch.source.files || [],
+                uri: (_g = (_f = sch.datasources[0].httpGraphql) === null || _f === void 0 ? void 0 : _f.uri) !== null && _g !== void 0 ? _g : "",
+            });
+        }
     }
-    info.cloudSqlDatabase = (_e = (_d = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
     const connectors = await (0, client_1.listConnectors)(serviceName, [
         "connectors.name",
         "connectors.source.files",
@@ -424,6 +453,24 @@ async function promptForCloudSQL(setup, info) {
     if (!setup.projectId) {
         return;
     }
+    const instrumentlessTrialEnabled = (0, experiments_1.isEnabled)("fdcift");
+    const billingEnabled = await (0, cloudbilling_1.isBillingEnabled)(setup);
+    const freeTrialUsed = await (0, freeTrial_1.checkFreeTrialInstanceUsed)(setup.projectId);
+    const freeTrialAvailable = !freeTrialUsed && (billingEnabled || instrumentlessTrialEnabled);
+    if (!billingEnabled && !instrumentlessTrialEnabled) {
+        setup.instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId || "your-firebase-project", false));
+        return;
+    }
+    if (freeTrialUsed) {
+        (0, utils_1.logLabeledWarning)("dataconnect", "CloudSQL no cost trial has already been used on this project.");
+        if (!billingEnabled) {
+            setup.instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId || "your-firebase-project", true));
+            return;
+        }
+    }
+    else if (instrumentlessTrialEnabled || billingEnabled) {
+        (0, utils_1.logLabeledSuccess)("dataconnect", "CloudSQL no cost trial available!");
+    }
     if (info.cloudSqlInstanceId === "") {
         const instances = await cloudsql.listInstances(setup.projectId);
         let choices = instances.map((i) => {
@@ -436,7 +483,7 @@ async function promptForCloudSQL(setup, info) {
         });
         choices = choices.filter((c) => info.locationId === "" || info.locationId === c.location);
         if (choices.length) {
-            if (!(await (0, freeTrial_1.checkFreeTrialInstanceUsed)(setup.projectId))) {
+            if (freeTrialAvailable) {
                 choices.push({ name: "Create a new free trial instance", value: "", location: "" });
             }
             else {
@@ -462,7 +509,7 @@ async function promptForCloudSQL(setup, info) {
     if (info.locationId === "") {
         await promptForLocation(setup, info);
         info.shouldProvisionCSQL = await (0, prompt_1.confirm)({
-            message: `Would you like to provision your Cloud SQL instance and database now?`,
+            message: `Would you like to provision your ${freeTrialAvailable ? "free trial " : ""}Cloud SQL instance and database now?`,
             default: true,
         });
     }

package/lib/mcp/index.js

@@ -53,10 +53,6 @@ class FirebaseMcpServer {
         this._readyPromises = [];
         this._pendingMessages = [];
         this.currentLogLevel = process.env.FIREBASE_MCP_DEBUG_LOG ? "debug" : undefined;
-        this.logger = Object.fromEntries(orderedLogLevels.map((logLevel) => [
-            logLevel,
-            (message) => this.log(logLevel, message),
-        ]));
         this.activeFeatures = options.activeFeatures;
         this.startupRoot = options.projectRoot || process.env.PROJECT_ROOT;
         this.server = new index_js_1.Server({ name: "firebase", version: SERVER_VERSION });
@@ -129,14 +125,14 @@ class FirebaseMcpServer {
             return this.cachedProjectDir;
         const storedRoot = this.getStoredClientConfig().projectRoot;
         this.cachedProjectDir = storedRoot || this.startupRoot || process.cwd();
-        this.log("debug", "detected and cached project root: " + this.cachedProjectDir);
+        this.logger.debug(`detected and cached project root: ${this.cachedProjectDir}`);
         return this.cachedProjectDir;
     }
     async detectActiveFeatures() {
         var _a;
         if ((_a = this.detectedFeatures) === null || _a === void 0 ? void 0 : _a.length)
             return this.detectedFeatures;
-        this.log("debug", "detecting active features of Firebase MCP server...");
+        this.logger.debug("detecting active features of Firebase MCP server...");
         const projectId = (await this.getProjectId()) || "";
         const accountEmail = await this.getAuthenticatedUser();
         const ctx = this._createMcpContext(projectId, accountEmail);
@@ -147,7 +143,7 @@ class FirebaseMcpServer {
             return null;
         }));
         this.detectedFeatures = detected.filter((f) => !!f);
-        this.log("debug", "detected features of Firebase MCP server: " + (this.detectedFeatures.join(", ") || "<none>"));
+        this.logger.debug(`detected features of Firebase MCP server:  ${this.detectedFeatures.join(", ") || "<none>"}`);
         return this.detectedFeatures;
     }
     async getEmulatorHubClient() {
@@ -212,13 +208,13 @@ class FirebaseMcpServer {
     }
     async getAuthenticatedUser(skipAutoAuth = false) {
         try {
-            this.log("debug", `calling requireAuth`);
+            this.logger.debug("calling requireAuth");
             const email = await (0, requireAuth_1.requireAuth)(await this.resolveOptions(), skipAutoAuth);
-            this.log("debug", `detected authenticated account: ${email || "<none>"}`);
+            this.logger.debug(`detected authenticated account: ${email || "<none>"}`);
             return email !== null && email !== void 0 ? email : (skipAutoAuth ? null : "Application Default Credentials");
         }
         catch (e) {
-            this.log("debug", `error in requireAuth: ${e}`);
+            this.logger.debug(`error in requireAuth: ${e}`);
             return null;
         }
     }
@@ -245,7 +241,7 @@ class FirebaseMcpServer {
         const hasActiveProject = !!(await this.getProjectId());
         await this.trackGA4("mcp_list_tools");
         const skipAutoAuthForStudio = (0, env_1.isFirebaseStudio)();
-        this.log("debug", `skip auto-auth in studio environment: ${skipAutoAuthForStudio}`);
+        this.logger.debug(`skip auto-auth in studio environment: ${skipAutoAuthForStudio}`);
         const availableTools = await this.getAvailableTools();
         return {
             tools: availableTools.map((t) => t.mcp),
@@ -383,29 +379,38 @@ class FirebaseMcpServer {
             : new stdio_js_1.StdioServerTransport();
         await this.server.connect(transport);
     }
-    log(level, message) {
-        let data = message;
-        if (typeof message === "string") {
-            data = { message };
-        }
-        if (!this.currentLogLevel) {
-            return;
-        }
-        if (orderedLogLevels.indexOf(this.currentLogLevel) > orderedLogLevels.indexOf(level)) {
-            return;
-        }
-        if (this._ready) {
-            while (this._pendingMessages.length) {
-                const message = this._pendingMessages.shift();
-                if (!message)
-                    continue;
-                this.server.sendLoggingMessage({ level: message.level, data: message.data });
+    get logger() {
+        const logAtLevel = (level, message) => {
+            let data = message;
+            if (typeof message === "string") {
+                data = { message };
             }
-            void this.server.sendLoggingMessage({ level, data });
-        }
-        else {
-            this._pendingMessages.push({ level, data });
-        }
+            if (!this.currentLogLevel) {
+                return;
+            }
+            if (orderedLogLevels.indexOf(this.currentLogLevel) > orderedLogLevels.indexOf(level)) {
+                return;
+            }
+            if (this._ready) {
+                while (this._pendingMessages.length) {
+                    const message = this._pendingMessages.shift();
+                    if (!message)
+                        continue;
+                    this.server.sendLoggingMessage({
+                        level: message.level,
+                        data: message.data,
+                    });
+                }
+                void this.server.sendLoggingMessage({ level, data });
+            }
+            else {
+                this._pendingMessages.push({ level, data });
+            }
+        };
+        return Object.fromEntries(orderedLogLevels.map((logLevel) => [
+            logLevel,
+            (message) => logAtLevel(logLevel, message),
+        ]));
     }
 }
 exports.FirebaseMcpServer = FirebaseMcpServer;

package/lib/mcp/util/apptesting/availability.js

@@ -11,7 +11,7 @@ async function isAppTestingAvailable(ctx) {
     const platforms = await (0, appUtils_1.getPlatformsFromFolder)(projectDir);
     const supportedPlatforms = [appUtils_1.Platform.FLUTTER, appUtils_1.Platform.ANDROID, appUtils_1.Platform.IOS];
     if (!platforms.some((p) => supportedPlatforms.includes(p))) {
-        host.log("debug", `Found no supported App Testing platforms.`);
+        host.logger.debug("Found no supported App Testing platforms.");
         return false;
     }
     try {

package/lib/mcp/util/crashlytics/availability.js

@@ -5,7 +5,7 @@ const appUtils_1 = require("../../../appUtils");
 const fs = require("fs-extra");
 const path = require("path");
 async function isCrashlyticsAvailable(ctx) {
-    ctx.host.log("debug", `Looking for whether crashlytics is installed...`);
+    ctx.host.logger.debug("Looking for whether crashlytics is installed...");
     return await isCrashlyticsInstalled(ctx);
 }
 exports.isCrashlyticsAvailable = isCrashlyticsAvailable;
@@ -16,22 +16,22 @@ async function isCrashlyticsInstalled(ctx) {
     if (!platforms.includes(appUtils_1.Platform.FLUTTER) &&
         !platforms.includes(appUtils_1.Platform.ANDROID) &&
         !platforms.includes(appUtils_1.Platform.IOS)) {
-        host.log("debug", `Found no supported Crashlytics platforms.`);
+        host.logger.debug("Found no supported Crashlytics platforms.");
         return false;
     }
     if (platforms.includes(appUtils_1.Platform.FLUTTER) && (await flutterAppUsesCrashlytics(projectDir))) {
-        host.log("debug", `Found Flutter app using Crashlytics`);
+        host.logger.debug("Found Flutter app using Crashlytics");
         return true;
     }
     if (platforms.includes(appUtils_1.Platform.ANDROID) && (await androidAppUsesCrashlytics(projectDir))) {
-        host.log("debug", `Found Android app using Crashlytics`);
+        host.logger.debug("Found Android app using Crashlytics");
         return true;
     }
     if (platforms.includes(appUtils_1.Platform.IOS) && (await iosAppUsesCrashlytics(projectDir))) {
-        host.log("debug", `Found iOS app using Crashlytics`);
+        host.logger.debug("Found iOS app using Crashlytics");
         return true;
     }
-    host.log("debug", `Found supported platforms ${JSON.stringify(platforms)}, but did not find a Crashlytics dependency.`);
+    host.logger.debug(`Found supported platforms ${JSON.stringify(platforms)}, but did not find a Crashlytics dependency.`);
     return false;
 }
 async function androidAppUsesCrashlytics(appPath) {

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openInBrowserPopup = exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.sleep = exports.promiseWithSpinner = exports.tryParse = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarningToStderr = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
-exports.commandExistsSync = exports.newUniqueId = exports.deepEqual = exports.promptForDirectory = exports.updateOrCreateGitignore = exports.readSecretValue = exports.generatePassword = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = void 0;
+exports.resolveWithin = exports.commandExistsSync = exports.newUniqueId = exports.deepEqual = exports.promptForDirectory = exports.updateOrCreateGitignore = exports.readSecretValue = exports.generatePassword = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = void 0;
 const fs = require("fs-extra");
 const tty = require("tty");
 const path = require("node:path");
@@ -676,3 +676,12 @@ function commandExistsSync(command) {
     }
 }
 exports.commandExistsSync = commandExistsSync;
+function resolveWithin(base, subPath, errMsg) {
+    const abs = path.resolve(base, subPath);
+    const rel = path.relative(base, abs);
+    if (rel.startsWith("..") || path.isAbsolute(rel)) {
+        throw new error_1.FirebaseError(errMsg || `Path "${subPath}" must be within "${base}".`);
+    }
+    return abs;
+}
+exports.resolveWithin = resolveWithin;

package/package.json

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

package/schema/firebase-config.json

@@ -7,6 +7,7 @@
                 "nodejs18",
                 "nodejs20",
                 "nodejs22",
+                "nodejs24",
                 "python310",
                 "python311",
                 "python312",
@@ -915,6 +916,7 @@
                         "nodejs18",
                         "nodejs20",
                         "nodejs22",
+                        "nodejs24",
                         "python310",
                         "python311",
                         "python312",

package/templates/init/dataconnect/dataconnect-fdcwebhooks.yaml

@@ -10,4 +10,5 @@ schemas:
           instanceId: __cloudSqlInstanceId__
           # schemaValidation: "STRICT"     # STRICT mode makes Postgres schema match Data Connect exactly.
           # schemaValidation: "COMPATIBLE" # COMPATIBLE mode makes Postgres schema compatible with Data Connect.
+#__secondarySchemaPlaceholder__
 connectorDirs: __connectorDirs__

package/templates/init/dataconnect/secondary_schema.yaml

@@ -0,0 +1,5 @@
+  - id: __secondarySchemaId__
+    source: __secondarySchemaSource__
+    datasource:
+      httpGraphql:
+        uri: __secondarySchemaUri__

package/templates/init/functions/javascript/package.lint.json

@@ -14,13 +14,13 @@
   },
   "main": "index.js",
   "dependencies": {
-    "firebase-admin": "^12.6.0",
-    "firebase-functions": "^6.0.1"
+    "firebase-admin": "^13.6.0",
+    "firebase-functions": "^7.0.0"
   },
   "devDependencies": {
     "eslint": "^8.15.0",
     "eslint-config-google": "^0.14.0",
-    "firebase-functions-test": "^3.1.0"
+    "firebase-functions-test": "^3.4.1"
   },
   "private": true
 }

package/templates/init/functions/javascript/package.nolint.json

@@ -13,11 +13,11 @@
   },
   "main": "index.js",
   "dependencies": {
-    "firebase-admin": "^12.6.0",
-    "firebase-functions": "^6.0.1"
+    "firebase-admin": "^13.6.0",
+    "firebase-functions": "^7.0.0"
   },
   "devDependencies": {
-    "firebase-functions-test": "^3.1.0"
+    "firebase-functions-test": "^3.4.1"
   },
   "private": true
 }

package/templates/init/functions/typescript/package.lint.json

@@ -15,8 +15,8 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "firebase-admin": "^12.6.0",
-    "firebase-functions": "^6.0.1"
+    "firebase-admin": "^13.6.0",
+    "firebase-functions": "^7.0.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.12.0",
@@ -24,7 +24,7 @@
     "eslint": "^8.9.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.25.4",
-    "firebase-functions-test": "^3.1.0",
+    "firebase-functions-test": "^3.4.1",
     "typescript": "^5.7.3"
   },
   "private": true

package/templates/init/functions/typescript/package.nolint.json

@@ -14,12 +14,12 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "firebase-admin": "^12.6.0",
-    "firebase-functions": "^6.0.1"
+    "firebase-admin": "^13.6.0",
+    "firebase-functions": "^7.0.0"
   },
   "devDependencies": {
     "typescript": "^5.7.3",
-    "firebase-functions-test": "^3.1.0"
+    "firebase-functions-test": "^3.4.1"
   },
   "private": true
 }