firebase-tools 13.20.2 → 13.22.0

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.getGitHubCommit = exports.getGitHubBranch = exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -12,6 +12,8 @@ const getProjectNumber_1 = require("../getProjectNumber");
 const api_1 = require("../api");
 const fuzzy = require("fuzzy");
 const inquirer = require("inquirer");
+const apiv2_1 = require("../apiv2");
+const githubApiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.githubApiOrigin)(), auth: false });
 const APPHOSTING_CONN_PATTERN = /.+\/apphosting-github-conn-.+$/;
 const APPHOSTING_OAUTH_CONN_NAME = "firebase-app-hosting-github-oauth";
 const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
@@ -346,3 +348,19 @@ async function fetchRepositoryCloneUris(projectId, connection) {
     return cloneUris;
 }
 exports.fetchRepositoryCloneUris = fetchRepositoryCloneUris;
+async function getGitHubBranch(owner, repo, branch, readToken) {
+    const headers = { Authorization: `Bearer ${readToken}`, "User-Agent": "Firebase CLI" };
+    const { body } = await githubApiClient.get(`/repos/${owner}/${repo}/branches/${branch}`, {
+        headers,
+    });
+    return body;
+}
+exports.getGitHubBranch = getGitHubBranch;
+async function getGitHubCommit(owner, repo, ref, readToken) {
+    const headers = { Authorization: `Bearer ${readToken}`, "User-Agent": "Firebase CLI" };
+    const { body } = await githubApiClient.get(`/repos/${owner}/${repo}/commits/${ref}`, {
+        headers,
+    });
+    return body;
+}
+exports.getGitHubCommit = getGitHubCommit;

package/lib/apphosting/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
+exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
 const clc = require("colorette");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
@@ -18,6 +18,7 @@ const deploymentTool = require("../deploymentTool");
 const app_1 = require("./app");
 const ora = require("ora");
 const node_fetch_1 = require("node-fetch");
+const rollout_1 = require("./rollout");
 const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
 const apphostingPollerOptions = {
     apiOrigin: (0, api_1.apphostingOrigin)(),
@@ -105,12 +106,18 @@ async function doSetup(projectId, webAppName, location, serviceAccount) {
     const url = `https://${backend.uri}`;
     (0, utils_1.logBullet)(`You may also track this rollout at:\n\t${(0, api_1.consoleOrigin)()}/project/${projectId}/apphosting`);
     const createRolloutSpinner = ora("Starting a new rollout; this may take a few minutes. It's safe to exit now.").start();
-    await orchestrateRollout(projectId, location, backendId, {
-        source: {
-            codebase: {
-                branch,
+    await (0, rollout_1.orchestrateRollout)({
+        projectId,
+        location,
+        backendId,
+        buildInput: {
+            source: {
+                codebase: {
+                    branch,
+                },
             },
         },
+        isFirstRollout: true,
     });
     createRolloutSpinner.succeed("Rollout complete");
     if (!(await tlsReady(url))) {
@@ -208,47 +215,6 @@ async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseB
     await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `updateTraffic-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
 }
 exports.setDefaultTrafficPolicy = setDefaultTrafficPolicy;
-async function orchestrateRollout(projectId, location, backendId, buildInput) {
-    const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, 1);
-    const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
-    const rolloutBody = {
-        build: `projects/${projectId}/locations/${location}/backends/${backendId}/builds/${buildId}`,
-    };
-    let tries = 0;
-    let done = false;
-    while (!done) {
-        tries++;
-        try {
-            const validateOnly = true;
-            await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody, validateOnly);
-            done = true;
-        }
-        catch (err) {
-            if (err instanceof error_1.FirebaseError && err.status === 400) {
-                if (tries >= 5) {
-                    throw err;
-                }
-                await (0, utils_1.sleep)(1000);
-            }
-            else {
-                throw err;
-            }
-        }
-    }
-    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody);
-    const rolloutPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${buildId}`, operationResourceName: rolloutOp.name }));
-    const buildPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-build-${buildId}`, operationResourceName: buildOp.name }));
-    const [rollout, build] = await Promise.all([rolloutPoll, buildPoll]);
-    if (build.state !== "READY") {
-        if (!build.buildLogsUri) {
-            throw new error_1.FirebaseError("Failed to build your app, but failed to get build logs as well. " +
-                "This is an internal error and should be reported");
-        }
-        throw new error_1.FirebaseError(`Failed to build your app. Please inspect the build logs at ${build.buildLogsUri}.`, { children: [build.error] });
-    }
-    return { rollout, build };
-}
-exports.orchestrateRollout = orchestrateRollout;
 async function deleteBackendAndPoll(projectId, location, backendId) {
     const op = await apphosting.deleteBackend(projectId, location, backendId);
     await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `delete-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));

package/lib/apphosting/rollout.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.orchestrateRollout = exports.createRollout = void 0;
+const apphosting = require("../gcp/apphosting");
+const error_1 = require("../error");
+const ora = require("ora");
+const devConnect_1 = require("../gcp/devConnect");
+const githubConnections_1 = require("../apphosting/githubConnections");
+const poller = require("../operation-poller");
+const prompt_1 = require("../prompt");
+const utils_1 = require("../utils");
+const api_1 = require("../api");
+const apphostingPollerOptions = {
+    apiOrigin: (0, api_1.apphostingOrigin)(),
+    apiVersion: apphosting.API_VERSION,
+    masterTimeout: 25 * 60 * 1000,
+    maxBackoff: 10000,
+};
+const GIT_COMMIT_SHA_REGEX = /^(?:[0-9a-f]{40}|[0-9a-f]{7})$/;
+async function createRollout(backendId, projectId, location, branch, commit, force) {
+    const backend = await apphosting.getBackend(projectId, location, backendId);
+    if (!backend.codebase.repository) {
+        throw new error_1.FirebaseError(`Backend ${backendId} is misconfigured due to missing a connected repository. You can delete and recreate your backend using 'firebase apphosting:backends:delete' and 'firebase apphosting:backends:create'.`);
+    }
+    const { repoLink, owner, repo, readToken } = await (0, devConnect_1.getRepoDetailsFromBackend)(projectId, location, backend.codebase.repository);
+    let targetCommit;
+    if (branch) {
+        const branches = await (0, devConnect_1.listAllBranches)(repoLink.name);
+        if (!branches.has(branch)) {
+            throw new error_1.FirebaseError(`Unrecognized git branch ${branch}. Please double-check your branch name and try again.`);
+        }
+        const branchInfo = await (0, githubConnections_1.getGitHubBranch)(owner, repo, branch, readToken.token);
+        targetCommit = branchInfo.commit;
+    }
+    else if (commit) {
+        if (!GIT_COMMIT_SHA_REGEX.test(commit)) {
+            throw new error_1.FirebaseError(`Invalid git commit ${commit}. Must be a valid SHA1 hash.`);
+        }
+        try {
+            const commitInfo = await (0, githubConnections_1.getGitHubCommit)(owner, repo, commit, readToken.token);
+            targetCommit = commitInfo;
+        }
+        catch (err) {
+            if (err.status === 422) {
+                throw new error_1.FirebaseError(`Unrecognized git commit ${commit}. Please double-check your commit hash and try again.`);
+            }
+            throw err;
+        }
+    }
+    else {
+        branch = await (0, githubConnections_1.promptGitHubBranch)(repoLink);
+        const branchInfo = await (0, githubConnections_1.getGitHubBranch)(owner, repo, branch, readToken.token);
+        targetCommit = branchInfo.commit;
+    }
+    (0, utils_1.logBullet)(`You are about to deploy [${targetCommit.sha.substring(0, 7)}]: ${targetCommit.commit.message}`);
+    const confirmRollout = await (0, prompt_1.confirm)({
+        force: !!force,
+        message: "Do you want to continue?",
+    });
+    if (!confirmRollout) {
+        return;
+    }
+    (0, utils_1.logBullet)(`You may also track this rollout at:\n\t${(0, api_1.consoleOrigin)()}/project/${projectId}/apphosting`);
+    const createRolloutSpinner = ora("Starting a new rollout; this may take a few minutes. It's safe to exit now.").start();
+    try {
+        await orchestrateRollout({
+            projectId,
+            location,
+            backendId,
+            buildInput: {
+                source: {
+                    codebase: {
+                        commit: targetCommit.sha,
+                    },
+                },
+            },
+        });
+    }
+    catch (err) {
+        createRolloutSpinner.fail("Rollout failed.");
+        throw err;
+    }
+    createRolloutSpinner.succeed("Successfully created a new rollout!");
+}
+exports.createRollout = createRollout;
+async function orchestrateRollout(args) {
+    const { projectId, location, backendId, buildInput, isFirstRollout } = args;
+    const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, isFirstRollout ? 1 : undefined);
+    const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
+    const rolloutBody = {
+        build: `projects/${projectId}/locations/${location}/backends/${backendId}/builds/${buildId}`,
+    };
+    let tries = 0;
+    let done = false;
+    while (!done) {
+        tries++;
+        try {
+            const validateOnly = true;
+            await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody, validateOnly);
+            done = true;
+        }
+        catch (err) {
+            if (err instanceof error_1.FirebaseError && err.status === 400) {
+                if (tries >= 5) {
+                    throw err;
+                }
+                await (0, utils_1.sleep)(1000);
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody);
+    const rolloutPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${buildId}`, operationResourceName: rolloutOp.name }));
+    const buildPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-build-${buildId}`, operationResourceName: buildOp.name }));
+    const [rollout, build] = await Promise.all([rolloutPoll, buildPoll]);
+    if (build.state !== "READY") {
+        if (!build.buildLogsUri) {
+            throw new error_1.FirebaseError("Failed to build your app, but failed to get build logs as well. " +
+                "This is an internal error and should be reported");
+        }
+        throw new error_1.FirebaseError(`Failed to build your app. Please inspect the build logs at ${build.buildLogsUri}.`, { children: [build.error] });
+    }
+    return { rollout, build };
+}
+exports.orchestrateRollout = orchestrateRollout;

package/lib/command.js

@@ -182,15 +182,18 @@ class Command {
         }
     }
     applyRC(options) {
+        var _a, _b;
         const rc = (0, rc_1.loadRC)(options);
         options.rc = rc;
-        options.project =
-            options.project || (configstore_1.configstore.get("activeProjects") || {})[options.projectRoot];
+        const activeProject = options.projectRoot
+            ? ((_a = configstore_1.configstore.get("activeProjects")) !== null && _a !== void 0 ? _a : {})[options.projectRoot]
+            : undefined;
+        options.project = (_b = options.project) !== null && _b !== void 0 ? _b : activeProject;
         if (options.config && !options.project) {
             options.project = options.config.defaults.project;
         }
         const aliases = rc.projects;
-        const rcProject = (0, lodash_1.get)(aliases, options.project);
+        const rcProject = options.project ? aliases[options.project] : undefined;
         if (rcProject) {
             options.projectAlias = options.project;
             options.project = rcProject;
@@ -199,6 +202,10 @@ class Command {
             options.projectAlias = (0, lodash_1.head)((0, lodash_1.keys)(aliases));
             options.project = (0, lodash_1.head)((0, lodash_1.values)(aliases));
         }
+        else if (!options.project && aliases["default"]) {
+            options.projectAlias = "default";
+            options.project = aliases["default"];
+        }
     }
     async resolveProjectIdentifiers(options) {
         var _a;

package/lib/commands/apphosting-rollouts-create.js

@@ -2,25 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const apphosting = require("../gcp/apphosting");
-const logger_1 = require("../logger");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
-exports.command = new command_1.Command("apphosting:rollouts:create <backendId> <buildId>")
+const error_1 = require("../error");
+const rollout_1 = require("../apphosting/rollout");
+exports.command = new command_1.Command("apphosting:rollouts:create <backendId>")
     .description("create a rollout using a build for an App Hosting backend")
     .option("-l, --location <location>", "specify the region of the backend", "us-central1")
     .option("-i, --id <rolloutId>", "id of the rollout (defaults to autogenerating a random id)", "")
+    .option("-gb, --git-branch <gitBranch>", "repository branch to deploy (mutually exclusive with -gc)")
+    .option("-gc, --git-commit <gitCommit>", "git commit to deploy (mutually exclusive with -gb)")
+    .withForce("Skip confirmation before creating rollout")
     .before(apphosting.ensureApiEnabled)
-    .action(async (backendId, buildId, options) => {
+    .action(async (backendId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
-    const rolloutId = options.buildId ||
-        (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const build = `projects/${projectId}/backends/${backendId}/builds/${buildId}`;
-    const op = await apphosting.createRollout(projectId, location, backendId, rolloutId, {
-        build,
-    });
-    logger_1.logger.info(`Started a rollout for backend ${backendId} with build ${buildId}.`);
-    logger_1.logger.info("Check status by running:");
-    logger_1.logger.info(`\tfirebase apphosting:rollouts:list --location ${location}`);
-    return op;
+    const branch = options.gitBranch;
+    const commit = options.gitCommit;
+    if (branch && commit) {
+        throw new error_1.FirebaseError("Cannot specify both a branch and commit to deploy. Please specify either --git-branch or --git-commit.");
+    }
+    await (0, rollout_1.createRollout)(backendId, projectId, location, branch, commit, options.force);
 });

package/lib/commands/emulators-start.js

@@ -103,7 +103,7 @@ function printEmulatorOverview(options) {
     let extensionsTable = "";
     if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EXTENSIONS)) {
         const extensionsEmulatorInstance = registry_1.EmulatorRegistry.get(types_1.Emulators.EXTENSIONS);
-        extensionsTable = extensionsEmulatorInstance.extensionsInfoTable(options);
+        extensionsTable = extensionsEmulatorInstance.extensionsInfoTable();
     }
     logger_1.logger.info(`\n${successMessageTable}
 

package/lib/commands/init.js

@@ -79,6 +79,12 @@ let choices = [
         checked: false,
         hidden: true,
     },
+    {
+        value: "apphosting",
+        name: "App Hosting: Configure an apphosting.yaml file for App Hosting",
+        checked: false,
+        hidden: false,
+    },
 ];
 if ((0, experiments_1.isEnabled)("genkit")) {
     choices = [

package/lib/config.js

@@ -165,21 +165,31 @@ class Config {
     deleteProjectFile(p) {
         fs.removeSync(this.path(p));
     }
-    askWriteProjectFile(p, content, force) {
+    askWriteProjectFile(p, content, force, confirmByDefault) {
         const writeTo = this.path(p);
         let next;
-        if (fsutils.fileExistsSync(writeTo) && !force) {
+        if (typeof content !== "string") {
+            content = JSON.stringify(content, null, 2) + "\n";
+        }
+        let existingContent;
+        if (fsutils.fileExistsSync(writeTo)) {
+            existingContent = fsutils.readFile(writeTo);
+        }
+        if (existingContent && existingContent !== content && !force) {
             next = (0, prompt_1.promptOnce)({
                 type: "confirm",
                 message: "File " + clc.underline(p) + " already exists. Overwrite?",
-                default: false,
+                default: !!confirmByDefault,
             });
         }
         else {
             next = Promise.resolve(true);
         }
         return next.then((result) => {
-            if (result) {
+            if (existingContent === content) {
+                utils.logBullet(clc.bold(p) + " is unchanged");
+            }
+            else if (result) {
                 this.writeProjectFile(p, content);
                 utils.logSuccess("Wrote " + clc.bold(p));
             }

package/lib/dataconnect/fileUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSdkYaml = exports.directoryHasPackageJson = exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
+exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const error_1 = require("../error");
@@ -112,7 +112,10 @@ async function getPlatformFromFolder(dirPath) {
             IOS_POSTFIX_INDICATORS.some((indicator) => cleanedFileName.endsWith(indicator)));
         hasDart || (hasDart = DART_INDICATORS.some((indicator) => indicator === cleanedFileName));
     }
-    if (hasWeb && !hasAndroid && !hasIOS && !hasDart) {
+    if (!hasWeb && !hasAndroid && !hasIOS && !hasDart) {
+        return types_1.Platform.NONE;
+    }
+    else if (hasWeb && !hasAndroid && !hasIOS && !hasDart) {
         return types_1.Platform.WEB;
     }
     else if (hasAndroid && !hasWeb && !hasIOS && !hasDart) {
@@ -122,47 +125,8 @@ async function getPlatformFromFolder(dirPath) {
         return types_1.Platform.IOS;
     }
     else if (hasDart && !hasWeb && !hasIOS && !hasAndroid) {
-        return types_1.Platform.DART;
+        return types_1.Platform.FLUTTER;
     }
-    return types_1.Platform.UNDETERMINED;
+    return types_1.Platform.MULTIPLE;
 }
 exports.getPlatformFromFolder = getPlatformFromFolder;
-async function directoryHasPackageJson(dirPath) {
-    const fileNames = await fs.readdir(dirPath);
-    return fileNames.some((f) => f.toLowerCase() === "package.json");
-}
-exports.directoryHasPackageJson = directoryHasPackageJson;
-function generateSdkYaml(platform, connectorYaml, connectorYamlFolder, appFolder) {
-    const relPath = path.relative(connectorYamlFolder, appFolder);
-    const outputDir = path.join(relPath, "dataconnect-generated");
-    if (!connectorYaml.generate) {
-        connectorYaml.generate = {};
-    }
-    if (platform === types_1.Platform.WEB) {
-        connectorYaml.generate.javascriptSdk = {
-            outputDir,
-            package: `@firebasegen/${connectorYaml.connectorId}`,
-            packageJsonDir: appFolder,
-        };
-    }
-    if (platform === types_1.Platform.IOS) {
-        connectorYaml.generate.swiftSdk = {
-            outputDir,
-            package: connectorYaml.connectorId,
-        };
-    }
-    if (platform === types_1.Platform.ANDROID) {
-        connectorYaml.generate.kotlinSdk = {
-            outputDir,
-            package: `connectors.${connectorYaml.connectorId}`,
-        };
-    }
-    if (platform === types_1.Platform.DART) {
-        connectorYaml.generate.dartSdk = {
-            outputDir,
-            package: connectorYaml.connectorId,
-        };
-    }
-    return connectorYaml;
-}
-exports.generateSdkYaml = generateSdkYaml;

package/lib/dataconnect/freeTrial.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printFreeTrialUnavailable = exports.checkForFreeTrialInstance = exports.freeTrialTermsLink = void 0;
+exports.upgradeInstructions = exports.printFreeTrialUnavailable = exports.getFreeTrialInstanceId = exports.checkFreeTrialInstanceUsed = exports.freeTrialTermsLink = void 0;
+const cloudmonitoring_1 = require("../gcp/cloudmonitoring");
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
 const clc = require("colorette");
@@ -8,18 +9,51 @@ function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
 exports.freeTrialTermsLink = freeTrialTermsLink;
-async function checkForFreeTrialInstance(projectId) {
+const FREE_TRIAL_METRIC = "sqladmin.googleapis.com/fdc_lifetime_free_trial_per_project";
+async function checkFreeTrialInstanceUsed(projectId) {
+    const past7d = new Date();
+    past7d.setDate(past7d.getDate() - 7);
+    const query = {
+        filter: `metric.type="serviceruntime.googleapis.com/quota/allocation/usage" AND metric.label.quota_metric = "${FREE_TRIAL_METRIC}"`,
+        "interval.endTime": new Date().toJSON(),
+        "interval.startTime": past7d.toJSON(),
+    };
+    try {
+        const ts = await (0, cloudmonitoring_1.queryTimeSeries)(query, projectId);
+        if (ts.length) {
+            return ts[0].points.some((p) => p.value.int64Value);
+        }
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
+}
+exports.checkFreeTrialInstanceUsed = checkFreeTrialInstanceUsed;
+async function getFreeTrialInstanceId(projectId) {
     var _a;
     const instances = await (0, cloudsqladmin_1.listInstances)(projectId);
     return (_a = instances.find((i) => { var _a; return ((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft"; })) === null || _a === void 0 ? void 0 : _a.name;
 }
-exports.checkForFreeTrialInstance = checkForFreeTrialInstance;
-function printFreeTrialUnavailable(projectId, instanceId, configYamlPath) {
-    utils.logLabeledError("dataconnect", `Project '${projectId} already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect no-cost trial.`);
-    const reuseHint = `To use a different database in the same instance, ${clc.bold(`change the ${clc.blue("instanceId")} to "${instanceId}"`)} in ` +
-        `${clc.green(configYamlPath)}. (Also, update the ${clc.blue("database")} field (i.e. DB name in the instance) ` +
-        `and ${clc.blue("location")} as needed.)`;
-    utils.logLabeledBullet("dataconnect", reuseHint);
-    utils.logLabeledBullet("dataconnect", `Or you may create a new (paid) CloudSQL instance at https://console.cloud.google.com/sql/instances`);
+exports.getFreeTrialInstanceId = getFreeTrialInstanceId;
+function printFreeTrialUnavailable(projectId, configYamlPath, instanceId) {
+    if (!instanceId) {
+        utils.logLabeledError("data connect", "The CloudSQL free trial has already been used on this project.");
+        utils.logLabeledError("data connect", `You may create or use a paid CloudSQL instance by visiting https://console.cloud.google.com/sql/instances`);
+        return;
+    }
+    utils.logLabeledError("data connect", `Project '${projectId} already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect no-cost trial.`);
+    const reuseHint = `To use a different database in the same instance, ${clc.bold(`change the ${clc.blue("instanceId")} to "${instanceId}"`)} and update ${clc.blue("location")} in ` +
+        `${clc.green(configYamlPath)}.`;
+    utils.logLabeledError("data connect", reuseHint);
+    utils.logLabeledError("data connect", `Alternatively, you may create a new (paid) CloudSQL instance at https://console.cloud.google.com/sql/instances`);
 }
 exports.printFreeTrialUnavailable = printFreeTrialUnavailable;
+function upgradeInstructions(projectId) {
+    return `If you'd like to provision a 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:
+     https://console.firebase.google.com/project/${projectId}/usage/details
+2. Run ${clc.bold("firebase init dataconnect")} again to configure the Cloud SQL instance.
+3. Run ${clc.bold("firebase deploy --only dataconnect")} to deploy your Data Connect service.`;
+}
+exports.upgradeInstructions = upgradeInstructions;

package/lib/dataconnect/provisionCloudSql.js

@@ -33,10 +33,10 @@ async function provisionCloudSql(args) {
         if (err.status !== 404) {
             throw err;
         }
-        const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(projectId);
-        if (freeTrialInstanceId) {
-            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, freeTrialInstanceId, configYamlPath);
-            throw new error_1.FirebaseError("Cannot create another no-cost trial Cloud SQL instance.");
+        const freeTrialInstanceId = await (0, freeTrial_1.getFreeTrialInstanceId)(projectId);
+        if (await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId)) {
+            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, configYamlPath, freeTrialInstanceId);
+            throw new error_1.FirebaseError("No-cost Cloud SQL trial has already been used on this project.");
         }
         const cta = dryRun ? "It will be created on your next deploy" : "Creating it now.";
         silent ||

package/lib/dataconnect/types.js

@@ -9,11 +9,12 @@ function requiresVector(dm) {
 exports.requiresVector = requiresVector;
 var Platform;
 (function (Platform) {
+    Platform["NONE"] = "NONE";
     Platform["ANDROID"] = "ANDROID";
     Platform["WEB"] = "WEB";
     Platform["IOS"] = "IOS";
-    Platform["DART"] = "DART";
-    Platform["UNDETERMINED"] = "UNDETERMINED";
+    Platform["FLUTTER"] = "FLUTTER";
+    Platform["MULTIPLE"] = "MULTIPLE";
 })(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {
     if (ds.postgresql) {

package/lib/dataconnect/webhook.js

@@ -22,10 +22,11 @@ async function sendVSCodeMessage(body) {
                 "x-mantle-admin": "all",
             },
             body: jsonBody,
+            signal: AbortSignal.timeout(3000),
         });
     }
     catch (e) {
-        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}`);
+        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}. If you are not running the Firebase Data Connect VSCode extension, this is expected and not an issue.`);
     }
 }
 exports.sendVSCodeMessage = sendVSCodeMessage;

package/lib/deploy/dataconnect/prepare.js

@@ -12,14 +12,19 @@ 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 node_path_1 = require("node:path");
+const freeTrial_1 = require("../../dataconnect/freeTrial");
 async function default_1(context, options) {
     var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    if (!(await (0, cloudbilling_1.checkBillingEnabled)(projectId))) {
+        throw new error_1.FirebaseError((0, freeTrial_1.upgradeInstructions)(projectId));
+    }
     await (0, ensureApis_1.ensureApis)(projectId);
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);

package/lib/emulator/apphosting/config.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalAppHostingConfiguration = exports.loadAppHostingYaml = void 0;
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const utils_1 = require("../../utils");
+const utils_2 = require("./utils");
+const types_1 = require("../types");
+const APPHOSTING_YAML = "apphosting.yaml";
+const APPHOSTING_LOCAL_YAML = "apphosting.local.yaml";
+async function loadAppHostingYaml(sourceDirectory, fileName) {
+    const file = await (0, utils_1.readFileFromDirectory)(sourceDirectory, fileName);
+    const apphostingYaml = await (0, utils_1.wrappedSafeLoad)(file.source);
+    const environmentVariables = {};
+    const secrets = {};
+    if (apphostingYaml.env) {
+        for (const env of apphostingYaml.env) {
+            if (env.value) {
+                environmentVariables[env.variable] = env.value;
+            }
+            if (env.secret) {
+                secrets[env.variable] = env.secret;
+            }
+        }
+    }
+    return { environmentVariables, secrets };
+}
+exports.loadAppHostingYaml = loadAppHostingYaml;
+async function getLocalAppHostingConfiguration(sourceDirectory) {
+    let apphostingBaseConfig = {};
+    let apphostingLocalConfig = {};
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDirectory, APPHOSTING_YAML))) {
+        utils_2.logger.logLabeled("SUCCESS", types_1.Emulators.APPHOSTING, `${APPHOSTING_YAML} found, loading configuration`);
+        apphostingBaseConfig = await loadAppHostingYaml(sourceDirectory, APPHOSTING_YAML);
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(sourceDirectory, APPHOSTING_LOCAL_YAML))) {
+        utils_2.logger.logLabeled("SUCCESS", types_1.Emulators.APPHOSTING, `${APPHOSTING_LOCAL_YAML} found, loading configuration`);
+        apphostingLocalConfig = await loadAppHostingYaml(sourceDirectory, APPHOSTING_LOCAL_YAML);
+    }
+    return {
+        environmentVariables: Object.assign(Object.assign({}, apphostingBaseConfig.environmentVariables), apphostingLocalConfig.environmentVariables),
+        secrets: Object.assign(Object.assign({}, apphostingBaseConfig.secrets), apphostingLocalConfig.secrets),
+    };
+}
+exports.getLocalAppHostingConfiguration = getLocalAppHostingConfiguration;