firebase-tools 10.6.0 → 10.7.2

package/lib/extensions/emulator/specHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readExtensionYaml = void 0;
+exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
 const yaml = require("js-yaml");
 const path = require("path");
 const fs = require("fs-extra");
@@ -8,6 +8,7 @@ const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
 const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
+const POSTINSTALL_FILE = "POSTINSTALL.md";
 const validFunctionTypes = [
     "firebaseextensions.v1beta.function",
     "firebaseextensions.v1beta.scheduledFunction",
@@ -29,6 +30,11 @@ async function readExtensionYaml(directory) {
     return wrappedSafeLoad(source);
 }
 exports.readExtensionYaml = readExtensionYaml;
+async function readPostinstall(directory) {
+    const content = await readFileFromDirectory(directory, POSTINSTALL_FILE);
+    return content.source;
+}
+exports.readPostinstall = readPostinstall;
 function readFileFromDirectory(directory, file) {
     return new Promise((resolve, reject) => {
         fs.readFile(path.resolve(directory, file), "utf8", (err, data) => {

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
@@ -305,7 +305,7 @@ async function publishExtensionVersionFromLocalSource(args) {
             "Please create one and add an entry for this version. " +
             marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
-    if (!notes && extension) {
+    if (!notes && !semver.prerelease(extensionSpec.version) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${extensionSpec.version} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
             marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
@@ -363,32 +363,26 @@ async function publishExtensionVersionFromLocalSource(args) {
 }
 exports.publishExtensionVersionFromLocalSource = publishExtensionVersionFromLocalSource;
 async function createSourceFromLocation(projectId, sourceUri) {
+    const extensionRoot = "/";
     let packageUri;
-    let extensionRoot;
     let objectPath = "";
-    if (!sourceUri.startsWith("https:")) {
-        const uploadSpinner = ora(" Archiving and uploading extension source code");
-        try {
-            uploadSpinner.start();
-            objectPath = await archiveAndUploadSource(sourceUri, exports.EXTENSIONS_BUCKET_NAME);
-            uploadSpinner.succeed(" Uploaded extension source code");
-            packageUri = api_1.storageOrigin + objectPath + "?alt=media";
-            extensionRoot = "/";
-        }
-        catch (err) {
-            uploadSpinner.fail();
-            throw new error_1.FirebaseError(`Failed to archive and upload extension source, ${err}`, {
-                original: err,
-            });
-        }
+    const spinner = ora(" Archiving and uploading extension source code");
+    try {
+        spinner.start();
+        objectPath = await archiveAndUploadSource(sourceUri, exports.EXTENSIONS_BUCKET_NAME);
+        spinner.succeed(" Uploaded extension source code");
+        packageUri = api_1.storageOrigin + objectPath + "?alt=media";
+        const res = await (0, extensionsApi_1.createSource)(projectId, packageUri, extensionRoot);
+        logger_1.logger.debug("Created new Extension Source %s", res.name);
+        await deleteUploadedSource(objectPath);
+        return res;
     }
-    else {
-        [packageUri, extensionRoot] = sourceUri.split("#");
+    catch (err) {
+        spinner.fail();
+        throw new error_1.FirebaseError(`Failed to archive and upload extension source from ${sourceUri}, ${err}`, {
+            original: err,
+        });
     }
-    const res = await (0, extensionsApi_1.createSource)(projectId, packageUri, extensionRoot);
-    logger_1.logger.debug("Created new Extension Source %s", res.name);
-    await deleteUploadedSource(objectPath);
-    return res;
 }
 exports.createSourceFromLocation = createSourceFromLocation;
 async function deleteUploadedSource(objectPath) {
@@ -535,3 +529,15 @@ async function diagnoseAndFixProject(options) {
     }
 }
 exports.diagnoseAndFixProject = diagnoseAndFixProject;
+function canonicalizeRefInput(extensionName) {
+    if (extensionName.split("/").length < 2) {
+        const [extensionID, version] = extensionName.split("@");
+        extensionName = `firebase/${extensionID}@${version || "latest"}`;
+    }
+    const ref = refs.parse(extensionName);
+    if (!ref.version) {
+        extensionName = `${extensionName}@latest`;
+    }
+    return extensionName;
+}
+exports.canonicalizeRefInput = canonicalizeRefInput;

package/lib/extensions/manifest.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
+exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.getInstanceTarget = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
 const clc = require("cli-color");
 const path = require("path");
 const refs = require("./refs");
 const config_1 = require("../config");
+const planner_1 = require("../deploy/extensions/planner");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const paramHelper_1 = require("./paramHelper");
@@ -42,11 +43,12 @@ async function writeToManifest(specs, config, options, allowOverwrite = false) {
 exports.writeToManifest = writeToManifest;
 async function writeLocalSecrets(specs, config, force) {
     for (const spec of specs) {
-        if (!spec.paramSpecs) {
+        const extensionSpec = await (0, planner_1.getExtensionSpec)(spec);
+        if (!extensionSpec.params) {
             continue;
         }
         const writeBuffer = {};
-        const locallyOverridenSecretParams = spec.paramSpecs.filter((p) => p.type === extensionsApi_1.ParamType.SECRET && spec.params[p.param].local);
+        const locallyOverridenSecretParams = extensionSpec.params.filter((p) => p.type === extensionsApi_1.ParamType.SECRET && spec.params[p.param].local);
         for (const paramSpec of locallyOverridenSecretParams) {
             const key = paramSpec.param;
             const localValue = spec.params[key].local;
@@ -97,18 +99,35 @@ function instanceExists(instanceId, config) {
     return !!config.get("extensions", {})[instanceId];
 }
 exports.instanceExists = instanceExists;
-function getInstanceRef(instanceId, config) {
+function getInstanceTarget(instanceId, config) {
     if (!instanceExists(instanceId, config)) {
         throw new error_1.FirebaseError(`Could not find extension instance ${instanceId} in firebase.json`);
     }
-    const ref = config.get("extensions", {})[instanceId];
-    return refs.parse(ref);
+    return config.get("extensions", {})[instanceId];
+}
+exports.getInstanceTarget = getInstanceTarget;
+function getInstanceRef(instanceId, config) {
+    const source = getInstanceTarget(instanceId, config);
+    if ((0, extensionsHelper_1.isLocalPath)(source)) {
+        throw new error_1.FirebaseError(`Extension instance ${instanceId} doesn't have a ref because it is from a local source`);
+    }
+    return refs.parse(source);
 }
 exports.getInstanceRef = getInstanceRef;
 function writeExtensionsToFirebaseJson(specs, config) {
     const extensions = config.get("extensions", {});
     for (const s of specs) {
-        extensions[s.instanceId] = refs.toExtensionVersionRef(s.ref);
+        let target;
+        if (s.ref) {
+            target = refs.toExtensionVersionRef(s.ref);
+        }
+        else if (s.localPath) {
+            target = s.localPath;
+        }
+        else {
+            throw new error_1.FirebaseError(`Unable to resolve ManifestInstanceSpec, make sure you provide either extension ref or a local path to extension source code`);
+        }
+        extensions[s.instanceId] = target;
     }
     config.set("extensions", extensions);
     config.writeProjectFile("firebase.json", config.src);
@@ -117,6 +136,7 @@ function writeExtensionsToFirebaseJson(specs, config) {
 async function writeEnvFiles(specs, config, force) {
     for (const spec of specs) {
         const content = Object.entries(spec.params)
+            .filter((r) => r[1].baseValue !== "")
             .sort((a, b) => {
             return a[0].localeCompare(b[0]);
         })

package/lib/extensions/paramHelper.js

@@ -8,9 +8,10 @@ const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsHelper_1 = require("./extensionsHelper");
 const askUserForParam = require("./askUserForParam");
-const track = require("../track");
+const track_1 = require("../track");
 const env = require("../functions/env");
 const utils_1 = require("../utils");
+const warnings_1 = require("./warnings");
 function getBaseParamBindings(params) {
     let ret = {};
     for (const [k, v] of Object.entries(params)) {
@@ -57,6 +58,7 @@ async function getParams(args) {
             paramsMessage);
     }
     else if (args.paramsEnvPath) {
+        (0, warnings_1.paramsFlagDeprecationWarning)();
         params = getParamsFromFile({
             paramSpecs: args.paramSpecs,
             paramsEnvPath: args.paramsEnvPath,
@@ -73,7 +75,7 @@ async function getParams(args) {
         });
     }
     const paramNames = Object.keys(params);
-    void track("Extension Params", paramNames.length ? "Not Present" : "Present", paramNames.length);
+    void (0, track_1.track)("Extension Params", paramNames.length ? "Not Present" : "Present", paramNames.length);
     return params;
 }
 exports.getParams = getParams;
@@ -106,7 +108,7 @@ async function getParamsForUpdate(args) {
         });
     }
     const paramNames = Object.keys(params);
-    void track("Extension Params", paramNames.length ? "Not Present" : "Present", paramNames.length);
+    void (0, track_1.track)("Extension Params", paramNames.length ? "Not Present" : "Present", paramNames.length);
     return params;
 }
 exports.getParamsForUpdate = getParamsForUpdate;
@@ -150,10 +152,10 @@ function getParamsFromFile(args) {
     let envParams;
     try {
         envParams = readEnvFile(args.paramsEnvPath);
-        void track("Extension Env File", "Present");
+        void (0, track_1.track)("Extension Env File", "Present");
     }
     catch (err) {
-        void track("Extension Env File", "Invalid");
+        void (0, track_1.track)("Extension Env File", "Invalid");
         throw new error_1.FirebaseError(`Error reading env file: ${err.message}\n`, { original: err });
     }
     const params = (0, extensionsHelper_1.populateDefaultParams)(envParams, args.paramSpecs);

package/lib/extensions/provisioningHelper.js

@@ -19,8 +19,8 @@ async function checkProductsProvisioned(projectId, spec) {
 exports.checkProductsProvisioned = checkProductsProvisioned;
 async function bulkCheckProductsProvisioned(projectId, instanceSpecs) {
     const usedProducts = await Promise.all(instanceSpecs.map(async (i) => {
-        const extensionVersion = await (0, planner_1.getExtensionVersion)(i);
-        return getUsedProducts(extensionVersion.spec);
+        const extensionSpec = await (0, planner_1.getExtensionSpec)(i);
+        return getUsedProducts(extensionSpec);
     }));
     await checkProducts(projectId, [...(0, functional_1.flattenArray)(usedProducts)]);
 }

package/lib/extensions/warnings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
+exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
 const clc = require("cli-color");
 const extensionsApi_1 = require("./extensionsApi");
@@ -11,6 +11,7 @@ const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const planner_1 = require("../deploy/extensions/planner");
 const functional_1 = require("../functional");
 const utils = require("../utils");
+const logger_1 = require("../logger");
 function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     const publisherNameLink = githubLink ? `[${publisherId}](${githubLink})` : publisherId;
     const warningMsg = `This extension is in preview and is built by a developer in the [Extensions Publisher Early Access Program](http://bit.ly/firex-provider). Its functionality might change in backward-incompatible ways. Since this extension isn't built by Firebase, reach out to ${publisherNameLink} with questions about this extension.`;
@@ -49,11 +50,11 @@ const toListEntry = (i) => {
 };
 async function displayWarningsForDeploy(instancesToCreate) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();
-    for (const i of instancesToCreate) {
+    const publishedExtensionInstances = instancesToCreate.filter((i) => i.ref);
+    for (const i of publishedExtensionInstances) {
         await (0, planner_1.getExtension)(i);
-        await (0, planner_1.getExtensionVersion)(i);
     }
-    const [eapExtensions, nonEapExtensions] = (0, functional_1.partition)(instancesToCreate, (i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
+    const [eapExtensions, nonEapExtensions] = (0, functional_1.partition)(publishedExtensionInstances, (i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
     const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === extensionsApi_1.RegistryLaunchStage.EXPERIMENTAL);
     if (experimental.length) {
         const humanReadableList = experimental.map((i) => `\t${(0, deploymentSummary_1.humanReadable)(i)}`).join("\n");
@@ -68,3 +69,9 @@ async function displayWarningsForDeploy(instancesToCreate) {
     return experimental.length > 0 || eapExtensions.length > 0;
 }
 exports.displayWarningsForDeploy = displayWarningsForDeploy;
+function paramsFlagDeprecationWarning() {
+    logger_1.logger.warn("The --params flag is deprecated and will be removed in firebase-tools@11. " +
+        "Instead, use an extensions manifest and `firebase deploy --only extensions` to deploy extensions noninteractively. " +
+        "See https://firebase.google.com/docs/extensions/manifest for more details");
+}
+exports.paramsFlagDeprecationWarning = paramsFlagDeprecationWarning;

package/lib/functions/events/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.v2 = exports.v1 = void 0;
+const v1 = require("./v1");
+exports.v1 = v1;
+const v2 = require("./v2");
+exports.v2 = v2;

package/lib/functions/events/v1.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AUTH_BLOCKING_EVENTS = exports.BEFORE_SIGN_IN_EVENT = exports.BEFORE_CREATE_EVENT = void 0;
+exports.BEFORE_CREATE_EVENT = "providers/cloud.auth/eventTypes/user.beforeCreate";
+exports.BEFORE_SIGN_IN_EVENT = "providers/cloud.auth/eventTypes/user.beforeSignIn";
+exports.AUTH_BLOCKING_EVENTS = [exports.BEFORE_CREATE_EVENT, exports.BEFORE_SIGN_IN_EVENT];

package/lib/functions/projectConfig.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeAndValidate = exports.validate = exports.normalize = void 0;
+exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
 const error_1 = require("../error");
+exports.DEFAULT_CODEBASE = "default";
 function normalize(config) {
     if (!config) {
         throw new error_1.FirebaseError("No valid functions configuration detected in firebase.json");
@@ -19,16 +20,41 @@ function validateSingle(config) {
     if (!config.source) {
         throw new error_1.FirebaseError("functions.source must be specified");
     }
-    return Object.assign(Object.assign({}, config), { source: config.source });
+    if (!config.codebase) {
+        config.codebase = exports.DEFAULT_CODEBASE;
+    }
+    if (config.codebase.length > 63 || !/^[a-z0-9_-]+$/.test(config.codebase)) {
+        throw new error_1.FirebaseError("Invalid codebase name. Codebase must be less than 63 characters and " +
+            "can contain only lowercase letters, numeric characters, underscores, and dashes.");
+    }
+    return Object.assign(Object.assign({}, config), { source: config.source, codebase: config.codebase });
 }
-function validate(config) {
-    if (config.length > 1) {
-        throw new error_1.FirebaseError("More than one functions.source detected in firebase.json.");
+function assertUnique(config, property) {
+    const values = new Set();
+    for (const single of config) {
+        const value = single[property];
+        if (values.has(value)) {
+            throw new error_1.FirebaseError(`functions.${property} must be unique but '${value}' was used more than once.`);
+        }
+        values.add(value);
     }
-    return [validateSingle(config[0])];
+}
+function validate(config) {
+    const validated = config.map((cfg) => validateSingle(cfg));
+    assertUnique(validated, "source");
+    assertUnique(validated, "codebase");
+    return validated;
 }
 exports.validate = validate;
 function normalizeAndValidate(config) {
     return validate(normalize(config));
 }
 exports.normalizeAndValidate = normalizeAndValidate;
+function configForCodebase(config, codebase) {
+    const codebaseCfg = config.find((c) => c.codebase === codebase);
+    if (!codebaseCfg) {
+        throw new error_1.FirebaseError(`No functions config found for codebase ${codebase}`);
+    }
+    return codebaseCfg;
+}
+exports.configForCodebase = configForCodebase;

package/lib/functionsShellCommandAction.js

@@ -55,7 +55,7 @@ const actionFunction = async (options) => {
     })
         .then(() => {
         const instance = serveFunctions.get();
-        const emulator = new shell.FunctionsEmulatorShell(instance, serveFunctions.getBackend());
+        const emulator = new shell.FunctionsEmulatorShell(instance);
         if (emulator.emulatedFunctions && emulator.emulatedFunctions.length === 0) {
             logger_1.logger.info("No functions emulated.");
             process.exit();

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,20 +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: { resource: gcfFunction.eventTrigger.resource },
-                retry: !!((_e = gcfFunction.eventTrigger.failurePolicy) === null || _e === void 0 ? void 0 : _e.retry),
+                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));
     }
@@ -255,10 +275,12 @@ function endpointFromFunction(gcfFunction) {
         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");
     }
@@ -294,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)) {
@@ -309,6 +335,13 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         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.mebibytes = 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,
@@ -28,7 +39,7 @@ const BYTES_PER_UNIT = {
     Gi: 1 << 30,
     Ti: 1 << 40,
 };
-function megabytes(memory) {
+function mebibytes(memory) {
     const re = /^([0-9]+(\.[0-9]*)?)(Ki|Mi|Gi|Ti|k|M|G|T|([eE]([0-9]+)))?$/;
     const matches = re.exec(memory);
     if (!matches) {
@@ -43,9 +54,9 @@ function megabytes(memory) {
         const suffix = matches[3] || "";
         bytes = quantity * BYTES_PER_UNIT[suffix];
     }
-    return bytes / 1e6;
+    return bytes / (1 << 20);
 }
-exports.megabytes = megabytes;
+exports.mebibytes = mebibytes;
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
     if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
@@ -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");
     }
@@ -167,7 +179,14 @@ function functionFromEndpoint(endpoint, source) {
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
-    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => `${mb}M`);
+    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => {
+        if (mb > 1024) {
+            return `${mb / 1024}Gi`;
+        }
+        else {
+            return `${mb}Mi`;
+        }
+    });
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
     if (endpoint.vpc) {
@@ -194,6 +213,7 @@ function functionFromEndpoint(endpoint, source) {
             }
         }
         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);
         }
@@ -208,11 +228,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") {
@@ -230,6 +260,13 @@ 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: {
@@ -246,6 +283,7 @@ function endpointFromFunction(gcfFunction) {
                 trigger.eventTrigger.eventFilters[attribute] = value;
             }
         }
+        proto.copyIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "channel");
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");
     }
     else {
@@ -258,7 +296,7 @@ function endpointFromFunction(gcfFunction) {
         project,
         region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
     proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "timeoutSeconds");
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", megabytes);
+    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", mebibytes);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
     proto.copyIfPresent(endpoint, gcfFunction, "labels");
@@ -266,6 +304,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;