firebase-tools 10.2.2 → 10.4.0

package/lib/fsutils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dirExistsSync = exports.fileExistsSync = void 0;
+exports.readFile = exports.dirExistsSync = exports.fileExistsSync = void 0;
 const fs_1 = require("fs");
+const error_1 = require("./error");
 function fileExistsSync(path) {
     try {
         return (0, fs_1.statSync)(path).isFile();
@@ -20,3 +21,15 @@ function dirExistsSync(path) {
     }
 }
 exports.dirExistsSync = dirExistsSync;
+function readFile(path) {
+    try {
+        return (0, fs_1.readFileSync)(path).toString();
+    }
+    catch (e) {
+        if (e.code === "ENOENT") {
+            throw new error_1.FirebaseError(`File not found: ${path}`);
+        }
+        throw e;
+    }
+}
+exports.readFile = readFile;

package/lib/functions/env.js

@@ -121,15 +121,13 @@ function parseStrict(data) {
 exports.parseStrict = parseStrict;
 function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
     const files = [".env"];
+    files.push(`.env.${projectId}`);
+    if (projectAlias) {
+        files.push(`.env.${projectAlias}`);
+    }
     if (isEmulator) {
         files.push(FUNCTIONS_EMULATOR_DOTENV);
     }
-    else {
-        files.push(`.env.${projectId}`);
-        if (projectAlias && projectAlias.length) {
-            files.push(`.env.${projectAlias}`);
-        }
-    }
     return files
         .map((f) => path.join(functionsSource, f))
         .filter(fs.existsSync)

package/lib/functions/events/v2.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
+exports.STORAGE_EVENTS = [
+    "google.cloud.storage.object.v1.finalized",
+    "google.cloud.storage.object.v1.archived",
+    "google.cloud.storage.object.v1.deleted",
+    "google.cloud.storage.object.v1.metadataUpdated",
+];
+exports.FIREBASE_ALERTS_PUBLISH_EVENT = "google.firebase.firebasealerts.alerts.v1.published";

package/lib/gcp/cloudfunctions.js

@@ -202,7 +202,7 @@ async function listAllFunctions(projectId) {
 }
 exports.listAllFunctions = listAllFunctions;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
@@ -217,6 +217,12 @@ function endpointFromFunction(gcfFunction) {
             taskQueueTrigger: {},
         };
     }
+    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) ||
+        ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d["deployment-callabled"])) {
+        trigger = {
+            callableTrigger: {},
+        };
+    }
     else if (gcfFunction.httpsTrigger) {
         trigger = { httpsTrigger: {} };
         uri = gcfFunction.httpsTrigger.url;
@@ -226,10 +232,13 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {
-                    resource: gcfFunction.eventTrigger.resource,
-                },
-                retry: !!((_c = gcfFunction.eventTrigger.failurePolicy) === null || _c === void 0 ? void 0 : _c.retry),
+                eventFilters: [
+                    {
+                        attribute: "resource",
+                        value: gcfFunction.eventTrigger.resource,
+                    },
+                ],
+                retry: !!((_e = gcfFunction.eventTrigger.failurePolicy) === null || _e === void 0 ? void 0 : _e.retry),
             },
         };
     }
@@ -269,9 +278,13 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     if (backend.isEventTriggered(endpoint)) {
+        const resourceFilter = backend.findEventFilter(endpoint, "resource");
+        if (!resourceFilter) {
+            throw new error_1.FirebaseError("Invalid event trigger definition. Expected event filter with 'resource' attribute.");
+        }
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
-            resource: endpoint.eventTrigger.eventFilters.resource,
+            resource: resourceFilter.value,
         };
         gcfFunction.eventTrigger.failurePolicy = endpoint.eventTrigger.retry
             ? { retry: {} }
@@ -292,7 +305,7 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     else {
         gcfFunction.httpsTrigger = {};
         if (backend.isCallableTriggered(endpoint)) {
-            gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callabled": "true" });
+            gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
         }
         if (endpoint.securityLevel) {
             gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;

package/lib/gcp/cloudfunctionsv2.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.PUBSUB_PUBLISH_EVENT = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
 const logger_1 = require("../logger");
+const v2_1 = require("../functions/events/v2");
 const backend = require("../deploy/functions/backend");
 const runtimes = require("../deploy/functions/runtimes");
 const proto = require("./proto");
@@ -16,7 +17,6 @@ const client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 const BYTES_PER_UNIT = {
     "": 1,
     k: 1e3,
@@ -179,14 +179,24 @@ function functionFromEndpoint(endpoint, source) {
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
         };
-        if (gcfFunction.eventTrigger.eventType === exports.PUBSUB_PUBLISH_EVENT) {
-            gcfFunction.eventTrigger.pubsubTopic = endpoint.eventTrigger.eventFilters.resource;
+        if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
+            const pubsubFilter = backend.findEventFilter(endpoint, "topic");
+            if (!pubsubFilter) {
+                throw new error_1.FirebaseError("Invalid pubsub endpoint. Expected eventFilter with 'topic' attribute but found none.");
+            }
+            gcfFunction.eventTrigger.pubsubTopic = pubsubFilter.value;
+            for (const filter of endpoint.eventTrigger.eventFilters) {
+                if (filter.attribute === "topic") {
+                    continue;
+                }
+                if (!gcfFunction.eventTrigger.eventFilters) {
+                    gcfFunction.eventTrigger.eventFilters = [];
+                }
+                gcfFunction.eventTrigger.eventFilters.push(filter);
+            }
         }
         else {
-            gcfFunction.eventTrigger.eventFilters = [];
-            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
-                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
-            }
+            gcfFunction.eventTrigger.eventFilters = endpoint.eventTrigger.eventFilters;
         }
         proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         if (endpoint.eventTrigger.retry) {
@@ -207,7 +217,7 @@ function functionFromEndpoint(endpoint, source) {
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b;
+    var _a, _b, _c;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -220,20 +230,28 @@ function endpointFromFunction(gcfFunction) {
             taskQueueTrigger: {},
         };
     }
+    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) === "true") {
+        trigger = {
+            callableTrigger: {},
+        };
+    }
     else if (gcfFunction.eventTrigger) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {},
+                eventFilters: [],
                 retry: false,
             },
         };
         if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventTrigger.eventFilters.resource = gcfFunction.eventTrigger.pubsubTopic;
+            trigger.eventTrigger.eventFilters.push({
+                attribute: "topic",
+                value: gcfFunction.eventTrigger.pubsubTopic,
+            });
         }
         else {
             for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventTrigger.eventFilters[attribute] = value;
+                trigger.eventTrigger.eventFilters.push({ attribute, value });
             }
         }
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");

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/requireConfig.js

@@ -1,11 +1,13 @@
 "use strict";
-var { FirebaseError } = require("./error");
-module.exports = function (options) {
-    if (options.config) {
-        return Promise.resolve();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireConfig = void 0;
+const error_1 = require("./error");
+async function requireConfig(options) {
+    await Promise.resolve();
+    if (!options.config) {
+        throw options.configError
+            ? options.configError
+            : new error_1.FirebaseError("Not in a Firebase project directory (could not locate firebase.json)");
     }
-    return Promise.reject(options.configError ||
-        new FirebaseError("Not in a Firebase project directory (could not locate firebase.json)", {
-            exit: 1,
-        }));
-};
+}
+exports.requireConfig = requireConfig;

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/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");
@@ -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;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.2.2",
+  "version": "10.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.2.2",
+      "version": "10.4.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

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

package/lib/deploy/extensions/params.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readParams = void 0;
-const path = require("path");
-const logger_1 = require("../../logger");
-const paramHelper_1 = require("../../extensions/paramHelper");
-const error_1 = require("../../error");
-const ENV_DIRECTORY = "extensions";
-function readParams(args) {
-    const filesToCheck = [
-        `${args.instanceId}.env`,
-        ...args.aliases.map((alias) => `${args.instanceId}.env.${alias}`),
-        `${args.instanceId}.env.${args.projectNumber}`,
-        `${args.instanceId}.env.${args.projectId}`,
-    ];
-    if (args.checkLocal) {
-        filesToCheck.push(`${args.instanceId}.env.local`);
-    }
-    let noFilesFound = true;
-    const combinedParams = {};
-    for (const fileToCheck of filesToCheck) {
-        try {
-            const params = readParamsFile(args.projectDir, fileToCheck);
-            logger_1.logger.debug(`Successfully read params from ${fileToCheck}`);
-            noFilesFound = false;
-            Object.assign(combinedParams, params);
-        }
-        catch (err) {
-            logger_1.logger.debug(`${err}`);
-        }
-    }
-    if (noFilesFound) {
-        throw new error_1.FirebaseError(`No params file found for ${args.instanceId}`);
-    }
-    return combinedParams;
-}
-exports.readParams = readParams;
-function readParamsFile(projectDir, fileName) {
-    const paramPath = path.join(projectDir, ENV_DIRECTORY, fileName);
-    const params = (0, paramHelper_1.readEnvFile)(paramPath);
-    return params;
-}

package/lib/deploy/functions/eventTypes.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PUBSUB_V2_EVENT = exports.STORAGE_V2_EVENTS = void 0;
-exports.STORAGE_V2_EVENTS = [
-    "google.cloud.storage.object.v1.finalized",
-    "google.cloud.storage.object.v1.archived",
-    "google.cloud.storage.object.v1.deleted",
-    "google.cloud.storage.object.v1.metadataUpdated",
-];
-exports.PUBSUB_V2_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";

package/lib/prepareUpload.js

@@ -1,44 +0,0 @@
-"use strict";
-var fs = require("fs");
-var path = require("path");
-var tar = require("tar");
-var tmp = require("tmp");
-var { listFiles } = require("./listFiles");
-var { FirebaseError } = require("./error");
-var fsutils = require("./fsutils");
-module.exports = function (options) {
-    var hostingConfig = options.config.get("hosting");
-    var publicDir = options.config.path(hostingConfig.public);
-    var indexPath = path.join(publicDir, "index.html");
-    var tmpFile = tmp.fileSync({
-        prefix: "firebase-upload-",
-        postfix: ".tar.gz",
-    });
-    var manifest = listFiles(publicDir, hostingConfig.ignore);
-    return tar
-        .c({
-        gzip: true,
-        file: tmpFile.name,
-        cwd: publicDir,
-        prefix: "public",
-        follow: true,
-        noDirRecurse: true,
-        portable: true,
-    }, manifest.slice(0))
-        .then(function () {
-        var stats = fs.statSync(tmpFile.name);
-        return {
-            file: tmpFile.name,
-            stream: fs.createReadStream(tmpFile.name),
-            manifest: manifest,
-            foundIndex: fsutils.fileExistsSync(indexPath),
-            size: stats.size,
-        };
-    })
-        .catch(function (err) {
-        return Promise.reject(new FirebaseError("There was an issue preparing Hosting files for upload.", {
-            original: err,
-            exit: 2,
-        }));
-    });
-};