firebase-tools 12.5.4 → 12.6.1

package/lib/appdistribution/client.js

@@ -40,7 +40,7 @@ class AppDistributionClient {
             method: "POST",
             path: `/upload/v1/${appName}/releases:upload`,
             headers: {
-                "X-Goog-Upload-File-Name": distribution.getFileName(),
+                "X-Goog-Upload-File-Name": encodeURIComponent(distribution.getFileName()),
                 "X-Goog-Upload-Protocol": "raw",
                 "Content-Type": "application/octet-stream",
             },

package/lib/commands/experiments-list.js

@@ -6,7 +6,9 @@ const Table = require("cli-table");
 const experiments = require("../experiments");
 const functional_1 = require("../functional");
 const logger_1 = require("../logger");
-exports.command = new command_1.Command("experiments:list").action(() => {
+exports.command = new command_1.Command("experiments:list")
+    .description("list all experiments, along with a description of each experiment and whether it is currently enabled")
+    .action(() => {
     const table = new Table({
         head: ["Enabled", "Name", "Description"],
         style: { head: ["yellow"] },

package/lib/deploy/functions/build.js

@@ -185,7 +185,7 @@ function toBackend(build, paramValues) {
                 throw new error_1.FirebaseError("platform can't be undefined");
             }
             const bkEndpoint = Object.assign({ id: endpointId, project: bdEndpoint.project, region: region, entryPoint: bdEndpoint.entryPoint, platform: bdEndpoint.platform, runtime: bdEndpoint.runtime }, trigger);
-            proto.copyIfPresent(bkEndpoint, bdEndpoint, "environmentVariables", "labels", "secretEnvironmentVariables", "serviceAccount");
+            proto.copyIfPresent(bkEndpoint, bdEndpoint, "environmentVariables", "labels", "secretEnvironmentVariables");
             proto.convertIfPresent(bkEndpoint, bdEndpoint, "ingressSettings", (from) => {
                 if (from !== null && !backend.AllIngressSettings.includes(from)) {
                     throw new error_1.FirebaseError(`Cannot set ingress settings to invalid value ${from}`);
@@ -199,6 +199,7 @@ function toBackend(build, paramValues) {
                 }
                 return mem || null;
             });
+            r.resolveStrings(bkEndpoint, bdEndpoint, "serviceAccount");
             r.resolveInts(bkEndpoint, bdEndpoint, "timeoutSeconds", "maxInstances", "minInstances", "concurrency");
             proto.convertIfPresent(bkEndpoint, bdEndpoint, "cpu", (0, functional_1.nullsafeVisitor)((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))));
             if (bdEndpoint.vpc) {

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

@@ -95,17 +95,18 @@ class Fabricator {
             deployResults.push(result);
         };
         const upserts = [];
-        const scraper = new sourceTokenScraper_1.SourceTokenScraper();
+        const scraperV1 = new sourceTokenScraper_1.SourceTokenScraper();
+        const scraperV2 = new sourceTokenScraper_1.SourceTokenScraper();
         for (const endpoint of changes.endpointsToCreate) {
             this.logOpStart("creating", endpoint);
-            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraper)));
+            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraperV1, scraperV2)));
         }
         for (const endpoint of changes.endpointsToSkip) {
             utils.logSuccess(this.getLogSuccessMessage("skip", endpoint));
         }
         for (const update of changes.endpointsToUpdate) {
             this.logOpStart("updating", update.endpoint);
-            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraper)));
+            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraperV1, scraperV2)));
         }
         await utils.allSettled(upserts);
         if (deployResults.find((r) => r.error)) {
@@ -126,31 +127,31 @@ class Fabricator {
         await utils.allSettled(deletes);
         return deployResults;
     }
-    async createEndpoint(endpoint, scraper) {
+    async createEndpoint(endpoint, scraperV1, scraperV2) {
         endpoint.labels = Object.assign(Object.assign({}, endpoint.labels), deploymentTool.labels());
         if (endpoint.platform === "gcfv1") {
-            await this.createV1Function(endpoint, scraper);
+            await this.createV1Function(endpoint, scraperV1);
         }
         else if (endpoint.platform === "gcfv2") {
-            await this.createV2Function(endpoint);
+            await this.createV2Function(endpoint, scraperV2);
         }
         else {
             (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         await this.setTrigger(endpoint);
     }
-    async updateEndpoint(update, scraper) {
+    async updateEndpoint(update, scraperV1, scraperV2) {
         update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
-            await this.createEndpoint(update.endpoint, scraper);
+            await this.createEndpoint(update.endpoint, scraperV1, scraperV2);
             return;
         }
         if (update.endpoint.platform === "gcfv1") {
-            await this.updateV1Function(update.endpoint, scraper);
+            await this.updateV1Function(update.endpoint, scraperV1);
         }
         else if (update.endpoint.platform === "gcfv2") {
-            await this.updateV2Function(update.endpoint);
+            await this.updateV2Function(update.endpoint, scraperV2);
         }
         else {
             (0, functional_1.assertExhaustive)(update.endpoint.platform);
@@ -221,7 +222,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async createV2Function(endpoint) {
+    async createV2Function(endpoint, scraper) {
         var _a, _b, _c, _d, _e;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -275,10 +276,12 @@ class Fabricator {
         while (!resultFunction) {
             resultFunction = await this.functionExecutor
                 .run(async () => {
+                apiFunction.buildConfig.sourceToken = await scraper.getToken();
                 const op = await gcfV2.createFunction(apiFunction);
-                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
+                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
             })
                 .catch(async (err) => {
+                scraper.abort();
                 if (err.code === CLOUD_RUN_RESOURCE_EXHAUSTED_CODE) {
                     await this.deleteV2Function(endpoint);
                     return null;
@@ -366,7 +369,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async updateV2Function(endpoint) {
+    async updateV2Function(endpoint, scraper) {
         var _a, _b, _c, _d;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -379,10 +382,15 @@ class Fabricator {
         }
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.buildConfig.sourceToken = await scraper.getToken();
             const op = await gcfV2.updateFunction(apiFunction);
-            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
+            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })
-            .catch(rethrowAs(endpoint, "update"));
+            .catch((err) => {
+            scraper.abort();
+            logger_1.logger.error(err.message);
+            throw new reporter.DeploymentError(endpoint, "update", err);
+        });
         endpoint.uri = (_c = resultFunction.serviceConfig) === null || _c === void 0 ? void 0 : _c.uri;
         const serviceName = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.service;
         endpoint.runServiceId = utils.last(serviceName === null || serviceName === void 0 ? void 0 : serviceName.split("/"));

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

@@ -10,21 +10,30 @@ class SourceTokenScraper {
         this.promise = new Promise((resolve) => (this.resolve = resolve));
         this.fetchState = "NONE";
     }
+    abort() {
+        this.resolve({ aborted: true });
+    }
     async getToken() {
         if (this.fetchState === "NONE") {
             this.fetchState = "FETCHING";
             return undefined;
         }
         else if (this.fetchState === "FETCHING") {
-            return this.promise;
+            const tokenResult = await this.promise;
+            if (tokenResult.aborted) {
+                this.promise = new Promise((resolve) => (this.resolve = resolve));
+                return undefined;
+            }
+            return tokenResult.token;
         }
         else if (this.fetchState === "VALID") {
+            const tokenResult = await this.promise;
             if (this.isTokenExpired()) {
                 this.fetchState = "FETCHING";
                 this.promise = new Promise((resolve) => (this.resolve = resolve));
                 return undefined;
             }
-            return this.promise;
+            return tokenResult.token;
         }
         else {
             (0, functional_1.assertExhaustive)(this.fetchState);
@@ -45,7 +54,10 @@ class SourceTokenScraper {
             if (((_a = op.metadata) === null || _a === void 0 ? void 0 : _a.sourceToken) || op.done) {
                 const [, , , region] = ((_c = (_b = op.metadata) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.split("/")) || [];
                 logger_1.logger.debug(`Got source token ${(_d = op.metadata) === null || _d === void 0 ? void 0 : _d.sourceToken} for region ${region}`);
-                this.resolve((_e = op.metadata) === null || _e === void 0 ? void 0 : _e.sourceToken);
+                this.resolve({
+                    token: (_e = op.metadata) === null || _e === void 0 ? void 0 : _e.sourceToken,
+                    aborted: false,
+                });
                 this.fetchState = "VALID";
                 this.expiry = Date.now() + this.tokenValidDurationMs;
             }

package/lib/emulator/controller.js

@@ -620,13 +620,15 @@ async function exportEmulatorData(exportPath, options, initiatedBy) {
         fs.mkdirSync(exportAbsPath);
     }
     const existingMetadata = hubExport_1.HubExport.readMetadata(exportAbsPath);
-    if (existingMetadata && !(options.force || options.exportOnExit)) {
+    const isExportDirEmpty = fs.readdirSync(exportAbsPath).length === 0;
+    if ((existingMetadata || !isExportDirEmpty) && !(options.force || options.exportOnExit)) {
         if (options.noninteractive) {
             throw new error_1.FirebaseError("Export already exists in the target directory, re-run with --force to overwrite.", { exit: 1 });
         }
-        const prompt = await (0, prompt_1.promptOnce)({
-            type: "confirm",
-            message: `The directory ${exportAbsPath} already contains export data. Exporting again to the same directory will overwrite all data. Do you want to continue?`,
+        const prompt = await (0, prompt_1.confirm)({
+            message: `The directory ${exportAbsPath} is not empty. Existing files in this directory will be overwritten. Do you want to continue?`,
+            nonInteractive: options.nonInteractive,
+            force: options.force,
             default: false,
         });
         if (!prompt) {

package/lib/frameworks/next/index.js

@@ -387,7 +387,7 @@ async function getConfig(dir) {
         if ((0, semver_1.gte)(version, "12.0.0")) {
             const { default: loadConfig } = (0, utils_1.relativeRequire)(dir, "next/dist/server/config");
             const { PHASE_PRODUCTION_BUILD } = (0, utils_1.relativeRequire)(dir, "next/constants");
-            config = await loadConfig(PHASE_PRODUCTION_BUILD, dir, null);
+            config = await loadConfig(PHASE_PRODUCTION_BUILD, dir);
         }
         else {
             try {

package/lib/frameworks/utils.js

@@ -13,7 +13,8 @@ const fsutils_1 = require("../fsutils");
 const url_1 = require("url");
 const constants_1 = require("./constants");
 const { dynamicImport } = require(true && "../dynamicImport");
-const NPM_ROOT_TIMEOUT_MILLIES = 2000;
+const NPM_ROOT_TIMEOUT_MILLIES = 5000;
+const NPM_ROOT_MEMO = new Map();
 function isUrl(url) {
     return /^https?:\/\//.test(url);
 }
@@ -139,8 +140,16 @@ function scanDependencyTree(searchingFor, dependencies = {}) {
 }
 function getNpmRoot(cwd) {
     var _a;
-    return (_a = (0, cross_spawn_1.sync)("npm", ["root"], { cwd, timeout: NPM_ROOT_TIMEOUT_MILLIES })
+    let npmRoot = NPM_ROOT_MEMO.get(cwd);
+    if (npmRoot)
+        return npmRoot;
+    npmRoot = (_a = (0, cross_spawn_1.sync)("npm", ["root"], {
+        cwd,
+        timeout: NPM_ROOT_TIMEOUT_MILLIES,
+    })
         .stdout) === null || _a === void 0 ? void 0 : _a.toString().trim();
+    NPM_ROOT_MEMO.set(cwd, npmRoot);
+    return npmRoot;
 }
 exports.getNpmRoot = getNpmRoot;
 function getNodeModuleBin(name, cwd) {

package/lib/gcp/cloudfunctionsv2.js

@@ -91,6 +91,7 @@ async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replace("-", ".") });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -143,9 +144,12 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
+    const components = cloudFunction.name.split("/");
+    const functionId = components.splice(-1, 1)[0];
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     fieldMasks.push("buildConfig.buildEnvironmentVariables");
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replace("-", ".") });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),
@@ -211,6 +215,7 @@ function functionFromEndpoint(endpoint) {
     if (backend.isEventTriggered(endpoint)) {
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
+            retryPolicy: "RETRY_POLICY_UNSPECIFIED",
         };
         if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
             if (!((_b = endpoint.eventTrigger.eventFilters) === null || _b === void 0 ? void 0 : _b.topic)) {
@@ -240,9 +245,9 @@ function functionFromEndpoint(endpoint) {
         }
         proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         proto.copyIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "channel");
-        if (endpoint.eventTrigger.retry) {
-            logger_1.logger.warn("Cannot set a retry policy on Cloud Function", endpoint.id);
-        }
+        endpoint.eventTrigger.retry
+            ? (gcfFunction.eventTrigger.retryPolicy = "RETRY_POLICY_RETRY")
+            : (gcfFunction.eventTrigger.retryPolicy = "RETRY_POLICY_DO_NOT_RETRY");
         gcfFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, gcfFunction.serviceConfig.environmentVariables), { FUNCTION_SIGNATURE_TYPE: "cloudevent" });
     }
     else if (backend.isScheduleTriggered(endpoint)) {
@@ -315,7 +320,7 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                retry: false,
+                retry: gcfFunction.eventTrigger.retryPolicy === "RETRY_POLICY_RETRY" ? true : false,
             },
         };
         if (Object.keys(eventFilters).length) {

package/lib/gcp/storage.js

@@ -6,19 +6,21 @@ const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const projects_1 = require("../management/projects");
+const ensureApiEnabled_1 = require("../ensureApiEnabled");
 async function getDefaultBucket(projectId) {
     var _a;
+    await (0, ensureApiEnabled_1.ensure)(projectId, "firebasestorage.googleapis.com", "storage", false);
     try {
-        const metadata = await (0, projects_1.getFirebaseProject)(projectId);
-        if (!((_a = metadata.resources) === null || _a === void 0 ? void 0 : _a.storageBucket)) {
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseStorageOrigin, apiVersion: "v1alpha" });
+        const response = await localAPIClient.get(`/projects/${projectId}/defaultBucket`);
+        if (!((_a = response.body) === null || _a === void 0 ? void 0 : _a.name)) {
             logger_1.logger.debug("Default storage bucket is undefined.");
             throw new error_1.FirebaseError("Your project is being set up. Please wait a minute before deploying again.");
         }
-        return metadata.resources.storageBucket;
+        return response.body.name;
     }
     catch (err) {
-        logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
+        logger_1.logger.info("\n\nThere was an issue deploying your Storage rules. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
         throw err;
     }
 }

package/package.json

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

package/standalone/package.json

@@ -19,7 +19,8 @@
   },
   "pkg": {
     "scripts": [
-      "node_modules/npm/src/**/*.js"
+      "node_modules/npm/lib/*.js",
+      "node_modules/npm/lib/**/*.js"
     ],
     "assets": [
       "node_modules/.bin/**",