firebase-tools 12.4.0 → 12.4.1

package/lib/init/index.js

@@ -6,6 +6,7 @@ const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const features = require("./features");
+const experiments_1 = require("../experiments");
 const featureFns = new Map([
     ["account", features.account],
     ["database", features.database],
@@ -19,6 +20,9 @@ const featureFns = new Map([
     ["remoteconfig", features.remoteconfig],
     ["hosting:github", features.hostingGithub],
 ]);
+if ((0, experiments_1.isEnabled)("frameworks")) {
+    featureFns.set("frameworks", features.frameworks);
+}
 async function init(setup, config, options) {
     var _a;
     const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();

package/lib/management/projects.js

@@ -300,7 +300,11 @@ async function getFirebaseProject(projectId) {
         return res.body;
     }
     catch (err) {
-        logger_1.logger.debug(err.message);
+        let message = err.message;
+        if (err.original) {
+            message += ` (original: ${err.original.message})`;
+        }
+        logger_1.logger.debug(message);
         throw new error_1.FirebaseError(`Failed to get Firebase project ${projectId}. ` +
             "Please make sure the project exists and your account has permission to access it.", { exit: 2, original: err });
     }

package/lib/monospace/index.js

@@ -5,7 +5,7 @@ const node_fetch_1 = require("node-fetch");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const rc_1 = require("../rc");
-const POLL_USER_RESPONSE_MILLIS = 5000;
+const POLL_USER_RESPONSE_MILLIS = 2000;
 async function selectProjectInMonospace({ projectRoot, project, isVSCE, }) {
     const initFirebaseResponse = await initFirebase(project);
     if (initFirebaseResponse.success === false) {
@@ -27,9 +27,7 @@ async function pollAuthorizedProject(rid) {
         if (getInitFirebaseRes.userResponse.success) {
             return getInitFirebaseRes.userResponse.projectId;
         }
-        else {
-            return null;
-        }
+        return null;
     }
     const { error } = getInitFirebaseRes;
     if (error === "WAITING_FOR_RESPONSE") {
@@ -39,7 +37,9 @@ async function pollAuthorizedProject(rid) {
     if (error === "USER_CANCELED") {
         throw new error_1.FirebaseError("User canceled without authorizing any project");
     }
-    throw new error_1.FirebaseError(`Unhandled /get-init-firebase-response error: ${error}`);
+    throw new error_1.FirebaseError(`Unhandled /get-init-firebase-response error`, {
+        original: new Error(error),
+    });
 }
 async function initFirebase(project) {
     const port = getMonospaceDaemonPort();
@@ -73,8 +73,8 @@ function createFirebaseRc(projectDir, authorizedProject) {
     firebaseRc.addProjectAlias("default", authorizedProject);
     return firebaseRc.save();
 }
-async function isMonospaceEnv() {
-    return Promise.resolve(Boolean(getMonospaceDaemonPort()));
+function isMonospaceEnv() {
+    return getMonospaceDaemonPort() !== undefined;
 }
 exports.isMonospaceEnv = isMonospaceEnv;
 function getMonospaceDaemonPort() {

package/lib/requireAuth.js

@@ -24,7 +24,7 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
-    if (!options.isVSCE && (await (0, monospace_1.isMonospaceEnv)())) {
+    if (!options.isVSCE && (0, monospace_1.isMonospaceEnv)()) {
         await (0, monospace_1.selectProjectInMonospace)({
             projectRoot: options.config.projectDir,
             project: options.project,

package/lib/track.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emulatorSession = exports.trackEmulator = exports.track = exports.usageEnabled = exports.EMULATOR_GA4_MEASUREMENT_ID = void 0;
+exports.track = exports.cliSession = exports.emulatorSession = exports.trackEmulator = exports.trackGA4 = exports.usageEnabled = exports.GA4_PROPERTIES = void 0;
 const node_fetch_1 = require("node-fetch");
 const ua = require("universal-analytics");
 const uuid_1 = require("uuid");
@@ -8,45 +8,23 @@ const auth_1 = require("./auth");
 const configstore_1 = require("./configstore");
 const logger_1 = require("./logger");
 const pkg = require("../package.json");
-exports.EMULATOR_GA4_MEASUREMENT_ID = process.env.FIREBASE_EMULATOR_GA4_MEASUREMENT_ID || "G-KYP2JMPFC0";
+exports.GA4_PROPERTIES = {
+    cli: {
+        measurementId: process.env.FIREBASE_CLI_GA4_MEASUREMENT_ID || "G-PDN0QWHQJR",
+        apiSecret: process.env.FIREBASE_CLI_GA4_API_SECRET || "LSw5lNxhSFSWeB6aIzJS2w",
+        clientIdKey: "analytics-uuid",
+    },
+    emulator: {
+        measurementId: process.env.FIREBASE_EMULATOR_GA4_MEASUREMENT_ID || "G-KYP2JMPFC0",
+        apiSecret: process.env.FIREBASE_EMULATOR_GA4_API_SECRET || "2V_zBYc4TdeoppzDaIu0zw",
+        clientIdKey: "emulator-analytics-clientId",
+    },
+};
 function usageEnabled() {
     return !!process.env.IS_FIREBASE_CLI && !!configstore_1.configstore.get("usage");
 }
 exports.usageEnabled = usageEnabled;
-const FIREBASE_ANALYTICS_UA = process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3";
-let visitor;
-function ensureUAVisitor() {
-    if (!visitor) {
-        let anonId = configstore_1.configstore.get("analytics-uuid");
-        if (!anonId) {
-            anonId = (0, uuid_1.v4)();
-            configstore_1.configstore.set("analytics-uuid", anonId);
-        }
-        visitor = ua(FIREBASE_ANALYTICS_UA, 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 = 0) {
-    ensureUAVisitor();
-    return new Promise((resolve) => {
-        if (usageEnabled() && configstore_1.configstore.get("tokens")) {
-            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
-                resolve();
-            });
-        }
-        else {
-            resolve();
-        }
-    });
-}
-exports.track = track;
-const EMULATOR_GA4_API_SECRET = process.env.FIREBASE_EMULATOR_GA4_API_SECRET || "2V_zBYc4TdeoppzDaIu0zw";
-const EMULATOR_GA4_USER_PROPS = {
+const GA4_USER_PROPS = {
     node_platform: {
         value: process.platform,
     },
@@ -60,6 +38,20 @@ const EMULATOR_GA4_USER_PROPS = {
         value: process.env.FIREPIT_VERSION || "none",
     },
 };
+async function trackGA4(eventName, params, duration = 1) {
+    const session = cliSession();
+    if (!session) {
+        return;
+    }
+    return _ga4Track({
+        session,
+        apiSecret: exports.GA4_PROPERTIES.cli.apiSecret,
+        eventName,
+        params,
+        duration,
+    });
+}
+exports.trackGA4 = trackGA4;
 async function trackEmulator(eventName, params) {
     const session = emulatorSession();
     if (!session) {
@@ -67,29 +59,38 @@ async function trackEmulator(eventName, params) {
     }
     const oldTotalEngagementSeconds = session.totalEngagementSeconds;
     session.totalEngagementSeconds = process.uptime();
+    const duration = session.totalEngagementSeconds - oldTotalEngagementSeconds;
+    return _ga4Track({
+        session,
+        apiSecret: exports.GA4_PROPERTIES.emulator.apiSecret,
+        eventName,
+        params,
+        duration,
+    });
+}
+exports.trackEmulator = trackEmulator;
+async function _ga4Track(args) {
+    const { session, apiSecret, eventName, params, duration } = args;
     session.commandName = (params === null || params === void 0 ? void 0 : params.command_name) || session.commandName;
-    const search = `?api_secret=${EMULATOR_GA4_API_SECRET}&measurement_id=${session.measurementId}`;
+    const search = `?api_secret=${apiSecret}&measurement_id=${session.measurementId}`;
     const validate = session.validateOnly ? "debug/" : "";
     const url = `https://www.google-analytics.com/${validate}mp/collect${search}`;
     const body = {
         timestamp_micros: `${Date.now()}000`,
         client_id: session.clientId,
-        user_properties: Object.assign(Object.assign({}, EMULATOR_GA4_USER_PROPS), { java_major_version: session.javaMajorVersion
+        user_properties: Object.assign(Object.assign({}, GA4_USER_PROPS), { java_major_version: session.javaMajorVersion
                 ? { value: session.javaMajorVersion }
                 : undefined }),
         validationBehavior: session.validateOnly ? "ENFORCE_RECOMMENDATIONS" : undefined,
         events: [
             {
                 name: eventName,
-                params: Object.assign({ session_id: session.sessionId, engagement_time_msec: (session.totalEngagementSeconds - oldTotalEngagementSeconds)
-                        .toFixed(3)
-                        .replace(".", "")
-                        .replace(/^0+/, ""), debug_mode: session.debugMode ? true : undefined, command_name: session.commandName }, params),
+                params: Object.assign({ session_id: session.sessionId, engagement_time_msec: (duration !== null && duration !== void 0 ? duration : 0).toFixed(3).replace(".", "").replace(/^0+/, ""), debug_mode: session.debugMode ? true : undefined, command_name: session.commandName }, params),
             },
         ],
     };
     if (session.validateOnly) {
-        logger_1.logger.info(`Sending Analytics for event ${eventName}`, params, body);
+        logger_1.logger.info(`Sending Analytics for event ${eventName} to property ${session.measurementId}`, params, body);
     }
     try {
         const response = await (0, node_fetch_1.default)(url, {
@@ -114,8 +115,15 @@ async function trackEmulator(eventName, params) {
         return;
     }
 }
-exports.trackEmulator = trackEmulator;
 function emulatorSession() {
+    return session("emulator");
+}
+exports.emulatorSession = emulatorSession;
+function cliSession() {
+    return session("cli");
+}
+exports.cliSession = cliSession;
+function session(propertyName) {
     const validateOnly = !!process.env.FIREBASE_CLI_MP_VALIDATE;
     if (!usageEnabled()) {
         if (validateOnly) {
@@ -123,14 +131,15 @@ function emulatorSession() {
         }
         return;
     }
-    if (!currentEmulatorSession) {
-        let clientId = configstore_1.configstore.get("emulator-analytics-clientId");
+    const property = exports.GA4_PROPERTIES[propertyName];
+    if (!property.currentSession) {
+        let clientId = configstore_1.configstore.get(property.clientIdKey);
         if (!clientId) {
             clientId = (0, uuid_1.v4)();
-            configstore_1.configstore.set("emulator-analytics-clientId", clientId);
+            configstore_1.configstore.set(property.clientIdKey, clientId);
         }
-        currentEmulatorSession = {
-            measurementId: exports.EMULATOR_GA4_MEASUREMENT_ID,
+        property.currentSession = {
+            measurementId: property.measurementId,
             clientId,
             sessionId: (Math.random() * Number.MAX_SAFE_INTEGER).toFixed(0),
             totalEngagementSeconds: 0,
@@ -138,10 +147,8 @@ function emulatorSession() {
             validateOnly,
         };
     }
-    return currentEmulatorSession;
+    return property.currentSession;
 }
-exports.emulatorSession = emulatorSession;
-let currentEmulatorSession = undefined;
 function isDebugMode() {
     const account = (0, auth_1.getGlobalDefaultAccount)();
     if (account === null || account === void 0 ? void 0 : account.user.email.endsWith("@google.com")) {
@@ -155,3 +162,35 @@ function isDebugMode() {
     }
     return false;
 }
+const FIREBASE_ANALYTICS_UA = process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3";
+let visitor;
+function ensureUAVisitor() {
+    if (!visitor) {
+        let anonId = configstore_1.configstore.get("analytics-uuid");
+        if (!anonId) {
+            anonId = (0, uuid_1.v4)();
+            configstore_1.configstore.set("analytics-uuid", anonId);
+        }
+        visitor = ua(FIREBASE_ANALYTICS_UA, 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 = 0) {
+    ensureUAVisitor();
+    return new Promise((resolve) => {
+        if (usageEnabled() && configstore_1.configstore.get("tokens")) {
+            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
+                resolve();
+            });
+        }
+        else {
+            resolve();
+        }
+    });
+}
+exports.track = track;

package/lib/utils.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
+exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.assertDefined = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.getInheritedOption = exports.consoleUrl = exports.envOverrides = void 0;
 const _ = require("lodash");
 const url = require("url");
 const clc = require("colorette");
+const open = require("open");
 const ora = require("ora");
 const process = require("process");
 const stream_1 = require("stream");
@@ -485,3 +486,7 @@ function connectableHostname(hostname) {
     return hostname;
 }
 exports.connectableHostname = connectableHostname;
+async function openInBrowser(url) {
+    await open(url);
+}
+exports.openInBrowser = openInBrowser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.4.0",
+  "version": "12.4.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {