firebase-tools 12.4.2 → 12.4.4

package/lib/apiv2.js

@@ -233,6 +233,7 @@ class Client {
                     }
                     catch (thrown) {
                         const err = thrown instanceof Error ? thrown : new Error(thrown);
+                        logger_1.logger.debug(`*** [apiv2] error from fetch(${fetchURL}, ${JSON.stringify(fetchOptions)}): ${err}`);
                         const isAbortError = err.name.includes("AbortError");
                         if (isAbortError) {
                             throw new error_1.FirebaseError(`Timeout reached making request to ${fetchURL}`, {

package/lib/commands/database-instances-list.js

@@ -1,76 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const command_1 = require("../command");
 const Table = require("cli-table");
+const command_1 = require("../command");
 const clc = require("colorette");
 const ora = require("ora");
 const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
-const projectUtils_1 = require("../projectUtils");
-const firedata = require("../gcp/firedata");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const experiments = require("../experiments");
-const projectUtils_2 = require("../projectUtils");
+const projectUtils_1 = require("../projectUtils");
 const database_1 = require("../management/database");
-function logInstances(instances) {
-    if (instances.length === 0) {
-        logger_1.logger.info(clc.bold("No database instances found."));
-        return;
-    }
-    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
-    const table = new Table({ head: tableHead, style: { head: ["green"] } });
-    instances.forEach((db) => {
-        table.push([db.name, db.location, db.type, db.state]);
-    });
-    logger_1.logger.info(table.toString());
-}
-function logInstancesCount(count = 0) {
-    if (count === 0) {
-        return;
-    }
-    logger_1.logger.info("");
-    logger_1.logger.info(`${count} database instance(s) total.`);
-}
 exports.command = new command_1.Command("database:instances:list")
     .description("list realtime database instances, optionally filtered by a specified location")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.list"])
+    .option("-l, --location <location>", "(optional) location for the database instance, defaults to all regions")
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.DATABASE)
     .action(async (options) => {
     const location = (0, database_1.parseDatabaseLocation)(options.location, database_1.DatabaseLocation.ANY);
     const spinner = ora("Preparing the list of your Firebase Realtime Database instances" +
         `${location === database_1.DatabaseLocation.ANY ? "" : ` for location: ${location}`}`).start();
-    let instances;
-    if (experiments.isEnabled("rtdbmanagement")) {
-        const projectId = (0, projectUtils_2.needProjectId)(options);
-        try {
-            instances = await (0, database_1.listDatabaseInstances)(projectId, location);
-        }
-        catch (err) {
-            spinner.fail();
-            throw err;
-        }
-        spinner.succeed();
-        logInstances(instances);
-        logInstancesCount(instances.length);
-        return instances;
-    }
-    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    let instances = [];
     try {
-        instances = await firedata.listDatabaseInstances(projectNumber);
+        instances = await (0, database_1.listDatabaseInstances)(projectId, location);
     }
     catch (err) {
         spinner.fail();
         throw err;
     }
     spinner.succeed();
-    for (const instance of instances) {
-        logger_1.logger.info(instance.instance);
+    if (instances.length === 0) {
+        logger_1.logger.info(clc.bold("No database instances found."));
+        return;
+    }
+    if (!experiments.isEnabled("rtdbmanagement")) {
+        for (const instance of instances) {
+            logger_1.logger.info(instance.name);
+        }
+        logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+        return instances;
     }
-    logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
+    const table = new Table({ head: tableHead, style: { head: ["green"] } });
+    for (const db of instances) {
+        table.push([db.name, db.location, db.type, db.state]);
+    }
+    logger_1.logger.info(table.toString());
+    logger_1.logger.info(`${instances.length} database instance(s) total.`);
     return instances;
 });
-if (experiments.isEnabled("rtdbmanagement")) {
-    exports.command = exports.command.option("-l, --location <location>", "(optional) location for the database instance, defaults to us-central1");
-}

package/lib/commands/index.js

@@ -144,8 +144,6 @@ function load(client) {
         client.internaltesting.frameworks.compose = loadCommand("internaltesting-frameworks-compose");
         client.internaltesting.functions = {};
         client.internaltesting.functions.discover = loadCommand("internaltesting-functions-discover");
-        client.internaltesting.frameworks = {};
-        client.internaltesting.frameworks.init = loadCommand("internaltesting-frameworks-init");
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

package/lib/commands/internaltesting-frameworks-compose.js

@@ -6,15 +6,17 @@ const logger_1 = require("../logger");
 const driver_1 = require("../frameworks/compose/driver");
 const compose_1 = require("../frameworks/compose");
 const error_1 = require("../error");
+const filesystem_1 = require("../frameworks/compose/discover/filesystem");
+const frameworkSpec_1 = require("../frameworks/compose/discover/frameworkSpec");
 exports.command = new command_1.Command("internaltesting:frameworks:compose")
     .option("-m, --mode <mode>", "Composer mode (local or docker)", "local")
     .description("compose framework in current directory")
-    .action((options) => {
+    .action(async (options) => {
     const mode = options.mode;
     if (!driver_1.SUPPORTED_MODES.includes(mode)) {
         throw new error_1.FirebaseError(`Unsupported mode ${mode}. Supported modes are [${driver_1.SUPPORTED_MODES.join(", ")}]`);
     }
-    const bundle = (0, compose_1.compose)(mode);
+    const bundle = await (0, compose_1.compose)(mode, new filesystem_1.LocalFileSystem("."), frameworkSpec_1.frameworkSpecs);
     logger_1.logger.info(JSON.stringify(bundle, null, 2));
     return {};
 });

package/lib/commands/open.js

@@ -16,7 +16,7 @@ const LINKS = [
     { name: "Analytics", arg: "analytics", consolePath: "/analytics" },
     { name: "Authentication: Providers", arg: "auth", consolePath: "/authentication/providers" },
     { name: "Authentication: Users", arg: "auth:users", consolePath: "/authentication/users" },
-    { name: "Crash Reporting", arg: "crash", consolePath: "/monitoring" },
+    { name: "Crash Reporting", arg: "crash", consolePath: "/crashlytics" },
     { name: "Database: Data", arg: "database", consolePath: "/database/data" },
     { name: "Database: Rules", arg: "database:rules", consolePath: "/database/rules" },
     { name: "Docs", arg: "docs", url: "https://firebase.google.com/docs" },
@@ -38,7 +38,7 @@ const LINKS = [
     { name: "Functions", arg: "functions", consolePath: "/functions/list" },
     { name: "Functions Log", arg: "functions:log" },
     { name: "Hosting: Deployed Site", arg: "hosting:site" },
-    { name: "Hosting", arg: "hosting", consolePath: "/hosting/main" },
+    { name: "Hosting", arg: "hosting", consolePath: "/hosting/sites" },
     { name: "Notifications", arg: "notifications", consolePath: "/notification" },
     { name: "Project Dashboard", arg: "dashboard", consolePath: "/overview" },
     { name: "Project Settings", arg: "settings", consolePath: "/settings/general" },

package/lib/deploy/functions/prepare.js

@@ -295,7 +295,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
-        (0, utils_1.logLabeledBullet)("functions", `Loading and anaylzing source code for codebase ${codebase} to determine what to deploy`);
+        (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
         wantBuilds[codebase] = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
         wantBuilds[codebase].runtime = codebaseConfig.runtime;
     }

package/lib/emulator/downloadableEmulators.js

@@ -35,9 +35,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.11.6",
-            expectedSize: 3063444,
-            expectedChecksum: "14b971f4ed4909f348e647db7114d62b",
+            version: "1.11.7",
+            expectedSize: 3064105,
+            expectedChecksum: "bd2bcc331cbf613a5b3b55a1ce08998b",
         },
     pubsub: {
         version: "0.7.1",

package/lib/emulator/functionsRuntimeWorker.js

@@ -84,7 +84,7 @@ class RuntimeWorker {
             });
         });
     }
-    request(req, resp, body) {
+    request(req, resp, body, debug) {
         if (this.triggerKey !== FREE_WORKER_KEY) {
             this.logInfo(`Beginning execution of "${this.triggerKey}"`);
         }
@@ -124,6 +124,10 @@ class RuntimeWorker {
                 const piped = _resp.pipe(resp);
                 piped.on("finish", () => finishReq("finish"));
             });
+            if (debug) {
+                proxy.setSocketKeepAlive(false);
+                proxy.setTimeout(0);
+            }
             proxy.on("timeout", () => {
                 this.logger.log("ERROR", `Your function timed out after ~${this.timeoutSeconds}s. To configure this timeout, see
       https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`);
@@ -260,7 +264,7 @@ class RuntimeWorkerPool {
         if (debug) {
             await worker.sendDebugMsg(debug);
         }
-        return worker.request(req, resp, body);
+        return worker.request(req, resp, body, !!debug);
     }
     getIdleWorker(triggerId) {
         this.cleanUpWorkers();

package/lib/frameworks/compose/discover/filesystem.js

@@ -4,7 +4,7 @@ exports.readOrNull = exports.LocalFileSystem = void 0;
 const fs_extra_1 = require("fs-extra");
 const path = require("path");
 const error_1 = require("../../../error");
-const logger_1 = require("../../../../src/logger");
+const logger_1 = require("../../../logger");
 class LocalFileSystem {
     constructor(cwd) {
         this.cwd = cwd;

package/lib/frameworks/compose/discover/index.js

@@ -1,23 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.discover = void 0;
-function discover() {
-    return {
-        baseImage: "us-docker.pkg.dev/firestack-build/test/run:latest",
-        environmentVariables: {
-            NODE_ENV: "PRODUCTION",
-        },
-        installCommand: "npm install",
-        buildCommand: "npm run build",
-        startCommand: "npm run start",
-        afterInstall: (b) => {
-            console.log("HOOK: AFTER INSTALL");
-            return Object.assign(Object.assign({}, b), { version: "v1alpha", notes: "afterInstall" });
-        },
-        afterBuild(b) {
-            console.log("HOOK: AFTER BUILD");
-            return Object.assign(Object.assign({}, b), { version: "v1alpha", notes: "afterBuild" });
-        },
-    };
+const node_1 = require("./runtime/node");
+const error_1 = require("../../../error");
+const supportedRuntimes = [new node_1.NodejsRuntime()];
+async function discover(fs, allFrameworkSpecs) {
+    try {
+        let discoveredRuntime = undefined;
+        for (const runtime of supportedRuntimes) {
+            if (await runtime.match(fs)) {
+                if (!discoveredRuntime) {
+                    discoveredRuntime = runtime;
+                }
+                else {
+                    throw new error_1.FirebaseError(`Conflit occurred as multiple runtimes ${discoveredRuntime.getRuntimeName()}, ${runtime.getRuntimeName()} are discovered in the application.`);
+                }
+            }
+        }
+        if (!discoveredRuntime) {
+            throw new error_1.FirebaseError(`Unable to determine the specific runtime for the application. The supported runtime options include ${supportedRuntimes
+                .map((x) => x.getRuntimeName())
+                .join(" , ")}.`);
+        }
+        const runtimeSpec = await discoveredRuntime.analyseCodebase(fs, allFrameworkSpecs);
+        return runtimeSpec;
+    }
+    catch (error) {
+        throw new error_1.FirebaseError(`Failed to identify required specifications to execute the application: ${error}`);
+    }
 }
 exports.discover = discover;

package/lib/frameworks/compose/discover/runtime/node.js

@@ -4,7 +4,7 @@ exports.NodejsRuntime = void 0;
 const filesystem_1 = require("../filesystem");
 const frameworkMatcher_1 = require("../frameworkMatcher");
 const error_1 = require("../../../../error");
-const logger_1 = require("../../../../../src/logger");
+const logger_1 = require("../../../../logger");
 const utils_1 = require("../../../utils");
 const supportedNodeVersions = ["18"];
 const NODE_RUNTIME_ID = "nodejs";
@@ -13,7 +13,6 @@ const YARN_LOCK = "yarn.lock";
 class NodejsRuntime {
     constructor() {
         this.runtimeRequiredFiles = [PACKAGE_JSON];
-        this.contentCache = {};
     }
     async match(fs) {
         const areAllFilesPresent = await Promise.all(this.runtimeRequiredFiles.map((file) => fs.exists(file)));
@@ -24,13 +23,13 @@ class NodejsRuntime {
     }
     getNodeImage(engine) {
         if (!engine || !engine.node) {
-            return `node:${supportedNodeVersions[supportedNodeVersions.length - 1]}-slim`;
+            return "us-docker.pkg.dev/firestack-build/test/run";
         }
         const versionNumber = engine.node;
         if (!supportedNodeVersions.includes(versionNumber)) {
             throw new error_1.FirebaseError(`This integration expects Node version ${(0, utils_1.conjoinOptions)(supportedNodeVersions, "or")}. You're running version ${versionNumber}, which is not compatible.`);
         }
-        return `node:${versionNumber}-slim`;
+        return "us-docker.pkg.dev/firestack-build/test/run";
     }
     async getPackageManager(fs) {
         try {

package/lib/frameworks/compose/driver/docker.js

@@ -89,7 +89,9 @@ class DockerDriver {
         this.dockerfileBuilder.from(spec.baseImage, "base").user("firebase");
     }
     execDockerPush(args) {
-        console.log(`executing docker build: ${args.join(" ")}`);
+        console.debug(JSON.stringify({ message: `executing docker build: ${args.join(" ")}` }));
+        console.info(JSON.stringify({ foo: "bar", message: `executing docker build: ${args.join(" ")}` }));
+        console.error(JSON.stringify({ message: `executing docker build: ${args.join(" ")}` }));
         return spawn.sync("docker", ["push", ...args], {
             stdio: ["pipe", "inherit", "inherit"],
         });
@@ -126,20 +128,28 @@ class DockerDriver {
         return JSON.parse(fs.readFileSync("./.firebase/.output/bundle.json", "utf8"));
     }
     install() {
-        this.dockerfileBuilder
-            .fromLastStage(DOCKER_STAGE_INSTALL)
-            .workdir("/home/firebase/app")
-            .envs(this.spec.environmentVariables || {})
-            .copyForFirebase("package.json", ".")
-            .run(this.spec.installCommand);
-        this.buildStage(DOCKER_STAGE_INSTALL, ".");
+        if (this.spec.installCommand) {
+            this.dockerfileBuilder
+                .fromLastStage(DOCKER_STAGE_INSTALL)
+                .workdir("/home/firebase/app")
+                .envs(this.spec.environmentVariables || {})
+                .copyForFirebase("package.json", ".");
+            if (this.spec.packageManagerInstallCommand) {
+                this.dockerfileBuilder.run(this.spec.packageManagerInstallCommand);
+            }
+            this.dockerfileBuilder.run(this.spec.installCommand);
+            this.buildStage(DOCKER_STAGE_INSTALL, ".");
+        }
     }
     build() {
-        this.dockerfileBuilder
-            .fromLastStage(DOCKER_STAGE_BUILD)
-            .copyForFirebase(".", ".")
-            .run(this.spec.buildCommand);
-        this.buildStage(DOCKER_STAGE_BUILD, ".");
+        var _a;
+        if ((_a = this.spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.build) {
+            this.dockerfileBuilder
+                .fromLastStage(DOCKER_STAGE_BUILD)
+                .copyForFirebase(".", ".")
+                .run(this.spec.detectedCommands.build.cmd);
+            this.buildStage(DOCKER_STAGE_BUILD, ".");
+        }
     }
     export(bundle) {
         var _a;

package/lib/frameworks/compose/driver/local.js

@@ -18,12 +18,21 @@ class LocalDriver {
         }
     }
     install() {
-        const [cmd, ...args] = this.spec.installCommand.split(" ");
-        this.execCmd(cmd, args);
+        if (this.spec.installCommand) {
+            if (this.spec.packageManagerInstallCommand) {
+                const [cmd, ...args] = this.spec.packageManagerInstallCommand.split(" ");
+                this.execCmd(cmd, args);
+            }
+            const [cmd, ...args] = this.spec.installCommand.split(" ");
+            this.execCmd(cmd, args);
+        }
     }
     build() {
-        const [cmd, ...args] = this.spec.buildCommand.split(" ");
-        this.execCmd(cmd, args);
+        var _a;
+        if ((_a = this.spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.build) {
+            const [cmd, ...args] = this.spec.detectedCommands.build.cmd.split(" ");
+            this.execCmd(cmd, args);
+        }
     }
     export(bundle) {
     }

package/lib/frameworks/compose/index.js

@@ -3,24 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compose = void 0;
 const driver_1 = require("./driver");
 const discover_1 = require("./discover");
-function compose(mode) {
+async function compose(mode, fs, allFrameworkSpecs) {
+    var _a, _b, _c, _d;
     let bundle = { version: "v1alpha" };
-    const spec = (0, discover_1.discover)();
+    const spec = await (0, discover_1.discover)(fs, allFrameworkSpecs);
     const driver = (0, driver_1.getDriver)(mode, spec);
-    if (spec.startCommand) {
+    if ((_a = spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.run) {
         bundle.server = {
             start: {
-                cmd: spec.startCommand.split(" "),
+                cmd: spec.detectedCommands.run.cmd.split(" "),
             },
         };
     }
     driver.install();
-    if (spec.afterInstall) {
-        bundle = driver.execHook(bundle, spec.afterInstall);
+    if ((_b = spec.frameworkHooks) === null || _b === void 0 ? void 0 : _b.afterInstall) {
+        bundle = driver.execHook(bundle, spec.frameworkHooks.afterInstall);
     }
     driver.build();
-    if (spec.afterBuild) {
-        bundle = driver.execHook(bundle, spec.afterBuild);
+    if ((_c = spec.frameworkHooks) === null || _c === void 0 ? void 0 : _c.afterBuild) {
+        bundle = driver.execHook(bundle, (_d = spec.frameworkHooks) === null || _d === void 0 ? void 0 : _d.afterBuild);
     }
     if (bundle.server) {
         driver.export(bundle);

package/lib/frameworks/next/index.js

@@ -48,16 +48,25 @@ async function discover(dir) {
 exports.discover = discover;
 async function build(dir) {
     var _a, _b;
-    const { default: nextBuild } = (0, utils_1.relativeRequire)(dir, "next/dist/build");
     await (0, utils_1.warnIfCustomBuildScript)(dir, exports.name, DEFAULT_BUILD_SCRIPT);
     const reactVersion = getReactVersion(dir);
     if (reactVersion && (0, semver_1.gte)(reactVersion, "18.0.0")) {
         process.env.__NEXT_REACT_ROOT = "true";
     }
-    await nextBuild(dir, null, false, false, true).catch((e) => {
-        console.error(e.message);
-        throw e;
+    const cli = (0, utils_1.getNodeModuleBin)("next", dir);
+    const nextBuild = new Promise((resolve, reject) => {
+        var _a, _b;
+        const buildProcess = (0, cross_spawn_1.spawn)(cli, ["build"], { cwd: dir });
+        (_a = buildProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => logger_1.logger.info(data.toString()));
+        (_b = buildProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => logger_1.logger.info(data.toString()));
+        buildProcess.on("error", (err) => {
+            reject(new error_1.FirebaseError(`Unable to build your Next.js app: ${err}`));
+        });
+        buildProcess.on("exit", (code) => {
+            resolve(code);
+        });
     });
+    await nextBuild;
     const reasonsForBackend = new Set();
     const { distDir, trailingSlash, basePath: baseUrl } = await getConfig(dir);
     if (await (0, utils_2.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {

package/lib/functionsShellCommandAction.js

@@ -7,7 +7,7 @@ const _ = require("lodash");
 const request = require("request");
 const util = require("util");
 const functions_1 = require("./serve/functions");
-const LocalFunction = require("./localFunction");
+const localFunction_1 = require("./localFunction");
 const utils = require("./utils");
 const logger_1 = require("./logger");
 const shell = require("./emulator/functionsEmulatorShell");
@@ -73,9 +73,9 @@ const actionFunction = async (options) => {
         const initializeContext = (context) => {
             for (const trigger of emulator.triggers) {
                 if (emulator.emulatedFunctions.includes(trigger.id)) {
-                    const localFunction = new LocalFunction(trigger, emulator.urls, emulator);
+                    const localFunction = new localFunction_1.default(trigger, emulator.urls, emulator);
                     const triggerNameDotNotation = trigger.name.replace(/-/g, ".");
-                    _.set(context, triggerNameDotNotation, localFunction.call);
+                    _.set(context, triggerNameDotNotation, localFunction.makeFn());
                 }
             }
             context.help =

package/lib/{api → gcp}/frameworks.js

@@ -3,19 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuild = exports.createStack = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
-exports.API_VERSION = "v1";
+exports.API_VERSION = "v2";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.frameworksOrigin,
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-async function createStack(projectId, location, stackId, stack) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks`, stack, { queryParams: { stackId } });
+async function createStack(projectId, location, stackInput) {
+    const stackId = stackInput.name;
+    const res = await client.post(`projects/${projectId}/locations/${location}/stacks`, stackInput, { queryParams: { stackId } });
     return res.body;
 }
 exports.createStack = createStack;
-async function createBuild(projectId, location, stackId, buildId, build) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, build, { queryParams: { buildId } });
+async function createBuild(projectId, location, stackId, buildInput) {
+    const buildId = buildInput.name;
+    const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, buildInput, { queryParams: { buildId } });
     return res.body;
 }
 exports.createBuild = createBuild;

package/lib/init/features/frameworks/index.js

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.createStack = exports.doSetup = void 0;
 const clc = require("colorette");
 const utils = require("../../../utils");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const constants_1 = require("./constants");
+const repo_1 = require("./repo");
+const poller = require("../../../operation-poller");
+const api_1 = require("../../../api");
+const gcp = require("../../../gcp/frameworks");
+const frameworks_1 = require("../../../gcp/frameworks");
+const frameworksPollerOptions = {
+    apiOrigin: api_1.frameworksOrigin,
+    apiVersion: frameworks_1.API_VERSION,
+    masterTimeout: 25 * 60 * 1000,
+    maxBackoff: 10000,
+};
 async function doSetup(setup) {
+    var _a, _b;
+    const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
     setup.frameworks = {};
     utils.logBullet("First we need a few details to create your service.");
     await (0, prompt_1.promptOnce)({
@@ -32,5 +45,22 @@ async function doSetup(setup) {
         message: "How do you want to deploy",
         choices: constants_1.ALLOWED_DEPLOY_METHODS,
     }, setup.frameworks);
+    if (setup.frameworks.deployMethod === "github") {
+        const cloudBuildConnRepo = await (0, repo_1.linkGitHubRepository)(projectId, setup.frameworks.region, setup.frameworks.serviceName);
+        toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
+    }
 }
 exports.doSetup = doSetup;
+function toStack(cloudBuildConnRepo, stackId) {
+    return {
+        name: stackId,
+        codebase: { repository: cloudBuildConnRepo.name, rootDirectory: "/" },
+        labels: {},
+    };
+}
+async function createStack(projectId, location, stackInput) {
+    const op = await gcp.createStack(projectId, location, stackInput);
+    const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackInput.name}`, operationResourceName: op.name }));
+    return stack;
+}
+exports.createStack = createStack;

package/lib/init/features/{composer → frameworks}/repo.js

@@ -21,14 +21,11 @@ function extractRepoSlugFromURI(remoteUri) {
     }
     return match[1];
 }
-function generateConnectionId(stackId) {
-    return `composer-${stackId}-conn`;
-}
 function generateRepositoryId() {
     return `composer-repo`;
 }
 async function linkGitHubRepository(projectId, location, stackId) {
-    const connectionId = generateConnectionId(stackId);
+    const connectionId = stackId;
     await getOrCreateConnection(projectId, location, connectionId);
     let remoteUri = await promptRepositoryURI(projectId, location, connectionId);
     while (remoteUri === "") {

package/lib/localFunction.js

@@ -1,191 +1,204 @@
 "use strict";
-var _ = require("lodash");
-var request = require("request");
-var { encodeFirestoreValue } = require("./firestore/encodeFirestoreValue");
-var utils = require("./utils");
-var LocalFunction = function (trigger, urls, controller) {
-    const isCallable = _.get(trigger, ["labels", "deployment-callable"], "false");
-    this.id = trigger.id;
-    this.name = trigger.name;
-    this.eventTrigger = trigger.eventTrigger;
-    this.httpsTrigger = trigger.httpsTrigger;
-    this.controller = controller;
-    this.url = _.get(urls, this.id);
-    if (this.httpsTrigger) {
-        if (isCallable == "true") {
-            this.call = this._constructCallableFunc.bind(this);
-        }
-        else {
-            this.call = request.defaults({
-                callback: this._requestCallBack,
-                baseUrl: this.url,
-                uri: "",
-            });
-        }
+Object.defineProperty(exports, "__esModule", { value: true });
+const request = require("request");
+const utils = require("./utils");
+const encodeFirestoreValue_1 = require("./firestore/encodeFirestoreValue");
+class LocalFunction {
+    constructor(trigger, urls, controller) {
+        this.trigger = trigger;
+        this.controller = controller;
+        this.paramWildcardRegex = new RegExp("{[^/{}]*}", "g");
+        this.url = urls[trigger.id];
     }
-    else {
-        this.call = this._call.bind(this);
-    }
-};
-LocalFunction.prototype._isDatabaseFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
-};
-LocalFunction.prototype._isFirestoreFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
-};
-LocalFunction.prototype._substituteParams = function (resource, params) {
-    var wildcardRegex = new RegExp("{[^/{}]*}", "g");
-    return resource.replace(wildcardRegex, function (wildcard) {
-        var wildcardNoBraces = wildcard.slice(1, -1);
-        var sub = _.get(params, wildcardNoBraces);
-        return sub || wildcardNoBraces + utils.randomInt(1, 9);
-    });
-};
-LocalFunction.prototype._constructCallableFunc = function (data, opts) {
-    opts = opts || {};
-    var headers = {};
-    if (opts.instanceIdToken) {
-        headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+    substituteParams(resource, params) {
+        if (!params) {
+            return resource;
+        }
+        return resource.replace(this.paramWildcardRegex, (wildcard) => {
+            const wildcardNoBraces = wildcard.slice(1, -1);
+            const sub = params === null || params === void 0 ? void 0 : params[wildcardNoBraces];
+            return sub || `${wildcardNoBraces}${utils.randomInt(1, 9)}`;
+        });
     }
-    return request.post({
-        callback: this._requestCallBack,
-        baseUrl: this.url,
-        uri: "",
-        body: { data: data },
-        json: true,
-        headers: headers,
-    });
-};
-LocalFunction.prototype._constructAuth = function (auth, authType) {
-    if (_.get(auth, "admin") || _.get(auth, "variable")) {
-        return auth;
+    constructCallableFunc(data, opts) {
+        opts = opts || {};
+        const headers = {};
+        if (opts.instanceIdToken) {
+            headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+        }
+        return request.post({
+            callback: (...args) => this.requestCallBack(...args),
+            baseUrl: this.url,
+            uri: "",
+            body: { data },
+            json: true,
+            headers: headers,
+        });
     }
-    if (typeof authType !== "undefined") {
-        switch (authType) {
-            case "USER":
-                return {
-                    variable: {
-                        uid: _.get(auth, "uid", ""),
-                        token: _.get(auth, "token", {}),
-                    },
-                };
-            case "ADMIN":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: true };
-            case "UNAUTHENTICATED":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: false };
-            default:
-                throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+    constructAuth(auth, authType) {
+        var _a, _b, _c;
+        if ((auth === null || auth === void 0 ? void 0 : auth.admin) || (auth === null || auth === void 0 ? void 0 : auth.variable)) {
+            return {
+                admin: auth.admin || false,
+                variable: auth.variable,
+            };
         }
+        if (authType) {
+            switch (authType) {
+                case "USER":
+                    return {
+                        admin: false,
+                        variable: {
+                            uid: (_a = auth === null || auth === void 0 ? void 0 : auth.uid) !== null && _a !== void 0 ? _a : "",
+                            token: (_b = auth === null || auth === void 0 ? void 0 : auth.token) !== null && _b !== void 0 ? _b : {},
+                        },
+                    };
+                case "ADMIN":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: true };
+                case "UNAUTHENTICATED":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: false };
+                default:
+                    throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+            }
+        }
+        if (auth) {
+            return {
+                admin: false,
+                variable: {
+                    uid: (_c = auth.uid) !== null && _c !== void 0 ? _c : "",
+                    token: auth.token || {},
+                },
+            };
+        }
+        return { admin: true };
     }
-    if (auth) {
+    makeFirestoreValue(input) {
+        if (typeof input === "undefined" ||
+            input === null ||
+            (typeof input === "object" && Object.keys(input).length === 0)) {
+            return {};
+        }
+        if (typeof input !== "object") {
+            throw new Error("Firestore data must be key-value pairs.");
+        }
+        const currentTime = new Date().toISOString();
         return {
-            variable: {
-                uid: auth.uid,
-                token: auth.token || {},
-            },
+            fields: (0, encodeFirestoreValue_1.encodeFirestoreValue)(input),
+            createTime: currentTime,
+            updateTime: currentTime,
         };
     }
-    return { admin: true };
-};
-LocalFunction.prototype._makeFirestoreValue = function (input) {
-    if (typeof input === "undefined" || _.isEmpty(input)) {
-        return {};
-    }
-    if (typeof input !== "object") {
-        throw new Error("Firestore data must be key-value pairs.");
-    }
-    var currentTime = new Date().toISOString();
-    return {
-        fields: encodeFirestoreValue(input),
-        createTime: currentTime,
-        updateTime: currentTime,
-    };
-};
-LocalFunction.prototype._requestCallBack = function (err, response, body) {
-    if (err) {
-        return console.warn("\nERROR SENDING REQUEST: " + err);
-    }
-    var status = response ? response.statusCode + ", " : "";
-    var bodyString = body;
-    if (typeof body === "string") {
-        try {
-            bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+    requestCallBack(err, response, body) {
+        if (err) {
+            return console.warn("\nERROR SENDING REQUEST: " + err);
         }
-        catch (e) {
+        const status = response ? response.statusCode + ", " : "";
+        let bodyString = body;
+        if (typeof bodyString === "string") {
+            try {
+                bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+            }
+            catch (e) {
+            }
+        }
+        else {
+            bodyString = JSON.stringify(body, null, 2);
         }
+        return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
     }
-    else {
-        bodyString = JSON.stringify(body, null, 2);
+    isDatabaseFn(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
     }
-    return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
-};
-LocalFunction.prototype._call = function (data, opts) {
-    opts = opts || {};
-    var operationType;
-    var dataPayload;
-    if (this.httpsTrigger) {
-        this.controller.call(this.name, data || {});
+    isFirestoreFunc(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
     }
-    else if (this.eventTrigger) {
-        if (this._isDatabaseFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        data: null,
-                        delta: data,
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        data: data,
-                        delta: null,
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        data: data.before,
-                        delta: data.after,
-                    };
+    triggerEvent(data, opts) {
+        opts = opts || {};
+        let operationType;
+        let dataPayload;
+        if (this.trigger.httpsTrigger) {
+            this.controller.call(this.trigger.name, data || {}, opts);
+        }
+        else if (this.trigger.eventTrigger) {
+            if (this.isDatabaseFn(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            data: null,
+                            delta: data,
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            data: data,
+                            delta: null,
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            data: data.before,
+                            delta: data.after,
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                opts.auth = this.constructAuth(opts.auth, opts.authType);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else if (this.isFirestoreFunc(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data),
+                            oldValue: {},
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            value: {},
+                            oldValue: this.makeFirestoreValue(data),
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data.after),
+                            oldValue: this.makeFirestoreValue(data.before),
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else {
+                this.controller.call(this.trigger.name, data || {}, opts);
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            opts.auth = this._constructAuth(opts.auth, opts.authType);
-            this.controller.call(this.name, dataPayload, opts);
         }
-        else if (this._isFirestoreFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data),
-                        oldValue: {},
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        value: {},
-                        oldValue: this._makeFirestoreValue(data),
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data.after),
-                        oldValue: this._makeFirestoreValue(data.before),
-                    };
+        return console.log("Successfully invoked function.");
+    }
+    makeFn() {
+        var _a;
+        if (this.trigger.httpsTrigger) {
+            const isCallable = !!((_a = this.trigger.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]);
+            if (isCallable) {
+                return (data, opt) => this.constructCallableFunc(data, opt);
+            }
+            else {
+                return request.defaults({
+                    callback: (...args) => this.requestCallBack(...args),
+                    baseUrl: this.url,
+                    uri: "",
+                });
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            this.controller.call(this.name, dataPayload, opts);
         }
         else {
-            this.controller.call(this.name, data || {}, opts);
+            return (data, opt) => this.triggerEvent(data, opt);
         }
     }
-    return "Successfully invoked function.";
-};
-module.exports = LocalFunction;
+}
+exports.default = LocalFunction;

package/lib/requireAuth.js

@@ -24,6 +24,14 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
+    let clientEmail;
+    try {
+        const credentials = await client.getCredentials();
+        clientEmail = credentials.client_email;
+    }
+    catch (e) {
+        logger_1.logger.debug(`Error getting account credentials.`);
+    }
     if (!options.isVSCE && (0, monospace_1.isMonospaceEnv)()) {
         await (0, monospace_1.selectProjectInMonospace)({
             projectRoot: options.config.projectDir,
@@ -31,6 +39,7 @@ async function autoAuth(options, authScopes) {
             isVSCE: options.isVSCE,
         });
     }
+    return clientEmail;
 }
 async function requireAuth(options) {
     api.setScopes([scopes.CLOUD_PLATFORM, scopes.FIREBASE_PLATFORM]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.4.2",
+  "version": "12.4.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -103,7 +103,7 @@
     "request": "^2.87.0",
     "retry": "^0.13.1",
     "rimraf": "^3.0.0",
-    "semver": "^5.7.1",
+    "semver": "^7.5.2",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
     "strip-ansi": "^6.0.1",

package/standalone/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^2.4.2",
-    "npm": "^6.10.2",
+    "npm": "^9.8.0",
     "shelljs": "^0.8.3",
     "shx": "^0.3.2",
     "user-home": "^2.0.0"

package/lib/commands/internaltesting-frameworks-init.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const command_1 = require("../command");
-const repo_1 = require("../init/features/composer/repo");
-const projectUtils_1 = require("../projectUtils");
-const requireInteractive_1 = require("../requireInteractive");
-exports.command = new command_1.Command("internaltesting:frameworks:init")
-    .description("connect github repo to cloud build")
-    .before(requireInteractive_1.default)
-    .action(async (options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    await (0, repo_1.linkGitHubRepository)(projectId, "us-central2", "stack0");
-});

package/lib/gcp/firedata.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listDatabaseInstances = void 0;
-const api_1 = require("../api");
-const apiv2_1 = require("../apiv2");
-const logger_1 = require("../logger");
-const utils = require("../utils");
-function _handleErrorResponse(response) {
-    if (response.body && response.body.error) {
-        return utils.reject(response.body.error, { code: 2 });
-    }
-    logger_1.logger.debug("[firedata] error:", response.status, response.body);
-    return utils.reject("Unexpected error encountered with FireData.", {
-        code: 2,
-    });
-}
-async function listDatabaseInstances(projectNumber) {
-    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
-    const response = await client.get(`/projects/${projectNumber}/databases`, {
-        resolveOnHTTPError: true,
-    });
-    if (response.status === 200) {
-        return response.body.instance;
-    }
-    return _handleErrorResponse(response);
-}
-exports.listDatabaseInstances = listDatabaseInstances;