firebase-tools 10.5.0 → 10.7.1

package/lib/gcp/cloudfunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
+exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -9,10 +9,21 @@ const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
 const proto = require("./proto");
 const runtimes = require("../deploy/functions/runtimes");
+const projectConfig = require("../functions/projectConfig");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 exports.API_VERSION = "v1";
+exports.CODEBASE_LABEL = "firebase-functions-codebase";
 const client = new apiv2_1.Client({ urlPrefix: api_1.functionsOrigin, apiVersion: exports.API_VERSION });
+exports.BLOCKING_LABEL = "deployment-blocking";
+const BLOCKING_LABEL_KEY_TO_EVENT = {
+    "before-create": "providers/cloud.auth/eventTypes/user.beforeCreate",
+    "before-sign-in": "providers/cloud.auth/eventTypes/user.beforeSignIn",
+};
+const BLOCKING_EVENT_TO_LABEL_KEY = {
+    "providers/cloud.auth/eventTypes/user.beforeCreate": "before-create",
+    "providers/cloud.auth/eventTypes/user.beforeSignIn": "before-sign-in",
+};
 function validateFunction(func) {
     proto.assertOneOf("Cloud Function", func, "sourceCode", "sourceArchiveUrl", "sourceRepository", "sourceUploadUrl");
     proto.assertOneOf("Cloud Function", func, "trigger", "httpsTrigger", "eventTrigger");
@@ -202,7 +213,7 @@ async function listAllFunctions(projectId) {
 }
 exports.listAllFunctions = listAllFunctions;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
@@ -223,25 +234,29 @@ function endpointFromFunction(gcfFunction) {
             callableTrigger: {},
         };
     }
+    else if ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[exports.BLOCKING_LABEL]) {
+        trigger = {
+            blockingTrigger: {
+                eventType: BLOCKING_LABEL_KEY_TO_EVENT[gcfFunction.labels[exports.BLOCKING_LABEL]],
+            },
+        };
+    }
     else if (gcfFunction.httpsTrigger) {
         trigger = { httpsTrigger: {} };
-        uri = gcfFunction.httpsTrigger.url;
-        securityLevel = gcfFunction.httpsTrigger.securityLevel;
     }
     else {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: [
-                    {
-                        attribute: "resource",
-                        value: gcfFunction.eventTrigger.resource,
-                    },
-                ],
-                retry: !!((_e = gcfFunction.eventTrigger.failurePolicy) === null || _e === void 0 ? void 0 : _e.retry),
+                eventFilters: { resource: gcfFunction.eventTrigger.resource },
+                retry: !!((_f = gcfFunction.eventTrigger.failurePolicy) === null || _f === void 0 ? void 0 : _f.retry),
             },
         };
     }
+    if (gcfFunction.httpsTrigger) {
+        uri = gcfFunction.httpsTrigger.url;
+        securityLevel = gcfFunction.httpsTrigger.securityLevel;
+    }
     if (!runtimes.isValidRuntime(gcfFunction.runtime)) {
         logger_1.logger.debug("GCFv1 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
     }
@@ -254,15 +269,18 @@ function endpointFromFunction(gcfFunction) {
     if (securityLevel) {
         endpoint.securityLevel = securityLevel;
     }
-    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "timeout", "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    proto.renameIfPresent(endpoint, gcfFunction, "timeoutSeconds", "timeout", proto.secondsFromDuration);
     if (gcfFunction.vpcConnector) {
         endpoint.vpc = { connector: gcfFunction.vpcConnector };
         proto.renameIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings");
     }
+    endpoint.codebase = ((_g = gcfFunction.labels) === null || _g === void 0 ? void 0 : _g[exports.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;
 function functionFromEndpoint(endpoint, sourceUploadUrl) {
+    var _a;
     if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
@@ -278,13 +296,9 @@ 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: resourceFilter.value,
+            resource: endpoint.eventTrigger.eventFilters.resource,
         };
         gcfFunction.eventTrigger.failurePolicy = endpoint.eventTrigger.retry
             ? { retry: {} }
@@ -302,6 +316,10 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         gcfFunction.httpsTrigger = {};
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
     }
+    else if (backend.isBlockingTriggered(endpoint)) {
+        gcfFunction.httpsTrigger = {};
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.BLOCKING_LABEL]: BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
+    }
     else {
         gcfFunction.httpsTrigger = {};
         if (backend.isCallableTriggered(endpoint)) {
@@ -311,11 +329,19 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
             gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;
         }
     }
-    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "timeout", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
+    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
+    proto.renameIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", proto.durationFromSeconds);
     if (endpoint.vpc) {
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnector", "connector");
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
     }
+    const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
+    if (codebase !== projectConfig.DEFAULT_CODEBASE) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
+    }
+    else {
+        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+    }
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,6 @@
 "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.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.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -11,12 +11,23 @@ const backend = require("../deploy/functions/backend");
 const runtimes = require("../deploy/functions/runtimes");
 const proto = require("./proto");
 const utils = require("../utils");
+const projectConfig = require("../functions/projectConfig");
 exports.API_VERSION = "v2alpha";
+exports.CODEBASE_LABEL = "firebase-functions-codebase";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.functionsV2Origin,
     auth: true,
     apiVersion: exports.API_VERSION,
 });
+exports.BLOCKING_LABEL = "deployment-blocking";
+const BLOCKING_LABEL_KEY_TO_EVENT = {
+    "before-create": "providers/cloud.auth/eventTypes/user.beforeCreate",
+    "before-sign-in": "providers/cloud.auth/eventTypes/user.beforeSignIn",
+};
+const BLOCKING_EVENT_TO_LABEL_KEY = {
+    "providers/cloud.auth/eventTypes/user.beforeCreate": "before-create",
+    "providers/cloud.auth/eventTypes/user.beforeSignIn": "before-sign-in",
+};
 const BYTES_PER_UNIT = {
     "": 1,
     k: 1e3,
@@ -146,6 +157,7 @@ async function deleteFunction(cloudFunction) {
 }
 exports.deleteFunction = deleteFunction;
 function functionFromEndpoint(endpoint, source) {
+    var _a;
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
@@ -166,9 +178,8 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
-    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings");
+    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => `${mb}M`);
-    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "timeoutSeconds", "timeout", proto.secondsFromDuration);
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
     if (endpoint.vpc) {
@@ -180,25 +191,22 @@ function functionFromEndpoint(endpoint, source) {
             eventType: endpoint.eventTrigger.eventType,
         };
         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") {
+            gcfFunction.eventTrigger.pubsubTopic = endpoint.eventTrigger.eventFilters.topic;
+            gcfFunction.eventTrigger.eventFilters = [];
+            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
+                if (attribute === "topic")
                     continue;
-                }
-                if (!gcfFunction.eventTrigger.eventFilters) {
-                    gcfFunction.eventTrigger.eventFilters = [];
-                }
-                gcfFunction.eventTrigger.eventFilters.push(filter);
+                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
             }
         }
         else {
-            gcfFunction.eventTrigger.eventFilters = endpoint.eventTrigger.eventFilters;
+            gcfFunction.eventTrigger.eventFilters = [];
+            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
+                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
+            }
         }
         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);
         }
@@ -213,11 +221,21 @@ function functionFromEndpoint(endpoint, source) {
     else if (backend.isCallableTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
     }
+    else if (backend.isBlockingTriggered(endpoint)) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.BLOCKING_LABEL]: BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
+    }
+    const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
+    if (codebase !== projectConfig.DEFAULT_CODEBASE) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
+    }
+    else {
+        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+    }
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -235,25 +253,30 @@ function endpointFromFunction(gcfFunction) {
             callableTrigger: {},
         };
     }
+    else if ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d[exports.BLOCKING_LABEL]) {
+        trigger = {
+            blockingTrigger: {
+                eventType: BLOCKING_LABEL_KEY_TO_EVENT[gcfFunction.labels[exports.BLOCKING_LABEL]],
+            },
+        };
+    }
     else if (gcfFunction.eventTrigger) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: [],
+                eventFilters: {},
                 retry: false,
             },
         };
         if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventTrigger.eventFilters.push({
-                attribute: "topic",
-                value: gcfFunction.eventTrigger.pubsubTopic,
-            });
+            trigger.eventTrigger.eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
         }
         else {
             for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventTrigger.eventFilters.push({ attribute, value });
+                trigger.eventTrigger.eventFilters[attribute] = value;
             }
         }
+        proto.copyIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "channel");
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");
     }
     else {
@@ -265,9 +288,8 @@ function endpointFromFunction(gcfFunction) {
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
         region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
-    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables");
+    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "timeoutSeconds");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", megabytes);
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "timeout", "timeoutSeconds", proto.durationFromSeconds);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
     proto.copyIfPresent(endpoint, gcfFunction, "labels");
@@ -275,6 +297,7 @@ function endpointFromFunction(gcfFunction) {
         endpoint.vpc = { connector: gcfFunction.serviceConfig.vpcConnector };
         proto.renameIfPresent(endpoint.vpc, gcfFunction.serviceConfig, "egressSettings", "vpcConnectorEgressSettings");
     }
+    endpoint.codebase = ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[exports.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;

package/lib/gcp/cloudtasks.js

@@ -13,7 +13,6 @@ const client = new apiv2_1.Client({
 exports.DEFAULT_SETTINGS = {
     rateLimits: {
         maxConcurrentDispatches: 1000,
-        maxBurstSize: 100,
         maxDispatchesPerSecond: 500,
     },
     state: "RUNNING",
@@ -133,10 +132,13 @@ exports.queueNameForEndpoint = queueNameForEndpoint;
 function queueFromEndpoint(endpoint) {
     const queue = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(exports.DEFAULT_SETTINGS))), { name: queueNameForEndpoint(endpoint) });
     if (endpoint.taskQueueTrigger.rateLimits) {
-        proto.copyIfPresent(queue.rateLimits, endpoint.taskQueueTrigger.rateLimits, "maxBurstSize", "maxConcurrentDispatches", "maxDispatchesPerSecond");
+        proto.copyIfPresent(queue.rateLimits, endpoint.taskQueueTrigger.rateLimits, "maxConcurrentDispatches", "maxDispatchesPerSecond");
     }
     if (endpoint.taskQueueTrigger.retryConfig) {
-        proto.copyIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxAttempts", "maxBackoff", "maxDoublings", "maxRetryDuration", "minBackoff");
+        proto.copyIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxAttempts", "maxDoublings");
+        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxRetryDuration", "maxRetrySeconds", proto.durationFromSeconds);
+        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxBackoff", "maxBackoffSeconds", proto.durationFromSeconds);
+        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "minBackoff", "minBackoffSeconds", proto.durationFromSeconds);
     }
     return queue;
 }

package/lib/gcp/identityPlatform.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateConfig = exports.setBlockingFunctionsConfig = exports.getConfig = exports.getBlockingFunctionsConfig = void 0;
+const proto = require("./proto");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
+const API_VERSION = "v2";
+const adminApiClient = new apiv2_1.Client({
+    urlPrefix: api_1.identityOrigin + "/admin",
+    apiVersion: API_VERSION,
+});
+async function getBlockingFunctionsConfig(project) {
+    const config = (await getConfig(project)) || {};
+    if (!config.blockingFunctions) {
+        config.blockingFunctions = {};
+    }
+    return config.blockingFunctions;
+}
+exports.getBlockingFunctionsConfig = getBlockingFunctionsConfig;
+async function getConfig(project) {
+    const response = await adminApiClient.get(`projects/${project}/config`);
+    return response.body;
+}
+exports.getConfig = getConfig;
+async function setBlockingFunctionsConfig(project, blockingConfig) {
+    const config = (await updateConfig(project, { blockingFunctions: blockingConfig }, "blockingFunctions")) || {};
+    if (!config.blockingFunctions) {
+        config.blockingFunctions = {};
+    }
+    return config.blockingFunctions;
+}
+exports.setBlockingFunctionsConfig = setBlockingFunctionsConfig;
+async function updateConfig(project, config, updateMask) {
+    if (!updateMask) {
+        updateMask = proto.fieldMasks(config).join(",");
+    }
+    const response = await adminApiClient.patch(`projects/${project}/config`, config, {
+        queryParams: {
+            updateMask,
+        },
+    });
+    return response.body;
+}
+exports.updateConfig = updateConfig;

package/lib/gcp/secretManager.js

@@ -33,7 +33,7 @@ async function listSecrets(projectId, filter) {
             ? baseOpts
             : Object.assign(Object.assign({}, baseOpts), { queryParams: Object.assign(Object.assign({}, baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.queryParams), { pageToken }) });
         const res = await client.get(path, opts);
-        for (const s of res.body.secrets) {
+        for (const s of res.body.secrets || []) {
             secrets.push(Object.assign(Object.assign({}, parseSecretResourceName(s.name)), { labels: (_a = s.labels) !== null && _a !== void 0 ? _a : {} }));
         }
         if (!res.body.nextPageToken) {
@@ -133,7 +133,7 @@ async function createSecret(projectId, name, labels) {
         },
         labels,
     }, { queryParams: { secretId: name } });
-    return parseSecretResourceName(createRes.body.name);
+    return Object.assign(Object.assign({}, parseSecretResourceName(createRes.body.name)), { labels });
 }
 exports.createSecret = createSecret;
 async function patchSecret(projectId, name, labels) {

package/lib/metaprogramming.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: 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, frameworkawareness: 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/serve/functions.js

@@ -10,28 +10,29 @@ const auth_1 = require("../auth");
 const projectConfig = require("../functions/projectConfig");
 const utils = require("../utils");
 class FunctionsServer {
-    constructor() {
-        this.emulatorServer = undefined;
-        this.backend = undefined;
-    }
     assertServer() {
-        if (!this.emulatorServer || !this.backend) {
+        if (!this.emulatorServer || !this.backends) {
             throw new Error("Must call start() before calling any other operation!");
         }
     }
     async start(options, partialArgs) {
         const projectId = (0, projectUtils_1.needProjectId)(options);
-        const config = projectConfig.normalizeAndValidate(options.config.src.functions)[0];
-        const functionsDir = path.join(options.config.projectDir, config.source);
+        const config = projectConfig.normalizeAndValidate(options.config.src.functions);
+        const backends = [];
+        for (const cfg of config) {
+            const functionsDir = path.join(options.config.projectDir, cfg.source);
+            const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(cfg.runtime);
+            backends.push({
+                functionsDir,
+                codebase: cfg.codebase,
+                nodeMajorVersion,
+                env: {},
+                secretEnv: [],
+            });
+        }
+        this.backends = backends;
         const account = (0, auth_1.getProjectDefaultAccount)(options.config.projectDir);
-        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(config.runtime);
-        this.backend = {
-            functionsDir,
-            nodeMajorVersion,
-            env: {},
-            secretEnv: [],
-        };
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], projectAlias: options.projectAlias, account }, partialArgs);
+        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: this.backends, projectAlias: options.projectAlias, account }, partialArgs);
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;
@@ -59,10 +60,6 @@ class FunctionsServer {
         this.assertServer();
         await this.emulatorServer.stop();
     }
-    getBackend() {
-        this.assertServer();
-        return this.backend;
-    }
     get() {
         this.assertServer();
         return this.emulatorServer.get();

package/lib/serve/hosting.js

@@ -15,6 +15,7 @@ const stream_1 = require("stream");
 const emulatorLogger_1 = require("../emulator/emulatorLogger");
 const types_1 = require("../emulator/types");
 const utils_1 = require("../utils");
+const child_process_1 = require("child_process");
 const MAX_PORT_ATTEMPTS = 10;
 let attempts = 0;
 let destroyServer = undefined;
@@ -31,6 +32,29 @@ function startServer(options, config, port, init) {
     const morganMiddleware = morgan("combined", {
         stream: morganStream,
     });
+    const portInUse = () => {
+        const message = "Port " + options.port + " is not available.";
+        logger.log("WARN", clc.yellow("hosting: ") + message + " Trying another port...");
+        if (attempts < MAX_PORT_ATTEMPTS) {
+            attempts++;
+            startServer(options, config, port + 5, init);
+        }
+        else {
+            logger.log("WARN", message);
+            throw new error_1.FirebaseError("Could not find an open port for hosting development server.", {
+                exit: 1,
+            });
+        }
+    };
+    if (process.platform === "darwin") {
+        try {
+            (0, child_process_1.execSync)(`lsof -i :${port}`);
+            portInUse();
+            return;
+        }
+        catch (e) {
+        }
+    }
     const server = superstatic({
         debug: false,
         port: port,
@@ -60,18 +84,7 @@ function startServer(options, config, port, init) {
     destroyServer = (0, utils_1.createDestroyer)(server);
     server.on("error", (err) => {
         if (err.code === "EADDRINUSE") {
-            const message = "Port " + options.port + " is not available.";
-            logger.log("WARN", clc.yellow("hosting: ") + message + " Trying another port...");
-            if (attempts < MAX_PORT_ATTEMPTS) {
-                attempts++;
-                startServer(options, config, port + 5, init);
-            }
-            else {
-                logger.log("WARN", message);
-                throw new error_1.FirebaseError("Could not find an open port for hosting development server.", {
-                    exit: 1,
-                });
-            }
+            portInUse();
         }
         else {
             throw new error_1.FirebaseError("An error occurred while starting the hosting development server:\n\n" + err.toString(), { exit: 1 });

package/lib/serve/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const _ = require("lodash");
 const logger_1 = require("../logger");
+const previews_1 = require("../previews");
 const { FunctionsServer } = require("./functions");
 const TARGETS = {
     hosting: require("./hosting"),
@@ -11,6 +12,11 @@ const TARGETS = {
 async function serve(options) {
     const targetNames = options.targets;
     options.port = parseInt(options.port, 10);
+    if (previews_1.previews.frameworkawareness &&
+        targetNames.includes("hosting") &&
+        [].concat(options.config.get("hosting")).some((it) => it.source)) {
+        await require("firebase-frameworks").prepare(targetNames, { project: options.projectId }, options);
+    }
     await Promise.all(_.map(targetNames, (targetName) => {
         return TARGETS[targetName].start(options);
     }));

package/lib/track.js

@@ -1,31 +1,26 @@
 "use strict";
-var ua = require("universal-analytics");
-var _ = require("lodash");
-var { configstore } = require("./configstore");
-var pkg = require("../package.json");
-var uuid = require("uuid");
-const { logger } = require("./logger");
-var anonId = configstore.get("analytics-uuid");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.track = void 0;
+const ua = require("universal-analytics");
+const uuid_1 = require("uuid");
+const configstore_1 = require("./configstore");
+const pkg = require("../package.json");
+let anonId = configstore_1.configstore.get("analytics-uuid");
 if (!anonId) {
-    anonId = uuid.v4();
-    configstore.set("analytics-uuid", anonId);
+    anonId = (0, uuid_1.v4)();
+    configstore_1.configstore.set("analytics-uuid", anonId);
 }
-var visitor = ua(process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3", anonId, {
+const visitor = ua(process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3", anonId, {
     strictCidFormat: false,
     https: true,
 });
 visitor.set("cd1", process.platform);
 visitor.set("cd2", process.version);
 visitor.set("cd3", process.env.FIREPIT_VERSION || "none");
-function track(action, label, duration) {
-    return new Promise(function (resolve) {
-        if (!_.isString(action) || !_.isString(label)) {
-            logger.debug("track received non-string arguments:", action, label);
-            resolve();
-        }
-        duration = duration || 0;
-        if (configstore.get("tokens") && configstore.get("usage")) {
-            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(function () {
+function track(action, label, duration = 0) {
+    return new Promise((resolve) => {
+        if (configstore_1.configstore.get("tokens") && configstore_1.configstore.get("usage")) {
+            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
                 resolve();
             });
         }
@@ -34,5 +29,4 @@ function track(action, label, duration) {
         }
     });
 }
-track.track = track;
-module.exports = track;
+exports.track = track;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.cloneDeep = 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");
@@ -406,3 +406,32 @@ function groupBy(arr, f) {
     }, {});
 }
 exports.groupBy = groupBy;
+function cloneArray(arr) {
+    return arr.map((e) => cloneDeep(e));
+}
+function cloneObject(obj) {
+    const clone = {};
+    for (const [k, v] of Object.entries(obj)) {
+        clone[k] = cloneDeep(v);
+    }
+    return clone;
+}
+function cloneDeep(obj) {
+    if (typeof obj !== "object" || !obj) {
+        return obj;
+    }
+    if (obj instanceof RegExp) {
+        return RegExp(obj, obj.flags);
+    }
+    if (obj instanceof Date) {
+        return new Date(obj);
+    }
+    if (Array.isArray(obj)) {
+        return cloneArray(obj);
+    }
+    if (obj instanceof Map) {
+        return new Map(obj.entries());
+    }
+    return cloneObject(obj);
+}
+exports.cloneDeep = cloneDeep;