firebase-tools 11.21.0 → 11.23.0

package/lib/commands/ext-configure.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
@@ -18,7 +18,7 @@ const manifest = require("../extensions/manifest");
 const functional_1 = require("../functional");
 const paramHelper_1 = require("../extensions/paramHelper");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.command = new command_1.Command("ext:configure <extensionInstanceId>")
@@ -98,7 +98,7 @@ function infoImmutableParams(immutableParams, paramValues) {
         return;
     }
     const plural = immutableParams.length > 1;
-    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(`The following param${plural ? "s are" : " is"} immutable and won't be changed:`));
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following param${plural ? "s are" : " is"} immutable and won't be changed:`));
     for (const { param } of immutableParams) {
         logger_1.logger.info(`param: ${param}, value: ${paramValues[param]}`);
     }

package/lib/commands/ext-dev-init.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const fs = require("fs");
 const path = require("path");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
@@ -12,13 +12,15 @@ const error_1 = require("../error");
 const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const npmDependencies = require("../init/features/functions/npm-dependencies");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const TEMPLATE_ROOT = path.resolve(__dirname, "../../templates/extensions/");
 const FUNCTIONS_ROOT = path.resolve(__dirname, "../../templates/init/functions/");
 function readCommonTemplates() {
     return {
+        integrationTestFirebaseJsonTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.json"), "utf8"),
+        integrationTestEnvTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.env"), "utf8"),
         extSpecTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "extension.yaml"), "utf8"),
         preinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "PREINSTALL.md"), "utf8"),
         postinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "POSTINSTALL.md"), "utf8"),
@@ -61,9 +63,9 @@ exports.command = new command_1.Command("ext:dev:init")
                 throw new error_1.FirebaseError(`${lang} is not supported.`);
             }
         }
-        await npmDependencies.askInstallDependencies({}, config);
+        await npmDependencies.askInstallDependencies({ source: "functions" }, config);
         const welcome = fs.readFileSync(path.join(TEMPLATE_ROOT, lang, "WELCOME.md"), "utf8");
-        return logger_1.logger.info("\n" + marked(welcome));
+        return logger_1.logger.info("\n" + (0, marked_1.marked)(welcome));
     }
     catch (err) {
         if (!(err instanceof error_1.FirebaseError)) {
@@ -80,7 +82,9 @@ async function typescriptSelected(config) {
     const tsconfigTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.json"), "utf8");
     const tsconfigDevTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.dev.json"), "utf8");
     const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "index.ts"), "utf8");
+    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "integration-test.ts"), "utf8");
     const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_gitignore"), "utf8");
+    const mocharcTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_mocharc"), "utf8");
     const eslintTemplate = fs.readFileSync(path.join(FUNCTIONS_ROOT, "typescript", "_eslintrc"), "utf8");
     const lint = await (0, prompt_1.promptOnce)({
         name: "lint",
@@ -93,7 +97,11 @@ async function typescriptSelected(config) {
     await config.askWriteProjectFile("PREINSTALL.md", templates.preinstallTemplate);
     await config.askWriteProjectFile("POSTINSTALL.md", templates.postinstallTemplate);
     await config.askWriteProjectFile("CHANGELOG.md", templates.changelogTemplate);
+    await config.askWriteProjectFile("functions/.mocharc.json", mocharcTemplate);
     await config.askWriteProjectFile("functions/src/index.ts", indexTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/integration-test.spec.ts", integrationTestTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/firebase.json", templates.integrationTestFirebaseJsonTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/extensions/greet-the-world.env", templates.integrationTestEnvTemplate);
     if (lint) {
         await config.askWriteProjectFile("functions/package.json", packageLintingTemplate);
         await config.askWriteProjectFile("functions/.eslintrc.js", eslintTemplate);
@@ -109,6 +117,7 @@ async function typescriptSelected(config) {
 }
 async function javascriptSelected(config) {
     const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "index.js"), "utf8");
+    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "integration-test.js"), "utf8");
     const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.lint.json"), "utf8");
     const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.nolint.json"), "utf8");
     const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "_gitignore"), "utf8");
@@ -125,6 +134,9 @@ async function javascriptSelected(config) {
     await config.askWriteProjectFile("POSTINSTALL.md", templates.postinstallTemplate);
     await config.askWriteProjectFile("CHANGELOG.md", templates.changelogTemplate);
     await config.askWriteProjectFile("functions/index.js", indexTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/integration-test.spec.js", integrationTestTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/firebase.json", templates.integrationTestFirebaseJsonTemplate);
+    await config.askWriteProjectFile("functions/integration-tests/extensions/greet-the-world.env", templates.integrationTestEnvTemplate);
     if (lint) {
         await config.askWriteProjectFile("functions/package.json", packageLintingTemplate);
         await config.askWriteProjectFile("functions/.eslintrc.js", eslintTemplate);

package/lib/commands/ext-dev-publish.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const command_1 = require("../command");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
@@ -12,7 +12,7 @@ const publishHelpers_1 = require("../extensions/publishHelpers");
 const requireAuth_1 = require("../requireAuth");
 const error_1 = require("../error");
 const utils = require("../utils");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.command = new command_1.Command("ext:dev:publish <extensionRef>")
@@ -42,7 +42,7 @@ exports.command = new command_1.Command("ext:dev:publish <extensionRef>")
         stage: (_a = options.stage) !== null && _a !== void 0 ? _a : "stable",
     });
     if (res) {
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`[Install Link](${(0, publishHelpers_1.consoleInstallLink)(res.ref)})`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`[Install Link](${(0, publishHelpers_1.consoleInstallLink)(res.ref)})`));
     }
     return res;
 });

package/lib/commands/ext-dev-register.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const command_1 = require("../command");
 const extensionsApi_1 = require("../extensions/extensionsApi");
 const projectUtils_1 = require("../projectUtils");
@@ -38,7 +38,7 @@ exports.command = new command_1.Command("ext:dev:register")
                 " This can happen for either of two reasons:\n\n" +
                 ` - Publisher ID '${clc.bold(publisherId)}' is registered to another project\n` +
                 ` - Project '${clc.bold(projectId)}' already has a publisher ID\n\n` +
-                ` Try again with a unique publisher ID or a new project. If your business’s name has been registered to another project, contact Firebase support ${marked("(https://firebase.google.com/support/troubleshooter/contact).")}`;
+                ` Try again with a unique publisher ID or a new project. If your business’s name has been registered to another project, contact Firebase support ${(0, marked_1.marked)("(https://firebase.google.com/support/troubleshooter/contact).")}`;
             throw new error_1.FirebaseError(error, { exit: 1 });
         }
         throw new error_1.FirebaseError(`Failed to register publisher ID ${clc.bold(publisherId)} for project ${clc.bold(projectId)}: ${err.message}`);

package/lib/commands/ext-info.js

@@ -10,7 +10,7 @@ const localHelper_1 = require("../extensions/localHelper");
 const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const utils = require("../utils");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const FUNCTION_TYPE_REGEX = /\..+\.function/;
 exports.command = new command_1.Command("ext:info <extensionName>")
@@ -108,10 +108,10 @@ exports.command = new command_1.Command("ext:info <extensionName>")
         logger_1.logger.info(lines.join("\n\n"));
     }
     else {
-        marked.setOptions({
+        marked_1.marked.setOptions({
             renderer: new TerminalRenderer(),
         });
-        logger_1.logger.info(marked(lines.join("\n")));
+        logger_1.logger.info((0, marked_1.marked)(lines.join("\n")));
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, type ` +
             clc.bold(`firebase ext:install ${extensionName} --project=YOUR_PROJECT`));
     }

package/lib/commands/ext-install.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const displayExtensionInfo_1 = require("../extensions/displayExtensionInfo");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
@@ -21,7 +21,7 @@ const utils = require("../utils");
 const track_1 = require("../track");
 const experiments = require("../experiments");
 const manifest = require("../extensions/manifest");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.command = new command_1.Command("ext:install [extensionName]")

package/lib/commands/ext-uninstall.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
@@ -9,7 +9,7 @@ const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const requirePermissions_1 = require("../requirePermissions");
 const utils_1 = require("../utils");
 const manifest = require("../extensions/manifest");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.command = new command_1.Command("ext:uninstall <extensionInstanceId>")

package/lib/commands/ext-update.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
@@ -18,7 +18,7 @@ const utils = require("../utils");
 const experiments = require("../experiments");
 const manifest = require("../extensions/manifest");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.command = new command_1.Command("ext:update <extensionInstanceId> [updateSource]")

package/lib/commands/hosting-channel-create.js

@@ -12,7 +12,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
 const requireConfig_1 = require("../requireConfig");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const requireHostingSite_1 = require("../requireHostingSite");
 const LOG_TAG = "hosting:channel";
 exports.command = new command_1.Command("hosting:channel:create [channelId]")
@@ -54,7 +54,7 @@ exports.command = new command_1.Command("hosting:channel:create [channelId]")
         await (0, api_1.addAuthDomains)(projectId, [channel.url]);
     }
     catch (e) {
-        (0, utils_1.logLabeledWarning)(LOG_TAG, marked(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+        (0, utils_1.logLabeledWarning)(LOG_TAG, (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
         logger_1.logger.debug("[hosting] unable to add auth domain", e);
     }
     logger_1.logger.info();

package/lib/commands/hosting-channel-delete.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const colorette_1 = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const command_1 = require("../command");
 const utils_1 = require("../utils");
 const api_1 = require("../hosting/api");
@@ -39,7 +39,7 @@ exports.command = new command_1.Command("hosting:channel:delete <channelId>")
             await (0, api_1.removeAuthDomain)(projectId, channel.url);
         }
         catch (e) {
-            (0, utils_1.logLabeledWarning)("hosting:channel", marked(`Unable to remove channel domain from Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+            (0, utils_1.logLabeledWarning)("hosting:channel", (0, marked_1.marked)(`Unable to remove channel domain from Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
             logger_1.logger.debug("[hosting] unable to remove auth domain", e);
         }
     }

package/lib/commands/hosting-channel-deploy.js

@@ -13,7 +13,7 @@ const requireConfig_1 = require("../requireConfig");
 const expireUtils_1 = require("../hosting/expireUtils");
 const utils_1 = require("../utils");
 const config_1 = require("../hosting/config");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const requireHostingSite_1 = require("../requireHostingSite");
 const LOG_TAG = "hosting:channel";
 exports.command = new command_1.Command("hosting:channel:deploy [channelId]")
@@ -128,7 +128,7 @@ async function syncAuthState(projectId, sites) {
         logger_1.logger.debug("[hosting] added auth domain for urls", urlNames);
     }
     catch (e) {
-        (0, utils_1.logLabeledWarning)(LOG_TAG, marked(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+        (0, utils_1.logLabeledWarning)(LOG_TAG, (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
         logger_1.logger.debug("[hosting] unable to add auth domain", e);
     }
     try {

package/lib/commands/hosting-clone.js

@@ -8,7 +8,7 @@ const error_1 = require("../error");
 const api_1 = require("../hosting/api");
 const utils = require("../utils");
 const requireAuth_1 = require("../requireAuth");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const logger_1 = require("../logger");
 exports.command = new command_1.Command("hosting:clone <source> <targetChannel>")
     .description("clone a version from one site to another")
@@ -68,7 +68,7 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
             await (0, api_1.addAuthDomains)(tProjectId, [tChannel.url]);
         }
         catch (e) {
-            utils.logLabeledWarning("hosting:clone", marked(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${utils.consoleUrl(targetSiteId, "/authentication/providers")}`));
+            utils.logLabeledWarning("hosting:clone", (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${utils.consoleUrl(targetSiteId, "/authentication/providers")}`));
             logger_1.logger.debug("[hosting] unable to add auth domain", e);
         }
     }

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

@@ -249,6 +249,9 @@ class Fabricator {
             await this.executor
                 .run(async () => {
                 try {
+                    if ((await eventarc.getChannel(channel)) !== undefined) {
+                        return;
+                    }
                     const op = await eventarc.createChannel({ name: channel });
                     return await poller.pollOperation(Object.assign(Object.assign({}, eventarcPollerOptions), { pollerName: `create-${channel}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
                 }

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -54,7 +54,7 @@ async function detectFromPort(port, project, runtime, timeout = 30000) {
     });
     while (true) {
         try {
-            res = await Promise.race([(0, node_fetch_1.default)(`http://localhost:${port}/__/functions.yaml`), timedOut]);
+            res = await Promise.race([(0, node_fetch_1.default)(`http://127.0.0.1:${port}/__/functions.yaml`), timedOut]);
             break;
         }
         catch (err) {

package/lib/deploy/functions/runtimes/index.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuntimeDelegate = exports.getHumanFriendlyRuntimeName = exports.isValidRuntime = exports.isDeprecatedRuntime = void 0;
 const node = require("./node");
+const python = require("./python");
 const validate = require("../validate");
 const error_1 = require("../../../error");
 const RUNTIMES = ["nodejs10", "nodejs12", "nodejs14", "nodejs16", "nodejs18"];
-const EXPERIMENTAL_RUNTIMES = [];
+const EXPERIMENTAL_RUNTIMES = ["python310", "python311"];
 const DEPRECATED_RUNTIMES = ["nodejs6", "nodejs8"];
 function isDeprecatedRuntime(runtime) {
     return DEPRECATED_RUNTIMES.includes(runtime);
@@ -23,12 +24,14 @@ const MESSAGE_FRIENDLY_RUNTIMES = {
     nodejs14: "Node.js 14",
     nodejs16: "Node.js 16",
     nodejs18: "Node.js 18",
+    python310: "Python 3.10",
+    python311: "Python 3.11 (Preview)",
 };
 function getHumanFriendlyRuntimeName(runtime) {
     return MESSAGE_FRIENDLY_RUNTIMES[runtime] || runtime;
 }
 exports.getHumanFriendlyRuntimeName = getHumanFriendlyRuntimeName;
-const factories = [node.tryCreateDelegate];
+const factories = [node.tryCreateDelegate, python.tryCreateDelegate];
 async function getRuntimeDelegate(context) {
     const { projectDir, sourceDir, runtime } = context;
     validate.functionsDirectoryExists(sourceDir, projectDir);

package/lib/deploy/functions/runtimes/node/index.js

@@ -16,6 +16,7 @@ const discovery = require("../discovery");
 const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
+const fsutils_1 = require("../../../../fsutils");
 const MIN_FUNCTIONS_SDK_VERSION = "3.20.0";
 async function tryCreateDelegate(context) {
     const packageJsonPath = path.join(context.sourceDir, "package.json");
@@ -39,6 +40,7 @@ class Delegate {
         this.runtime = runtime;
         this.name = "nodejs";
         this._sdkVersion = undefined;
+        this._bin = "";
     }
     get sdkVersion() {
         if (this._sdkVersion === undefined) {
@@ -46,6 +48,38 @@ class Delegate {
         }
         return this._sdkVersion;
     }
+    get bin() {
+        if (this._bin === "") {
+            this._bin = this.getNodeBinary();
+        }
+        return this._bin;
+    }
+    getNodeBinary() {
+        const requestedVersion = semver.coerce(this.runtime);
+        if (!requestedVersion) {
+            throw new error_1.FirebaseError(`Could not determine version of the requested runtime: ${this.runtime}`);
+        }
+        const hostVersion = process.versions.node;
+        const localNodePath = path.join(this.sourceDir, "node_modules/node");
+        const localNodeVersion = versioning.findModuleVersion("node", localNodePath);
+        if (localNodeVersion) {
+            if (semver.major(requestedVersion) === semver.major(localNodeVersion)) {
+                (0, utils_1.logLabeledSuccess)("functions", `Using node@${semver.major(localNodeVersion)} from local cache.`);
+                return localNodePath;
+            }
+        }
+        if (semver.major(requestedVersion) === semver.major(hostVersion)) {
+            (0, utils_1.logLabeledSuccess)("functions", `Using node@${semver.major(hostVersion)} from host.`);
+            return process.execPath;
+        }
+        if (!process.env.FIREPIT_VERSION) {
+            (0, utils_1.logLabeledWarning)("functions", `Your requested "node" version "${semver.major(requestedVersion)}" doesn't match your global version "${semver.major(hostVersion)}". Using node@${semver.major(hostVersion)} from host.`);
+            return process.execPath;
+        }
+        (0, utils_1.logLabeledWarning)("functions", `You've requested "node" version "${semver.major(requestedVersion)}", but the standalone Firebase CLI comes with bundled Node "${semver.major(hostVersion)}".`);
+        (0, utils_1.logLabeledSuccess)("functions", `To use a different Node.js version, consider removing the standalone Firebase CLI and switching to "firebase-tools" on npm.`);
+        return process.execPath;
+    }
     validate() {
         versioning.checkFunctionsSDKVersion(this.sdkVersion);
         const relativeDir = path.relative(this.projectDir, this.sourceDir);
@@ -57,35 +91,44 @@ class Delegate {
     watch() {
         return Promise.resolve(() => Promise.resolve());
     }
-    serve(port, config, envs) {
+    serveAdmin(port, config, envs) {
         var _a;
-        const env = Object.assign(Object.assign({}, envs), { PORT: port.toString(), FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH, NODE_ENV: process.env.NODE_ENV });
+        const env = Object.assign(Object.assign({}, envs), { PORT: port, FUNCTIONS_CONTROL_API: "true", HOME: process.env.HOME, PATH: process.env.PATH, NODE_ENV: process.env.NODE_ENV });
         if (Object.keys(config || {}).length) {
             env.CLOUD_RUNTIME_CONFIG = JSON.stringify(config);
         }
+        const sourceNodeModulesPath = path.join(this.sourceDir, "node_modules");
         const sdkPath = require.resolve("firebase-functions", { paths: [this.sourceDir] });
-        const binPath = sdkPath.substring(0, sdkPath.lastIndexOf("node_modules") + 12);
-        const childProcess = spawn(path.join(binPath, ".bin", "firebase-functions"), [this.sourceDir], {
-            env,
-            cwd: this.sourceDir,
-            stdio: ["ignore", "pipe", "inherit"],
-        });
-        (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
-            logger_1.logger.debug(chunk.toString());
-        });
-        return Promise.resolve(async () => {
-            const p = new Promise((resolve, reject) => {
-                childProcess.once("exit", resolve);
-                childProcess.once("error", reject);
-            });
-            await (0, node_fetch_1.default)(`http://localhost:${port}/__/quitquitquit`);
-            setTimeout(() => {
-                if (!childProcess.killed) {
-                    childProcess.kill("SIGKILL");
-                }
-            }, 10000);
-            return p;
-        });
+        const sdkNodeModulesPath = sdkPath.substring(0, sdkPath.lastIndexOf("node_modules") + 12);
+        for (const nodeModulesPath of [sourceNodeModulesPath, sdkNodeModulesPath]) {
+            const binPath = path.join(nodeModulesPath, ".bin", "firebase-functions");
+            if ((0, fsutils_1.fileExistsSync)(binPath)) {
+                logger_1.logger.debug(`Found firebase-functions binary at '${binPath}'`);
+                const childProcess = spawn(binPath, [this.sourceDir], {
+                    env,
+                    cwd: this.sourceDir,
+                    stdio: ["ignore", "pipe", "inherit"],
+                });
+                (_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+                    logger_1.logger.debug(chunk.toString());
+                });
+                return Promise.resolve(async () => {
+                    const p = new Promise((resolve, reject) => {
+                        childProcess.once("exit", resolve);
+                        childProcess.once("error", reject);
+                    });
+                    await (0, node_fetch_1.default)(`http://localhost:${port}/__/quitquitquit`);
+                    setTimeout(() => {
+                        if (!childProcess.killed) {
+                            childProcess.kill("SIGKILL");
+                        }
+                    }, 10000);
+                    return p;
+                });
+            }
+        }
+        throw new error_1.FirebaseError("Failed to find location of Firebase Functions SDK. " +
+            "Please file a bug on Github (https://github.com/firebase/firebase-tools/).");
     }
     async discoverBuild(config, env) {
         if (!semver.valid(this.sdkVersion)) {
@@ -99,9 +142,9 @@ class Delegate {
         }
         let discovered = await discovery.detectFromYaml(this.sourceDir, this.projectId, this.runtime);
         if (!discovered) {
-            const getPort = (0, util_1.promisify)(portfinder.getPort);
-            const port = await getPort();
-            const kill = await this.serve(port, config, env);
+            const basePort = 8000 + (0, utils_1.randomInt)(0, 1000);
+            const port = await portfinder.getPortPromise({ port: basePort });
+            const kill = await this.serveAdmin(port.toString(), config, env);
             try {
                 discovered = await discovery.detectFromPort(port, this.projectId, this.runtime);
             }

package/lib/deploy/functions/runtimes/node/versioning.js

@@ -4,12 +4,13 @@ exports.checkFunctionsSDKVersion = exports.getLatestSDKVersion = exports.getFunc
 const fs = require("fs");
 const path = require("path");
 const clc = require("colorette");
-const semver = require("semver");
 const spawn = require("cross-spawn");
-const utils = require("../../../../utils");
+const semver = require("semver");
 const logger_1 = require("../../../../logger");
 const track_1 = require("../../../../track");
+const utils = require("../../../../utils");
 const MIN_SDK_VERSION = "2.0.0";
+const NPM_COMMAND_TIMEOUT_MILLIES = 10000;
 exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold(clc.yellow("functions: ")) +
     "You must have a " +
     clc.bold("firebase-functions") +
@@ -53,6 +54,7 @@ function getLatestSDKVersion() {
     var _a;
     const child = spawn.sync("npm", ["show", "firebase-functions", "--json=true"], {
         encoding: "utf8",
+        timeout: NPM_COMMAND_TIMEOUT_MILLIES,
     });
     if (child.error) {
         logger_1.logger.debug("checkFunctionsSDKVersion was unable to fetch information from NPM", child.error.stack);