firebase-tools 15.22.1 → 15.22.3

package/lib/apiv2.js

@@ -4,12 +4,15 @@ exports.Client = exports.CLI_OAUTH_PROJECT_NUMBER = exports.GOOG_USER_PROJECT_HE
 exports.setRefreshToken = setRefreshToken;
 exports.setAccessToken = setAccessToken;
 exports.getAccessToken = getAccessToken;
+exports.noKeepAliveAgent = noKeepAliveAgent;
 const url_1 = require("url");
 const stream_1 = require("stream");
 const proxy_agent_1 = require("proxy-agent");
 const retry = require("retry");
 const abort_controller_1 = require("abort-controller");
 const node_fetch_1 = require("node-fetch");
+const http = require("http");
+const https = require("https");
 const util_1 = require("util");
 const auth = require("./auth");
 const error_1 = require("./error");
@@ -59,6 +62,28 @@ function proxyURIFromEnv() {
         process.env.http_proxy ||
         undefined);
 }
+const httpAgentNoKeepAlive = new http.Agent({ keepAlive: false });
+const httpsAgentNoKeepAlive = new https.Agent({ keepAlive: false });
+function noKeepAliveAgent(parsedURL) {
+    return parsedURL.protocol === "https:" ? httpsAgentNoKeepAlive : httpAgentNoKeepAlive;
+}
+function isPrematureCloseError(err) {
+    for (const candidate of [err, err?.original]) {
+        if (!candidate) {
+            continue;
+        }
+        const e = candidate;
+        const code = e.code || e.errno;
+        const message = typeof e.message === "string" ? e.message : "";
+        if (code === "ERR_STREAM_PREMATURE_CLOSE" ||
+            code === "ECONNRESET" ||
+            /premature close/i.test(message) ||
+            /socket hang up/i.test(message)) {
+            return true;
+        }
+    }
+    return false;
+}
 class Client {
     constructor(opts) {
         this.opts = opts;
@@ -237,9 +262,17 @@ class Client {
             };
             fetchOptions.signal = signal;
         }
-        if (typeof options.body === "string" || isStream(options.body)) {
+        let bodyReplayable = true;
+        if (typeof options.body === "string" || Buffer.isBuffer(options.body)) {
             fetchOptions.body = options.body;
         }
+        else if (options.body instanceof FormData) {
+            fetchOptions.body = options.body.getBuffer();
+        }
+        else if (isStream(options.body)) {
+            fetchOptions.body = options.body;
+            bodyReplayable = false;
+        }
         else if (options.body !== undefined) {
             fetchOptions.body = JSON.stringify(options.body);
         }
@@ -258,6 +291,7 @@ class Client {
             operationOptions.maxTimeout = options.retryMaxTimeout;
         }
         const operation = retry.operation(operationOptions);
+        let disabledKeepAlive = false;
         return await new Promise((resolve, reject) => {
             operation.attempt(async (currentAttempt) => {
                 let res;
@@ -314,6 +348,20 @@ class Client {
                     }
                 }
                 catch (err) {
+                    if (!disabledKeepAlive &&
+                        bodyReplayable &&
+                        !proxyURIFromEnv() &&
+                        isPrematureCloseError(err)) {
+                        disabledKeepAlive = true;
+                        fetchOptions.agent = noKeepAliveAgent;
+                        const closeHeaders = new node_fetch_1.Headers(fetchOptions.headers);
+                        closeHeaders.set("Connection", "close");
+                        fetchOptions.headers = closeHeaders;
+                        logger_1.logger.debug(`*** [apiv2] retrying ${fetchURL} without keep-alive after a premature close error`);
+                        if (operation.retry(err instanceof Error ? err : new Error(`${err}`))) {
+                            return;
+                        }
+                    }
                     return err instanceof error_1.FirebaseError ? reject(err) : reject(new error_1.FirebaseError(`${err}`));
                 }
                 this.logResponse(res, body, options);

package/lib/deploy/functions/services/authEventarc.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAuthEventarcTriggerRegion = ensureAuthEventarcTriggerRegion;
+const error_1 = require("../../../error");
+function ensureAuthEventarcTriggerRegion(endpoint) {
+    if (!endpoint.eventTrigger.region) {
+        endpoint.eventTrigger.region = "global";
+    }
+    if (endpoint.eventTrigger.region !== "global") {
+        throw new error_1.FirebaseError("A Firebase Auth Eventarc trigger must specify 'global' trigger location");
+    }
+    return Promise.resolve();
+}

package/lib/deploy/functions/services/index.js

@@ -11,6 +11,7 @@ const testLab_1 = require("./testLab");
 const firestore_1 = require("./firestore");
 const dataconnect_1 = require("./dataconnect");
 const ailogic_1 = require("./ailogic");
+const authEventarc_1 = require("./authEventarc");
 const noop = () => Promise.resolve();
 exports.noop = noop;
 const noopProjectBindings = () => Promise.resolve([]);
@@ -108,6 +109,16 @@ const dataconnectService = {
     unregisterTrigger: exports.noop,
     getDefaultRegion: dataconnect_1.getDefaultRegion,
 };
+const authEventarcService = {
+    name: "autheventarc",
+    api: "eventarc.googleapis.com",
+    requiredProjectBindings: exports.noopProjectBindings,
+    ensureTriggerRegion: authEventarc_1.ensureAuthEventarcTriggerRegion,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
+    getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
+};
 const EVENT_SERVICE_MAPPING = {
     "google.cloud.pubsub.topic.v1.messagePublished": pubSubService,
     "google.cloud.storage.object.v1.finalized": storageService,
@@ -136,6 +147,8 @@ const EVENT_SERVICE_MAPPING = {
     "google.firebase.dataconnect.connector.v1.mutationExecuted": dataconnectService,
     "google.firebase.ailogic.v1.beforeGenerate": aiLogicService,
     "google.firebase.ailogic.v1.afterGenerate": aiLogicService,
+    "google.firebase.auth.user.v2.created": authEventarcService,
+    "google.firebase.auth.user.v2.deleted": authEventarcService,
 };
 function serviceForEndpoint(endpoint) {
     let eventType;

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.4.13",
-            "expectedSize": 32456560,
-            "expectedChecksum": "92a91871a0228b5362a8f33b6c9d3cbf",
-            "expectedChecksumSHA256": "b872c6dff20ca6303b0c4f438907ff5a640062c565878b21a3bf19bbd102af03",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.13",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.13"
+            "version": "3.4.14",
+            "expectedSize": 32468976,
+            "expectedChecksum": "d62fc079187a1adc2ceef7dc0e1a1e44",
+            "expectedChecksumSHA256": "4bbf0ae04ca83dcc765804549d30f94d02c7a8b6baeef5f3c52104e771627e43",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.14",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.14"
         },
         "darwin_arm64": {
-            "version": "3.4.13",
-            "expectedSize": 30588130,
-            "expectedChecksum": "f5aa657a9577ed9e10a8c3f2dde81f3f",
-            "expectedChecksumSHA256": "5be04cbb6537afe7be953ae2d2cf7bad359bd2f9e181ebbd6dab5195493d7e78",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.13",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.13"
+            "version": "3.4.14",
+            "expectedSize": 30604754,
+            "expectedChecksum": "306e88ebe314eec82ae44842aa87d20e",
+            "expectedChecksumSHA256": "3eeaf0dbfd48d3d7cf761e256e8850bc6159dccc128dd59f87bbeeaaaa6a62c6",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.14",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.14"
         },
         "win32": {
-            "version": "3.4.13",
-            "expectedSize": 32494592,
-            "expectedChecksum": "6ee9ba34ee39693847d903f9dadb7f3e",
-            "expectedChecksumSHA256": "d76fb70953d2df92d414901380f19863da14443c05da93d9888c2469feba613a",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.13",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.13.exe"
+            "version": "3.4.14",
+            "expectedSize": 32509952,
+            "expectedChecksum": "c5cbd9482be394bf466d4328b975d88e",
+            "expectedChecksumSHA256": "b9f14587c5d5f87bccd093e1dddc9f5bb2a77be007201028d9ee8339e79219f0",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.14",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.14.exe"
         },
         "linux": {
-            "version": "3.4.13",
-            "expectedSize": 31613112,
-            "expectedChecksum": "15e94d04f887b73e932a65a27e4ff080",
-            "expectedChecksumSHA256": "3eb5acc989dea31fecc0b8a9eab6db3bc23f6f49f600012cffef837561189728",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.13",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.13"
+            "version": "3.4.14",
+            "expectedSize": 31625400,
+            "expectedChecksum": "506a09ca12b61df98f705728047219dd",
+            "expectedChecksumSHA256": "257d7aa4f4dd1e4de9c9d3db9f7b7834323f0d53e658e6814a933b1ec73ca27d",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.14",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.14"
         }
     }
 }

package/lib/extensions/checkProjectBilling.js

@@ -29,7 +29,7 @@ async function openBillingAccount(projectId, url, open) {
         message: "Press enter when finished upgrading your project to continue setting up your extension.",
         default: true,
     });
-    return cloudbilling.checkBillingEnabled(projectId);
+    return cloudbilling.checkBillingEnabled(projectId, true);
 }
 async function chooseBillingAccount(projectId, accounts) {
     const choices = accounts.map((m) => m.displayName);
@@ -65,7 +65,7 @@ async function setUpBillingAccount(projectId) {
     return logBillingStatus(billingEnabled, projectId);
 }
 async function enableBilling(projectId) {
-    const billingAccounts = await cloudbilling.listBillingAccounts();
+    const billingAccounts = await cloudbilling.listBillingAccounts(projectId);
     if (billingAccounts) {
         const accounts = billingAccounts.filter((account) => account.open);
         return accounts.length > 0

package/lib/functions/events/v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AI_LOGIC_TRIGGERS_TO_EVENTS = exports.AI_LOGIC_EVENTS_TO_TRIGGER = exports.CONVERTABLE_EVENTS = exports.DATACONNECT_EVENT = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.AI_LOGIC_TRIGGERS_TO_EVENTS = exports.AI_LOGIC_EVENTS_TO_TRIGGER = exports.CONVERTABLE_EVENTS = exports.AUTH_EVENTS = exports.DATACONNECT_EVENT = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
 const ailogic_1 = require("../../deploy/functions/services/ailogic");
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
@@ -30,6 +30,10 @@ exports.FIRESTORE_EVENTS = [
 ];
 exports.FIREALERTS_EVENT = "google.firebase.firebasealerts.alerts.v1.published";
 exports.DATACONNECT_EVENT = "google.firebase.dataconnect.connector.v1.mutationExecuted";
+exports.AUTH_EVENTS = [
+    "google.firebase.auth.user.v2.created",
+    "google.firebase.auth.user.v2.deleted",
+];
 exports.CONVERTABLE_EVENTS = {
     "google.cloud.firestore.document.v1.created": "google.cloud.firestore.document.v1.created.withAuthContext",
     "google.cloud.firestore.document.v1.updated": "google.cloud.firestore.document.v1.updated.withAuthContext",

package/lib/gcp/cloudbilling.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBillingEnabled = isBillingEnabled;
+exports.clearCache = clearCache;
 exports.checkBillingEnabled = checkBillingEnabled;
 exports.setBillingAccount = setBillingAccount;
 exports.listBillingAccounts = listBillingAccounts;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const utils = require("../utils");
+const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({ urlPrefix: (0, api_1.cloudbillingOrigin)(), apiVersion: API_VERSION });
 async function isBillingEnabled(setup) {
@@ -19,20 +21,51 @@ async function isBillingEnabled(setup) {
     setup.isBillingEnabled = await checkBillingEnabled(setup.projectId);
     return setup.isBillingEnabled;
 }
-async function checkBillingEnabled(projectId) {
-    const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), {
-        retries: 3,
-        retryCodes: [429, 500, 503],
+const billingEnabledCache = new Map();
+function clearCache() {
+    billingEnabledCache.clear();
+}
+function checkBillingEnabled(projectId, forceRefresh = false) {
+    if (!forceRefresh) {
+        const cached = billingEnabledCache.get(projectId);
+        if (cached !== undefined) {
+            return cached;
+        }
+    }
+    const promise = (async () => {
+        await (0, ensureApiEnabled_1.ensure)(projectId, "cloudbilling.googleapis.com", "billing", true);
+        const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), {
+            retries: 3,
+            retryCodes: [429, 500, 503],
+            headers: { "x-goog-user-project": projectId },
+        });
+        return res.body.billingEnabled;
+    })().catch((err) => {
+        billingEnabledCache.delete(projectId);
+        throw err;
     });
-    return res.body.billingEnabled;
+    billingEnabledCache.set(projectId, promise);
+    return promise;
 }
 async function setBillingAccount(projectId, billingAccountName) {
+    await (0, ensureApiEnabled_1.ensure)(projectId, "cloudbilling.googleapis.com", "billing", true);
     const res = await client.put(utils.endpoint(["projects", projectId, "billingInfo"]), {
         billingAccountName: billingAccountName,
-    }, { retryCodes: [429, 500, 503] });
-    return res.body.billingEnabled;
+    }, {
+        retryCodes: [429, 500, 503],
+        headers: { "x-goog-user-project": projectId },
+    });
+    const enabled = res.body.billingEnabled;
+    billingEnabledCache.set(projectId, Promise.resolve(enabled));
+    return enabled;
 }
-async function listBillingAccounts() {
-    const res = await client.get(utils.endpoint(["billingAccounts"]), { retryCodes: [429, 500, 503] });
+async function listBillingAccounts(projectId) {
+    if (projectId) {
+        await (0, ensureApiEnabled_1.ensure)(projectId, "cloudbilling.googleapis.com", "billing", true);
+    }
+    const res = await client.get(utils.endpoint(["billingAccounts"]), {
+        retryCodes: [429, 500, 503],
+        headers: projectId ? { "x-goog-user-project": projectId } : undefined,
+    });
     return res.body.billingAccounts || [];
 }

package/lib/mcp/index.js

@@ -274,7 +274,7 @@ class FirebaseMcpServer {
     async mcpCallTool(request) {
         await this.detectProjectRoot();
         const toolName = request.params.name;
-        const toolArgs = request.params.arguments;
+        const toolArgs = request.params.arguments ?? {};
         const tool = await this.getTool(toolName);
         if (!tool)
             throw new Error(`Tool '${toolName}' could not be found.`);

package/lib/mcp/tool.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tool = tool;
-const zod_to_json_schema_1 = require("zod-to-json-schema");
+const zod_1 = require("zod");
 const util_1 = require("./util");
 const availability_1 = require("./util/availability");
 function tool(feature, options, fn) {
     const { isAvailable, ...mcpOptions } = options;
     return {
-        mcp: { ...mcpOptions, inputSchema: (0, util_1.cleanSchema)((0, zod_to_json_schema_1.zodToJsonSchema)(options.inputSchema)) },
+        mcp: {
+            ...mcpOptions,
+            inputSchema: (0, util_1.cleanSchema)(zod_1.z.toJSONSchema(options.inputSchema, { target: "draft-7", io: "input" })),
+        },
         fn,
         isAvailable: (ctx) => {
             const isAvailableFunc = isAvailable || (0, availability_1.getDefaultFeatureAvailabilityCheck)(feature);

package/lib/mcp/tools/apphosting/fetch_logs.js

@@ -30,7 +30,7 @@ exports.fetch_logs = (0, tool_1.tool)("apphosting", {
         requiresAuth: true,
         requiresProject: true,
     },
-}, async ({ buildLogs, backendId, location } = {}, { projectId }) => {
+}, async ({ buildLogs, backendId, location }, { projectId }) => {
     location || (location = "");
     if (!backendId) {
         return (0, util_1.toContent)(`backendId must be specified.`);

package/lib/mcp/tools/apphosting/list_backends.js

@@ -30,7 +30,7 @@ exports.list_backends = (0, tool_1.tool)("apphosting", {
         requiresAuth: true,
         requiresProject: true,
     },
-}, async ({ location } = {}, { projectId }) => {
+}, async ({ location }, { projectId }) => {
     projectId = projectId || "";
     if (!location)
         location = "-";

package/lib/requireAuth.js

@@ -20,7 +20,17 @@ function getAuthClient(config) {
     if (authClient) {
         return authClient;
     }
-    authClient = new google_auth_library_1.GoogleAuth(config);
+    const authConfig = {
+        ...config,
+        clientOptions: {
+            ...config.clientOptions,
+            transporterOptions: {
+                ...config.clientOptions?.transporterOptions,
+                agent: apiv2.noKeepAliveAgent,
+            },
+        },
+    };
+    authClient = new google_auth_library_1.GoogleAuth(authConfig);
     return authClient;
 }
 async function autoAuth(options, authScopes) {