firebase-tools 13.19.0 → 13.20.1

package/lib/apiv2.js

@@ -34,7 +34,9 @@ function setAccessToken(token = "") {
 }
 exports.setAccessToken = setAccessToken;
 async function getAccessToken() {
-    if (accessToken) {
+    const valid = auth.haveValidTokens(refreshToken, []);
+    const usingADC = !auth.loggedIn();
+    if (accessToken && (valid || usingADC)) {
         return accessToken;
     }
     const data = await auth.getAccessToken(refreshToken, []);
@@ -295,6 +297,11 @@ class Client {
                 }
                 this.logResponse(res, body, options);
                 if (res.status >= 400) {
+                    if (res.status === 401 && this.opts.auth) {
+                        logger_1.logger.debug("Got a 401 Unauthenticated error for a call that required authentication. Refreshing tokens.");
+                        setAccessToken();
+                        setAccessToken(await getAccessToken());
+                    }
                     if ((_a = options.retryCodes) === null || _a === void 0 ? void 0 : _a.includes(res.status)) {
                         const err = (0, responseToError_1.responseToError)({ statusCode: res.status }, body) || undefined;
                         if (operation.retry(err)) {

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -394,6 +394,10 @@ function findAccountByEmail(email) {
     return getAllAccounts().find((a) => a.user.email === email);
 }
 exports.findAccountByEmail = findAccountByEmail;
+function loggedIn() {
+    return !!lastAccessToken;
+}
+exports.loggedIn = loggedIn;
 function haveValidTokens(refreshToken, authScopes) {
     var _a;
     if (!(lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.access_token)) {
@@ -407,8 +411,16 @@ function haveValidTokens(refreshToken, authScopes) {
     const newScopesJSON = JSON.stringify(authScopes.sort());
     const hasSameScopes = oldScopesJSON === newScopesJSON;
     const isExpired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
-    return hasTokens && hasSameScopes && !isExpired;
+    const valid = hasTokens && hasSameScopes && !isExpired;
+    if (hasTokens) {
+        logger_1.logger.debug(`Checked if tokens are valid: ${valid}, expires at: ${lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at}`);
+    }
+    else {
+        logger_1.logger.debug("No OAuth tokens found");
+    }
+    return valid;
 }
+exports.haveValidTokens = haveValidTokens;
 function deleteAccount(account) {
     const defaultAccount = getGlobalDefaultAccount();
     if (account.user.email === (defaultAccount === null || defaultAccount === void 0 ? void 0 : defaultAccount.user.email)) {

package/lib/commands/dataconnect-sdk-generate.js

@@ -10,6 +10,7 @@ const fileUtils_1 = require("../dataconnect/fileUtils");
 const logger_1 = require("../logger");
 exports.command = new command_1.Command("dataconnect:sdk:generate")
     .description("generates typed SDKs for your Data Connect connectors")
+    .option("--watch", "watch for changes to your connector GQL files and regenerate your SDKs when updates occur")
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const services = (0, fileUtils_1.readFirebaseJson)(options.config);
@@ -17,10 +18,11 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         const configDir = service.source;
         const serviceInfo = await (0, load_1.load)(projectId, options.config, configDir);
         const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
                 ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
-                ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk));
+                ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk) ||
+                ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk));
         });
         if (!hasGeneratables) {
             logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
@@ -32,6 +34,7 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,
                 connectorId: conn.connectorYaml.connectorId,
+                watch: options.watch,
             });
             logger_1.logger.info(output);
             logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);

package/lib/commands/emulators-start.js

@@ -10,6 +10,7 @@ const types_1 = require("../emulator/types");
 const clc = require("colorette");
 const constants_1 = require("../emulator/constants");
 const utils_1 = require("../utils");
+const webhook_1 = require("../dataconnect/webhook");
 const Table = require("cli-table");
 function stylizeLink(url) {
     return clc.underline(clc.bold(url));
@@ -31,8 +32,10 @@ exports.command = new command_1.Command("emulators:start")
             let deprecationNotices;
             try {
                 ({ deprecationNotices } = await controller.startAll(options));
+                await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_STARTED });
             }
             catch (e) {
+                await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_START_ERRORED });
                 await controller.cleanShutdown();
                 throw e;
             }

package/lib/commands/init.js

@@ -21,10 +21,10 @@ const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
 function isOutside(from, to) {
     return !!/^\.\./.exec(path.relative(from, to));
 }
-const choices = [
+let choices = [
     {
-        value: "database",
-        name: "Realtime Database: Configure a security rules file for Realtime Database and (optionally) provision default instance",
+        value: "dataconnect",
+        name: "Data Connect: Set up a Firebase Data Connect service",
         checked: false,
     },
     {
@@ -42,12 +42,6 @@ const choices = [
         name: "Hosting: Configure files for Firebase Hosting and (optionally) set up GitHub Action deploys",
         checked: false,
     },
-    {
-        value: "hosting:github",
-        name: "Hosting: Set up GitHub Action deploys",
-        checked: false,
-        hidden: true,
-    },
     {
         value: "storage",
         name: "Storage: Configure a security rules file for Cloud Storage",
@@ -69,10 +63,16 @@ const choices = [
         checked: false,
     },
     {
-        value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service",
+        value: "database",
+        name: "Realtime Database: Configure a security rules file for Realtime Database and (optionally) provision default instance",
         checked: false,
     },
+    {
+        value: "hosting:github",
+        name: "Hosting: Set up GitHub Action deploys",
+        checked: false,
+        hidden: true,
+    },
     {
         value: "dataconnect:sdk",
         name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
@@ -81,11 +81,15 @@ const choices = [
     },
 ];
 if ((0, experiments_1.isEnabled)("genkit")) {
-    choices.push({
-        value: "genkit",
-        name: "Genkit: Setup a new Genkit project with Firebase",
-        checked: false,
-    });
+    choices = [
+        ...choices.slice(0, 2),
+        {
+            value: "genkit",
+            name: "Genkit: Setup a new Genkit project with Firebase",
+            checked: false,
+        },
+        ...choices.slice(2),
+    ];
 }
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.

package/lib/commands/setup-emulators-dataconnect.js

@@ -3,30 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const types_1 = require("../emulator/types");
-const emulators_1 = require("../init/features/emulators");
-const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const downloadableEmulators_1 = require("../emulator/downloadableEmulators");
 const NAME = types_1.Emulators.DATACONNECT;
 exports.command = new command_1.Command(`setup:emulators:${NAME}`)
     .description(`downloads the ${NAME} emulator`)
     .action(async (options) => {
-    var _a, _b;
     await (0, downloadableEmulators_1.downloadIfNecessary)(NAME);
     if (!options.config) {
         logger_1.logger.info("Not currently in a Firebase project directory. Run this command from a project directory to configure the Data Connect emulator.");
         return;
     }
-    if (!options.nonInteractive) {
-        const dataconnectEmulatorConfig = options.rc.getDataconnect();
-        const defaultConnectionString = (_b = (_a = dataconnectEmulatorConfig === null || dataconnectEmulatorConfig === void 0 ? void 0 : dataconnectEmulatorConfig.postgres) === null || _a === void 0 ? void 0 : _a.localConnectionString) !== null && _b !== void 0 ? _b : emulators_1.DEFAULT_POSTGRES_CONNECTION;
-        const localConnectionString = await (0, prompt_1.promptOnce)({
-            type: "input",
-            name: "localConnectionString",
-            message: `What is the connection string of the local Postgres instance you would like to use with the Data Connect emulator?`,
-            default: defaultConnectionString,
-        });
-        options.rc.setDataconnect(localConnectionString);
-    }
     logger_1.logger.info("Setup complete!");
 });

package/lib/dataconnect/dataplaneClient.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeGraphQL = void 0;
+exports.executeGraphQL = exports.dataconnectDataplaneClient = exports.DATACONNECT_API_VERSION = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
-const DATACONNECT_API_VERSION = "v1beta";
-const dataconnectDataplaneClient = () => new apiv2_1.Client({
-    urlPrefix: (0, api_1.dataconnectOrigin)(),
-    apiVersion: DATACONNECT_API_VERSION,
-    auth: true,
-});
-async function executeGraphQL(servicePath, body) {
-    const res = await dataconnectDataplaneClient().post(`${servicePath}:executeGraphql`, body, { resolveOnHTTPError: true });
+exports.DATACONNECT_API_VERSION = "v1beta";
+function dataconnectDataplaneClient() {
+    return new apiv2_1.Client({
+        urlPrefix: (0, api_1.dataconnectOrigin)(),
+        apiVersion: exports.DATACONNECT_API_VERSION,
+        auth: true,
+    });
+}
+exports.dataconnectDataplaneClient = dataconnectDataplaneClient;
+async function executeGraphQL(client, servicePath, body) {
+    const res = await client.post(`${servicePath}:executeGraphql`, body, { resolveOnHTTPError: true });
     return res;
 }
 exports.executeGraphQL = executeGraphQL;

package/lib/dataconnect/fileUtils.js

@@ -8,7 +8,7 @@ const types_1 = require("./types");
 const utils_1 = require("../utils");
 const load_1 = require("./load");
 function readFirebaseJson(config) {
-    if (!config.has("dataconnect")) {
+    if (!(config === null || config === void 0 ? void 0 : config.has("dataconnect"))) {
         return [];
     }
     const validator = (cfg) => {
@@ -96,28 +96,34 @@ exports.pickService = pickService;
 const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];
 const IOS_INDICATORS = ["info.plist", "podfile", "package.swift"];
 const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle", "build.gradle.kts"];
+const DART_INDICATORS = ["pubspec.yaml", "pubspec.lock"];
 const IOS_POSTFIX_INDICATORS = [".xcworkspace", ".xcodeproj"];
 async function getPlatformFromFolder(dirPath) {
     const fileNames = await fs.readdir(dirPath);
     let hasWeb = false;
     let hasAndroid = false;
     let hasIOS = false;
+    let hasDart = false;
     for (const fileName of fileNames) {
         const cleanedFileName = fileName.toLowerCase();
         hasWeb || (hasWeb = WEB_INDICATORS.some((indicator) => indicator === cleanedFileName));
         hasAndroid || (hasAndroid = ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName));
         hasIOS || (hasIOS = IOS_INDICATORS.some((indicator) => indicator === cleanedFileName) ||
             IOS_POSTFIX_INDICATORS.some((indicator) => cleanedFileName.endsWith(indicator)));
+        hasDart || (hasDart = DART_INDICATORS.some((indicator) => indicator === cleanedFileName));
     }
-    if (hasWeb && !hasAndroid && !hasIOS) {
+    if (hasWeb && !hasAndroid && !hasIOS && !hasDart) {
         return types_1.Platform.WEB;
     }
-    else if (hasAndroid && !hasWeb && !hasIOS) {
+    else if (hasAndroid && !hasWeb && !hasIOS && !hasDart) {
         return types_1.Platform.ANDROID;
     }
-    else if (hasIOS && !hasWeb && !hasAndroid) {
+    else if (hasIOS && !hasWeb && !hasAndroid && !hasDart) {
         return types_1.Platform.IOS;
     }
+    else if (hasDart && !hasWeb && !hasIOS && !hasAndroid) {
+        return types_1.Platform.DART;
+    }
     return types_1.Platform.UNDETERMINED;
 }
 exports.getPlatformFromFolder = getPlatformFromFolder;
@@ -151,6 +157,12 @@ function generateSdkYaml(platform, connectorYaml, connectorYamlFolder, appFolder
             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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printFreeTrialUnavailable = exports.checkForFreeTrialInstance = exports.freeTrialTermsLink = void 0;
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
+const clc = require("colorette");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
@@ -13,11 +14,12 @@ async function checkForFreeTrialInstance(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) {
-    const message = `Project '${projectId}' already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect free trial. ` +
-        "The free trial only includes one CloudSQL instance. " +
-        `Consider using a separate database on ${instanceId}, or creating a new CloudSQL instance at ` +
-        "https://console.cloud.google.com/sql/instances";
-    utils.logLabeledError("dataconnect", message);
+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.printFreeTrialUnavailable = printFreeTrialUnavailable;

package/lib/dataconnect/provisionCloudSql.js

@@ -11,7 +11,7 @@ const freeTrial_1 = require("./freeTrial");
 const error_1 = require("../error");
 async function provisionCloudSql(args) {
     let connectionName = "";
-    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
+    const { projectId, locationId, instanceId, databaseId, configYamlPath, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
@@ -35,14 +35,14 @@ async function provisionCloudSql(args) {
         }
         const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(projectId);
         if (freeTrialInstanceId) {
-            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, freeTrialInstanceId);
-            throw new error_1.FirebaseError("Free trial unavailable.");
+            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, freeTrialInstanceId, configYamlPath);
+            throw new error_1.FirebaseError("Cannot create another no-cost trial Cloud SQL instance.");
         }
         const cta = dryRun ? "It will be created on your next deploy" : "Creating it now.";
         silent ||
             utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found.` +
                 cta +
-                `\nThis instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
+                `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
                 `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`);
         if (!dryRun) {
             const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration, waitForCreation), "Creating your instance...");

package/lib/dataconnect/types.js

@@ -12,6 +12,7 @@ var Platform;
     Platform["ANDROID"] = "ANDROID";
     Platform["WEB"] = "WEB";
     Platform["IOS"] = "IOS";
+    Platform["DART"] = "DART";
     Platform["UNDETERMINED"] = "UNDETERMINED";
 })(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {

package/lib/dataconnect/webhook.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendVSCodeMessage = exports.port = exports.DEFAULT_PORT = exports.VSCODE_MESSAGE = void 0;
+const node_fetch_1 = require("node-fetch");
+const logger_1 = require("../logger");
+var VSCODE_MESSAGE;
+(function (VSCODE_MESSAGE) {
+    VSCODE_MESSAGE["EMULATORS_STARTED"] = "EMULATORS_STARTED";
+    VSCODE_MESSAGE["EMULATORS_START_ERRORED"] = "EMULATORS_START_ERRORED";
+    VSCODE_MESSAGE["EMULATORS_SHUTDOWN"] = "EMULATORS_SHUTDOWN";
+})(VSCODE_MESSAGE = exports.VSCODE_MESSAGE || (exports.VSCODE_MESSAGE = {}));
+exports.DEFAULT_PORT = "40001";
+exports.port = process.env.VSCODE_WEBHOOK_PORT || exports.DEFAULT_PORT;
+async function sendVSCodeMessage(body) {
+    const jsonBody = JSON.stringify(body);
+    try {
+        return await (0, node_fetch_1.default)(`http://localhost:${exports.port}/vscode/notify`, {
+            method: "POST",
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                "x-mantle-admin": "all",
+            },
+            body: jsonBody,
+        });
+    }
+    catch (e) {
+        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}`);
+    }
+}
+exports.sendVSCodeMessage = sendVSCodeMessage;

package/lib/deploy/dataconnect/deploy.js

@@ -8,6 +8,7 @@ const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
 const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
+const node_path_1 = require("node:path");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -57,6 +58,7 @@ async function default_1(context, options) {
                 locationId: (0, names_1.parseServiceName)(s.serviceName).location,
                 instanceId,
                 databaseId,
+                configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                 enableGoogleMlIntegration,
                 waitForCreation: true,
             });

package/lib/deploy/dataconnect/prepare.js

@@ -16,6 +16,7 @@ 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");
 async function default_1(context, options) {
     var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -70,6 +71,7 @@ async function default_1(context, options) {
                     locationId: (0, names_1.parseServiceName)(s.serviceName).location,
                     instanceId,
                     databaseId,
+                    configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                     enableGoogleMlIntegration,
                     waitForCreation: true,
                     dryRun: options.dryRun,

package/lib/deploy/dataconnect/release.js

@@ -4,7 +4,9 @@ const utils = require("../../utils");
 const client_1 = require("../../dataconnect/client");
 const prompts_1 = require("../../dataconnect/prompts");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
+const projectUtils_1 = require("../../projectUtils");
 async function default_1(context, options) {
+    const project = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
     const filters = context.dataconnect.filters;
     const wantSchemas = serviceInfos
@@ -22,7 +24,7 @@ async function default_1(context, options) {
         });
     });
     if (wantSchemas.length) {
-        utils.logLabeledBullet("dataconnect", "Releasing Data Connect schemas...");
+        utils.logLabeledBullet("dataconnect", "Deploying Data Connect schemas...");
         for (const s of wantSchemas) {
             await (0, schemaMigration_1.migrateSchema)({
                 options,
@@ -31,7 +33,7 @@ async function default_1(context, options) {
                 schemaValidation: s.validationMode,
             });
         }
-        utils.logLabeledBullet("dataconnect", "Schemas released.");
+        utils.logLabeledBullet("dataconnect", "Schemas deployed.");
     }
     let wantConnectors = [];
     wantConnectors = wantConnectors.concat(...serviceInfos.map((si) => si.connectorInfo
@@ -48,7 +50,7 @@ async function default_1(context, options) {
         ? []
         : haveConnectors.filter((h) => !wantConnectors.some((w) => w.name === h.name));
     if (wantConnectors.length) {
-        utils.logLabeledBullet("dataconnect", "Releasing connectors...");
+        utils.logLabeledBullet("dataconnect", "Deploying connectors...");
         await Promise.all(wantConnectors.map(async (c) => {
             await (0, client_1.upsertConnector)(c);
             utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
@@ -56,9 +58,12 @@ async function default_1(context, options) {
         for (const c of connectorsToDelete) {
             await (0, prompts_1.promptDeleteConnector)(options, c.name);
         }
-        utils.logLabeledBullet("dataconnect", "Connectors released.");
+        utils.logLabeledBullet("dataconnect", "Connectors deployed.");
     }
-    utils.logLabeledSuccess("dataconnect", "Deploy complete!");
+    else {
+        utils.logLabeledBullet("dataconnect", "No connectors to deploy.");
+    }
+    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at ${utils.consoleUrl(project, "/dataconnect")}`);
     return;
 }
 exports.default = default_1;

package/lib/deploy/functions/runtimes/node/index.js

@@ -18,7 +18,8 @@ const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
 const fsutils_1 = require("../../../../fsutils");
-const MIN_FUNCTIONS_SDK_VERSION = "5.1.0";
+const MIN_FUNCTIONS_SDK_VERSION = "3.20.0";
+const MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES = "5.1.0";
 async function tryCreateDelegate(context) {
     const packageJsonPath = path.join(context.sourceDir, "package.json");
     if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {
@@ -156,6 +157,10 @@ class Delegate {
                 `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
             return parseTriggers.discoverBuild(this.projectId, this.sourceDir, this.runtime, config, env);
         }
+        if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES)) {
+            (0, utils_1.logLabeledBullet)("functions", `You are using a version of firebase-functions SDK (${this.sdkVersion}) that does not have support for the newest Firebase Extensions features. ` +
+                `Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES} to use them correctly`);
+        }
         let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
         if (!discovered) {
             const basePort = 8000 + (0, utils_1.randomInt)(0, 1000);

package/lib/emulator/commandUtils.js

@@ -20,6 +20,7 @@ const fsutils = require("../fsutils");
 const Table = require("cli-table");
 const track_1 = require("../track");
 const env_1 = require("./env");
+const webhook_1 = require("../dataconnect/webhook");
 exports.FLAG_ONLY = "--only <emulators>";
 exports.DESC_ONLY = "only specific emulators. " +
     "This is a comma separated list of emulator names. " +
@@ -291,13 +292,17 @@ async function emulatorExec(script, options) {
         extraEnv[constants_1.Constants.FIREBASE_GA_SESSION] = JSON.stringify(session);
     }
     let exitCode = 0;
-    let deprecationNotices;
+    let deprecationNotices = [];
     try {
         const showUI = !!options.ui;
         ({ deprecationNotices } = await controller.startAll(options, showUI, true));
+        await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_STARTED });
         exitCode = await runScript(script, extraEnv);
         await controller.onExit(options);
     }
+    catch (_a) {
+        await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_START_ERRORED });
+    }
     finally {
         await controller.cleanShutdown();
     }

package/lib/emulator/constants.js

@@ -32,7 +32,7 @@ exports.FIND_AVAILBLE_PORT_BY_DEFAULT = {
     storage: false,
     extensions: false,
     eventarc: true,
-    dataconnect: true,
+    dataconnect: false,
     tasks: true,
 };
 exports.EMULATOR_DESCRIPTION = {

package/lib/emulator/controller.js

@@ -46,6 +46,7 @@ const storage_1 = require("./storage");
 const fileUtils_1 = require("../dataconnect/fileUtils");
 const tasksEmulator_1 = require("./tasksEmulator");
 const apphosting_1 = require("./apphosting");
+const webhook_1 = require("../dataconnect/webhook");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function exportOnExit(options) {
     const exportOnExitDir = options.exportOnExit;
@@ -69,6 +70,7 @@ exports.onExit = onExit;
 async function cleanShutdown() {
     emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HUB).logLabeled("BULLET", "emulators", "Shutting down emulators.");
     await registry_1.EmulatorRegistry.stopAll();
+    await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_SHUTDOWN });
 }
 exports.cleanShutdown = cleanShutdown;
 function filterEmulatorTargets(options) {
@@ -161,7 +163,7 @@ function findExportMetadata(importPath) {
     }
 }
 async function startAll(options, showUI = true, runningTestScript = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const targets = filterEmulatorTargets(options);
     options.targets = targets;
     const singleProjectModeEnabled = ((_a = options.config.src.emulators) === null || _a === void 0 ? void 0 : _a.singleProjectMode) === undefined ||
@@ -249,6 +251,14 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                     portFixed: !!wsPortConfig,
                 };
             }
+            if (emulator === types_1.Emulators.DATACONNECT) {
+                const pglitePortConfig = (_f = (_e = options.config.src.emulators) === null || _e === void 0 ? void 0 : _e.dataconnect) === null || _f === void 0 ? void 0 : _f.postgresPort;
+                listenConfig["dataconnect.postgres"] = {
+                    host: config.host,
+                    port: pglitePortConfig || 5432,
+                    portFixed: !!pglitePortConfig,
+                };
+            }
         }
     }
     let listenForEmulator = await (0, portUtils_1.resolveHostAndAssignPorts)(listenConfig);
@@ -315,7 +325,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         utils.assertIsStringOrUndefined(options.extDevDir);
         for (const cfg of functionsCfg) {
             const functionsDir = path.join(projectDir, cfg.source);
-            const runtime = ((_e = options.extDevRuntime) !== null && _e !== void 0 ? _e : cfg.runtime);
+            const runtime = ((_g = options.extDevRuntime) !== null && _g !== void 0 ? _g : cfg.runtime);
             if (runtime && !(0, supported_1.isRuntime)(runtime)) {
                 throw new error_1.FirebaseError(`Cannot load functions from ${functionsDir} because it has invalid runtime ${runtime}`);
             }
@@ -335,7 +345,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     }
     if (emulatableBackends.length) {
         if (!listenForEmulator.functions || !listenForEmulator.eventarc || !listenForEmulator.tasks) {
-            listenForEmulator = await (0, portUtils_1.resolveHostAndAssignPorts)(Object.assign(Object.assign({}, listenForEmulator), { functions: (_f = listenForEmulator.functions) !== null && _f !== void 0 ? _f : getListenConfig(options, types_1.Emulators.FUNCTIONS), eventarc: (_g = listenForEmulator.eventarc) !== null && _g !== void 0 ? _g : getListenConfig(options, types_1.Emulators.EVENTARC), tasks: (_h = listenForEmulator.eventarc) !== null && _h !== void 0 ? _h : getListenConfig(options, types_1.Emulators.TASKS) }));
+            listenForEmulator = await (0, portUtils_1.resolveHostAndAssignPorts)(Object.assign(Object.assign({}, listenForEmulator), { functions: (_h = listenForEmulator.functions) !== null && _h !== void 0 ? _h : getListenConfig(options, types_1.Emulators.FUNCTIONS), eventarc: (_j = listenForEmulator.eventarc) !== null && _j !== void 0 ? _j : getListenConfig(options, types_1.Emulators.EVENTARC), tasks: (_k = listenForEmulator.eventarc) !== null && _k !== void 0 ? _k : getListenConfig(options, types_1.Emulators.TASKS) }));
             hubLogger.log("DEBUG", "late-assigned ports for functions and eventarc emulators", {
                 user: listenForEmulator,
             });
@@ -544,6 +554,10 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             configDir,
             rc: options.rc,
             config: options.config,
+            autoconnectToPostgres: true,
+            postgresListen: listenForEmulator["dataconnect.postgres"],
+            enable_output_generated_sdk: true,
+            enable_output_schema_extensions: true,
         });
         await startEmulator(dataConnectEmulator);
     }

package/lib/emulator/dataconnect/pg-gateway/auth/base-auth-flow.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseAuthFlow = void 0;
+class BaseAuthFlow {
+    constructor(params) {
+        this.reader = params.reader;
+        this.writer = params.writer;
+        this.connectionState = params.connectionState;
+    }
+}
+exports.BaseAuthFlow = BaseAuthFlow;