firebase-tools 10.6.0 → 10.7.2

package/lib/gcp/identityPlatform.js

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

package/lib/gcp/secretManager.js

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

package/lib/metaprogramming.js

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

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/serve/functions.js

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

package/lib/serve/hosting.js

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

package/lib/serve/index.js

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

package/lib/track.js

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