firebase-tools 13.4.1 → 13.5.1

package/lib/deploy/functions/release/fabricator.js

@@ -330,7 +330,9 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
         else if (backend.isScheduleTriggered(endpoint)) {
-            const invoker = [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
+            const invoker = endpoint.serviceAccount
+                ? [endpoint.serviceAccount]
+                : [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
             await this.executor
                 .run(() => run.setInvokerCreate(endpoint.project, serviceName, invoker))
                 .catch(rethrowAs(endpoint, "set invoker"));
@@ -411,7 +413,9 @@ class Fabricator {
             invoker = ["public"];
         }
         else if (backend.isScheduleTriggered(endpoint)) {
-            invoker = [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
+            invoker = endpoint.serviceAccount
+                ? [endpoint.serviceAccount]
+                : [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
         }
         if (invoker) {
             await this.executor

package/lib/emulator/commandUtils.js

@@ -117,13 +117,16 @@ async function beforeEmulatorCommand(options) {
 }
 exports.beforeEmulatorCommand = beforeEmulatorCommand;
 function parseInspectionPort(options) {
-    let port = options.inspectFunctions;
-    if (port === true) {
-        port = "9229";
+    const port = options.inspectFunctions;
+    if (typeof port === "undefined") {
+        return false;
+    }
+    else if (typeof port === "boolean") {
+        return port;
     }
     const parsed = Number(port);
     if (isNaN(parsed) || parsed < 1024 || parsed > 65535) {
-        throw new error_1.FirebaseError(`"${port}" is not a valid port for debugging, please pass an integer between 1024 and 65535.`);
+        throw new error_1.FirebaseError(`"${port}" is not a valid port for debugging, please pass an integer between 1024 and 65535 or true for a dynamic port.`);
     }
     return parsed;
 }

package/lib/emulator/controller.js

@@ -332,10 +332,9 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         const functionsLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS);
         const functionsAddr = legacyGetFirstAddr(types_1.Emulators.FUNCTIONS);
         const projectId = (0, projectUtils_1.needProjectId)(options);
-        let inspectFunctions;
-        if (options.inspectFunctions) {
-            inspectFunctions = commandUtils.parseInspectionPort(options);
-            functionsLogger.logLabeled("WARN", "functions", `You are running the Functions emulator in debug mode (port=${inspectFunctions}). This means that functions will execute in sequence rather than in parallel.`);
+        const inspectFunctions = commandUtils.parseInspectionPort(options);
+        if (inspectFunctions) {
+            functionsLogger.logLabeled("WARN", "functions", `You are running the Functions emulator in debug mode. This means that functions will execute in sequence rather than in parallel.`);
         }
         const emulatorsNotRunning = types_1.ALL_SERVICE_EMULATORS.filter((e) => {
             return e !== types_1.Emulators.FUNCTIONS && !listenForEmulator[e];

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "2fd771101c0e1f7898c04c9204f2ce63",
     },
     firestore: {
-        version: "1.19.2",
-        expectedSize: 67203281,
-        expectedChecksum: "167205aea99351c08ef293f35009a63c",
+        version: "1.19.3",
+        expectedSize: 67296394,
+        expectedChecksum: "08a9b882a5c38570b6333f3931b1e52b",
     },
     storage: {
         version: "1.1.3",
@@ -35,9 +35,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.11.7",
-            expectedSize: 3064105,
-            expectedChecksum: "bd2bcc331cbf613a5b3b55a1ce08998b",
+            version: "1.11.8",
+            expectedSize: 3523907,
+            expectedChecksum: "49f6dc1911dda9d10df62a6c09aaf9a0",
         },
     pubsub: {
         version: "0.7.1",
@@ -83,7 +83,7 @@ exports.DownloadDetails = {
         version: EMULATOR_UPDATE_DETAILS.ui.version,
         downloadPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`),
         unzipDir: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`),
-        binaryPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`, "server", "server.js"),
+        binaryPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`, "server", "server.mjs"),
         opts: {
             cacheDir: CACHE_DIR,
             remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`,

package/lib/emulator/functionsEmulator.js

@@ -84,6 +84,11 @@ class FunctionsEmulator {
         this.debugMode = false;
         emulatorLogger_1.EmulatorLogger.setVerbosity(this.args.verbosity ? emulatorLogger_1.Verbosity[this.args.verbosity] : emulatorLogger_1.Verbosity["DEBUG"]);
         if (this.args.debugPort) {
+            const maybeNodeCodebases = this.args.emulatableBackends.filter((b) => !b.runtime || b.runtime.startsWith("node"));
+            if (maybeNodeCodebases.length > 1 && typeof this.args.debugPort === "number") {
+                throw new error_1.FirebaseError("Cannot debug on a single port with multiple codebases. " +
+                    "Use --inspect-functions=true to assign dynamic ports to each codebase");
+            }
             this.args.disabledRuntimeFeatures = this.args.disabledRuntimeFeatures || {};
             this.args.disabledRuntimeFeatures.timeout = true;
             this.debugMode = true;
@@ -847,8 +852,22 @@ class FunctionsEmulator {
                 this.logger.log("WARN", `To enable function inspection, please run "npm i node@${semver.coerce(backend.runtime || "18.0.0")} --save-dev" in your functions directory`);
             }
             else {
+                let port;
+                if (typeof this.args.debugPort === "number") {
+                    port = this.args.debugPort;
+                }
+                else {
+                    port = await portfinder.getPortPromise({ port: 9229 });
+                    if (port === 9229) {
+                        this.logger.logLabeled("SUCCESS", "functions", `Using debug port 9229 for functions codebase ${backend.codebase}`);
+                    }
+                    else {
+                        this.logger.logLabeled("SUCCESS", "functions", `Using debug port ${port} for functions codebase ${backend.codebase}. ` +
+                            "You may need to add manually add this port to your inspector.");
+                    }
+                }
                 const { host } = this.getInfo();
-                args.unshift(`--inspect=${(0, utils_1.connectableHostname)(host)}:${this.args.debugPort}`);
+                args.unshift(`--inspect=${(0, utils_1.connectableHostname)(host)}:${port}`);
             }
         }
         const pnpPath = path.join(backend.functionsDir, ".pnp.js");
@@ -865,7 +884,7 @@ class FunctionsEmulator {
         const socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)();
         const childProcess = spawn(bin, args, {
             cwd: backend.functionsDir,
-            env: Object.assign(Object.assign(Object.assign({ node: backend.bin }, process.env), envs), { PORT: socketPath }),
+            env: Object.assign(Object.assign(Object.assign({ node: backend.bin, METADATA_SERVER_DETECTION: "none" }, process.env), envs), { PORT: socketPath }),
             stdio: ["pipe", "pipe", "pipe", "ipc"],
         });
         return Promise.resolve({

package/lib/gcp/apphosting.js

@@ -129,7 +129,7 @@ async function ensureApiEnabled(options) {
 }
 exports.ensureApiEnabled = ensureApiEnabled;
 async function getNextRolloutId(projectId, location, backendId, counter) {
-    var _a;
+    var _a, _b;
     const date = new Date();
     const year = date.getUTCFullYear();
     const month = String(date.getUTCMonth() + 1).padStart(2, "0");
@@ -137,22 +137,28 @@ async function getNextRolloutId(projectId, location, backendId, counter) {
     if (counter) {
         return `build-${year}-${month}-${day}-${String(counter).padStart(3, "0")}`;
     }
-    const builds = await exports.listRollouts(projectId, location, backendId);
-    if ((_a = builds.unreachable) === null || _a === void 0 ? void 0 : _a.includes(location)) {
+    const rolloutsPromise = exports.listRollouts(projectId, location, backendId);
+    const buildsPromise = exports.listBuilds(projectId, location, backendId);
+    const [rollouts, builds] = await Promise.all([rolloutsPromise, buildsPromise]);
+    if (((_a = builds.unreachable) === null || _a === void 0 ? void 0 : _a.includes(location)) || ((_b = rollouts.unreachable) === null || _b === void 0 ? void 0 : _b.includes(location))) {
         throw new error_1.FirebaseError(`Firebase App Hosting is currently unreachable in location ${location}`);
     }
-    let highest = 0;
-    const test = new RegExp(`projects/${projectId}/locations/${location}/backends/${backendId}/rollouts/build-${year}-${month}-${day}-(\\d+)`);
-    for (const rollout of builds.rollouts) {
-        const match = rollout.name.match(test);
-        if (!match) {
-            continue;
-        }
-        const n = Number(match[1]);
-        if (n > highest) {
-            highest = n;
+    const test = new RegExp(`projects/${projectId}/locations/${location}/backends/${backendId}/(rollouts|builds)/build-${year}-${month}-${day}-(\\d+)`);
+    const highestId = (input) => {
+        let highest = 0;
+        for (const i of input) {
+            const match = i.name.match(test);
+            if (!match) {
+                continue;
+            }
+            const n = Number(match[2]);
+            if (n > highest) {
+                highest = n;
+            }
         }
-    }
+        return highest;
+    };
+    const highest = Math.max(highestId(builds.builds), highestId(rollouts.rollouts));
     return `build-${year}-${month}-${day}-${String(highest + 1).padStart(3, "0")}`;
 }
 exports.getNextRolloutId = getNextRolloutId;

package/lib/gcp/cloudfunctionsv2.js

@@ -215,6 +215,9 @@ function functionFromEndpoint(endpoint) {
             eventType: endpoint.eventTrigger.eventType,
             retryPolicy: "RETRY_POLICY_UNSPECIFIED",
         };
+        if (endpoint.serviceAccount) {
+            gcfFunction.eventTrigger.serviceAccountEmail = endpoint.serviceAccount;
+        }
         if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
             if (!((_b = endpoint.eventTrigger.eventFilters) === null || _b === void 0 ? void 0 : _b.topic)) {
                 throw new error_1.FirebaseError("Error: Pub/Sub event trigger is missing topic: " +

package/lib/gcp/cloudscheduler.js

@@ -112,6 +112,7 @@ function topicNameForEndpoint(endpoint) {
 }
 exports.topicNameForEndpoint = topicNameForEndpoint;
 function jobFromEndpoint(endpoint, location, projectNumber) {
+    var _a;
     const job = {};
     job.name = jobNameForEndpoint(endpoint, location);
     if (endpoint.platform === "gcfv1") {
@@ -129,7 +130,7 @@ function jobFromEndpoint(endpoint, location, projectNumber) {
             uri: endpoint.uri,
             httpMethod: "POST",
             oidcToken: {
-                serviceAccountEmail: (0, checkIam_1.getDefaultComputeServiceAgent)(projectNumber),
+                serviceAccountEmail: (_a = endpoint.serviceAccount) !== null && _a !== void 0 ? _a : (0, checkIam_1.getDefaultComputeServiceAgent)(projectNumber),
             },
         };
     }

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

@@ -172,31 +172,9 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
     (0, utils_1.logBullet)("Starting a new rollout... this may take a few minutes.");
     const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, 1);
     const buildOp = await apphosting.createBuild(projectId, location, backendId, buildId, buildInput);
-    const rolloutBody = {
+    const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, {
         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 new Promise((resolve) => setTimeout(resolve, 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]);

package/lib/serve/functions.js

@@ -8,6 +8,7 @@ const auth_1 = require("../auth");
 const projectConfig = require("../functions/projectConfig");
 const utils = require("../utils");
 const registry_1 = require("../emulator/registry");
+const commandUtils_1 = require("../emulator/commandUtils");
 class FunctionsServer {
     assertServer() {
         if (!this.emulator || !this.backends) {
@@ -31,7 +32,7 @@ class FunctionsServer {
         }
         this.backends = backends;
         const account = (0, auth_1.getProjectDefaultAccount)(options.config.projectDir);
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: this.backends, projectAlias: options.projectAlias, account }, partialArgs);
+        const args = Object.assign(Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: this.backends, projectAlias: options.projectAlias, account }, partialArgs), { debugPort: (0, commandUtils_1.parseInspectionPort)(options) });
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;

package/package.json

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