firebase-tools 10.2.0 → 10.3.0

package/lib/gcp/resourceManager.js

@@ -13,13 +13,13 @@ exports.firebaseRoles = {
     hostingAdmin: "roles/firebasehosting.admin",
     runViewer: "roles/run.viewer",
 };
-async function getIamPolicy(projectId) {
-    const response = await apiClient.post(`/projects/${projectId}:getIamPolicy`);
+async function getIamPolicy(projectIdOrNumber) {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:getIamPolicy`);
     return response.body;
 }
 exports.getIamPolicy = getIamPolicy;
-async function setIamPolicy(projectId, newPolicy, updateMask = "") {
-    const response = await apiClient.post(`/projects/${projectId}:setIamPolicy`, {
+async function setIamPolicy(projectIdOrNumber, newPolicy, updateMask = "") {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:setIamPolicy`, {
         policy: newPolicy,
         updateMask: updateMask,
     });

package/lib/gcp/run.js

@@ -63,7 +63,7 @@ async function getIamPolicy(serviceName, httpClient = client) {
 }
 exports.getIamPolicy = getIamPolicy;
 async function setInvokerCreate(projectId, serviceName, invoker, httpClient = client) {
-    if (invoker.length == 0) {
+    if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
     }
     const invokerMembers = proto.getInvokerMembers(invoker, projectId);
@@ -79,7 +79,7 @@ async function setInvokerCreate(projectId, serviceName, invoker, httpClient = cl
 exports.setInvokerCreate = setInvokerCreate;
 async function setInvokerUpdate(projectId, serviceName, invoker, httpClient = client) {
     var _a;
-    if (invoker.length == 0) {
+    if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
     }
     const invokerMembers = proto.getInvokerMembers(invoker, projectId);

package/lib/gcp/storage.js

@@ -29,6 +29,7 @@ async function upload(source, uploadUrl, extraHeaders) {
         method: "PUT",
         path: url.pathname,
         queryParams: url.searchParams,
+        responseType: "xml",
         headers: Object.assign({ "content-type": "application/zip" }, extraHeaders),
         body: source.stream,
         skipLog: { resBody: true },

package/lib/hosting/api.js

@@ -192,7 +192,7 @@ async function removeAuthDomain(project, url) {
         return domains;
     }
     const targetDomain = url.replace("https://", "");
-    const authDomains = domains.filter((domain) => domain != targetDomain);
+    const authDomains = domains.filter((domain) => domain !== targetDomain);
     return (0, auth_1.updateAuthDomains)(project, authDomains);
 }
 exports.removeAuthDomain = removeAuthDomain;

package/lib/hosting/functionsProxy.js

@@ -1,26 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.functionsProxy = void 0;
 const lodash_1 = require("lodash");
 const proxy_1 = require("./proxy");
 const projectUtils_1 = require("../projectUtils");
 const registry_1 = require("../emulator/registry");
 const types_1 = require("../emulator/types");
 const functionsEmulator_1 = require("../emulator/functionsEmulator");
-function default_1(options) {
+const error_1 = require("../error");
+function functionsProxy(options) {
     return (rewrite) => {
         return new Promise((resolve) => {
             const projectId = (0, projectUtils_1.needProjectId)(options);
-            let url = `https://us-central1-${projectId}.cloudfunctions.net/${rewrite.function}`;
+            if (!("function" in rewrite)) {
+                throw new error_1.FirebaseError(`A non-function rewrite cannot be used in functionsProxy`, {
+                    exit: 2,
+                });
+            }
+            if (!rewrite.region) {
+                rewrite.region = "us-central1";
+            }
+            let url = `https://${rewrite.region}-${projectId}.cloudfunctions.net/${rewrite.function}`;
             let destLabel = "live";
             if ((0, lodash_1.includes)(options.targets, "functions")) {
                 destLabel = "local";
                 const functionsEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
                 if (functionsEmu) {
-                    url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId, rewrite.function, "us-central1");
+                    url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId, rewrite.function, rewrite.region);
                 }
             }
-            resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${rewrite.function}`));
+            resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${rewrite.region}/${rewrite.function}`));
         });
     };
 }
-exports.default = default_1;
+exports.functionsProxy = functionsProxy;

package/lib/hosting/proxy.js

@@ -54,7 +54,7 @@ function proxyRequestHandler(url, rewriteIdentifier) {
                 continue;
             }
             const value = req.headers[key];
-            if (value == undefined) {
+            if (value === undefined) {
                 headers.delete(key);
             }
             else if (Array.isArray(value)) {
@@ -115,7 +115,7 @@ function proxyRequestHandler(url, rewriteIdentifier) {
         if (location) {
             try {
                 const locationURL = new url_1.URL(location);
-                if (locationURL.origin == u.origin) {
+                if (locationURL.origin === u.origin) {
                     const unborkedLocation = location.replace(locationURL.origin, "");
                     proxyRes.response.headers.set("location", unborkedLocation);
                 }

package/lib/init/features/account.js

@@ -27,7 +27,7 @@ async function promptForAccount() {
         message: "Please select an option:",
         choices,
     });
-    if (emailChoice == "__add__") {
+    if (emailChoice === "__add__") {
         const newAccount = await (0, auth_1.loginAdditionalAccount)(true);
         if (!newAccount) {
             throw new error_1.FirebaseError("Failed to add new account", { exit: 1 });

package/lib/management/database.js

@@ -168,7 +168,7 @@ function convertDatabaseInstance(serverInstance) {
         throw new error_1.FirebaseError(`DatabaseInstance response is missing field "name"`);
     }
     const m = serverInstance.name.match(INSTANCE_RESOURCE_NAME_REGEX);
-    if (!m || m.length != 4) {
+    if (!m || m.length !== 4) {
         throw new error_1.FirebaseError(`Error parsing instance resource name: ${serverInstance.name}, matches: ${m}`);
     }
     return {

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/responseToError.js

@@ -2,16 +2,25 @@
 const _ = require("lodash");
 const { FirebaseError } = require("./error");
 module.exports = function (response, body) {
-    if (typeof body === "string" && response.statusCode === 404) {
-        body = {
-            error: {
-                message: "Not Found",
-            },
-        };
-    }
     if (response.statusCode < 400) {
         return null;
     }
+    if (typeof body === "string") {
+        if (response.statusCode === 404) {
+            body = {
+                error: {
+                    message: "Not Found",
+                },
+            };
+        }
+        else {
+            body = {
+                error: {
+                    message: body,
+                },
+            };
+        }
+    }
     if (typeof body !== "object") {
         try {
             body = JSON.parse(body);

package/lib/serve/functions.js

@@ -29,8 +29,9 @@ class FunctionsServer {
             functionsDir,
             nodeMajorVersion,
             env: {},
+            secretEnv: [],
         };
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], account }, partialArgs);
+        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], projectAlias: options.projectAlias, account }, partialArgs);
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;

package/lib/serve/hosting.js

@@ -46,7 +46,7 @@ function startServer(options, config, port, init) {
             },
         },
         rewriters: {
-            function: (0, functionsProxy_1.default)(options),
+            function: (0, functionsProxy_1.functionsProxy)(options),
             run: (0, cloudRunProxy_1.default)(options),
         },
     }).listen(() => {

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("cli-color");
@@ -295,7 +295,7 @@ function setupLoggers() {
         logger_1.logger.add(new winston.transports.Console({
             level: "info",
             format: winston.format.printf((info) => [info.message, ...(info[triple_beam_1.SPLAT] || [])]
-                .filter((chunk) => typeof chunk == "string")
+                .filter((chunk) => typeof chunk === "string")
                 .join(" ")),
         }));
     }
@@ -393,3 +393,16 @@ function assertIsStringOrUndefined(val, message) {
     }
 }
 exports.assertIsStringOrUndefined = assertIsStringOrUndefined;
+function groupBy(arr, f) {
+    return arr.reduce((result, item) => {
+        const key = f(item);
+        if (result[key]) {
+            result[key].push(item);
+        }
+        else {
+            result[key] = [item];
+        }
+        return result;
+    }, {});
+}
+exports.groupBy = groupBy;