firebase-tools 11.4.2 → 11.7.0

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const apiv2_1 = require("../../../apiv2");
 const github_1 = require("./github");

package/lib/init/features/project.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const _ = require("lodash");
 const error_1 = require("../../error");
 const projects_1 = require("../../management/projects");

package/lib/init/features/remoteconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const prompt_1 = require("../../prompt");
 const fsutils = require("../../fsutils");
-const clc = require("cli-color");
+const clc = require("colorette");
 async function doSetup(setup, config) {
     setup.config.remoteconfig = {};
     const jsonFilePath = await (0, prompt_1.promptOnce)({

package/lib/init/features/storage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");

package/lib/init/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const lodash_1 = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const features = require("./features");

package/lib/logError.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logError = void 0;
 const logger_1 = require("./logger");
-const clc = require("cli-color");
+const clc = require("colorette");
 function logError(error) {
     if (error.children && error.children.length) {
-        logger_1.logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
+        logger_1.logger.error(clc.bold(clc.red("Error:")), clc.underline(error.message) + ":");
         error.children.forEach((child) => {
             let out = "- ";
             if (child.name) {
@@ -20,7 +20,7 @@ function logError(error) {
             logger_1.logger.debug(error.original.stack);
         }
         logger_1.logger.error();
-        logger_1.logger.error(clc.bold.red("Error:"), error.message);
+        logger_1.logger.error(clc.bold(clc.red("Error:")), error.message);
     }
     if (error.context) {
         logger_1.logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));

package/lib/management/projects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseProject = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.PROJECTS_CREATE_QUESTIONS = exports.ProjectParentResourceType = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");

package/lib/parseBoltRules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBoltRules = void 0;
 const fs = require("fs");
 const spawn = require("cross-spawn");
-const clc = require("cli-color");
+const clc = require("colorette");
 const _ = require("lodash");
 const error_1 = require("./error");
 function parseBoltRules(filename) {

package/lib/profileReport.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProfileReport = exports.extractReadableIndex = exports.formatBytes = exports.formatNumber = exports.pathString = exports.extractJSON = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const Table = require("cli-table");
 const fs = require("fs");
 const _ = require("lodash");
@@ -515,7 +515,7 @@ class ProfileReport {
                 write(title + "\n");
             }
             else {
-                write(clc.bold.yellow(title) + "\n");
+                write(clc.bold(clc.yellow(title)) + "\n");
             }
         };
         const writeTable = (title, table) => {

package/lib/projectUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliases = exports.needProjectNumber = exports.needProjectId = exports.getProjectId = void 0;
 const projects_1 = require("./management/projects");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const { FirebaseError } = require("./error");
 function getProjectId({ projectId, project, }) {

package/lib/rc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RC = exports.loadRC = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const cjson = require("cjson");
 const fs = require("fs");
 const path = require("path");

package/lib/requireAuth.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireAuth = void 0;
 const google_auth_library_1 = require("google-auth-library");
-const clc = require("cli-color");
+const clc = require("colorette");
 const api = require("./api");
 const apiv2 = require("./apiv2");
 const error_1 = require("./error");

package/lib/requireDatabaseInstance.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireDatabaseInstance = exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("./error");
 const getDefaultDatabaseInstance_1 = require("./getDefaultDatabaseInstance");
-exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = `It looks like you haven't created a Realtime Database instance in this project before. Please run ${clc.bold.underline("firebase init database")} to create your default Realtime Database instance.`;
+exports.MISSING_DEFAULT_INSTANCE_ERROR_MESSAGE = `It looks like you haven't created a Realtime Database instance in this project before. Please run ${clc.bold(clc.underline("firebase init database"))} to create your default Realtime Database instance.`;
 async function requireDatabaseInstance(options) {
     if (options.instance) {
         return;

package/lib/requirePermissions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requirePermissions = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const projectUtils_1 = require("./projectUtils");
 const requireAuth_1 = require("./requireAuth");
 const logger_1 = require("./logger");
@@ -19,7 +19,7 @@ async function requirePermissions(options, permissions = []) {
     try {
         const iamResult = await (0, iam_1.testIamPermissions)(projectId, requiredPermissions);
         if (!iamResult.passed) {
-            throw new error_1.FirebaseError(`Authorization failed. This account is missing the following required permissions on project ${(0, cli_color_1.bold)(projectId)}:\n\n  ${iamResult.missing.join("\n  ")}`);
+            throw new error_1.FirebaseError(`Authorization failed. This account is missing the following required permissions on project ${(0, colorette_1.bold)(projectId)}:\n\n  ${iamResult.missing.join("\n  ")}`);
         }
     }
     catch (err) {

package/lib/rulesDeploy.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RulesDeploy = exports.RulesetServiceType = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const colorette_1 = require("colorette");
 const fs = require("fs-extra");
 const gcp = require("./gcp");
 const logger_1 = require("./logger");
@@ -42,7 +42,7 @@ class RulesDeploy {
         }
         catch (e) {
             logger_1.logger.debug("[rules read error]", e.stack);
-            throw new error_1.FirebaseError("Error reading rules file " + clc.bold(path));
+            throw new error_1.FirebaseError(`Error reading rules file ${(0, colorette_1.bold)(path)}`);
         }
         this.rulesFiles[path] = [{ name: path, content: src }];
     }
@@ -80,7 +80,7 @@ class RulesDeploy {
             }, this.options);
             if (addRole) {
                 await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
-                utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} updated service account for cross-service rules...`);
+                utils.logLabeledBullet(RulesetType[this.type], "updated service account for cross-service rules...");
             }
         }
         catch (e) {
@@ -95,14 +95,14 @@ class RulesDeploy {
         const newRulesetsByFilename = new Map();
         for (const [filename, files] of Object.entries(this.rulesFiles)) {
             if (latestRulesetName && _.isEqual(files, latestRulesetContent)) {
-                utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} latest version of ${clc.bold(filename)} already up to date, skipping upload...`);
+                utils.logLabeledBullet(RulesetType[this.type], `latest version of ${(0, colorette_1.bold)(filename)} already up to date, skipping upload...`);
                 this.rulesetNames[filename] = latestRulesetName;
                 continue;
             }
             if (previews_1.previews.crossservicerules && service === RulesetServiceType.FIREBASE_STORAGE) {
                 await this.checkStorageRulesIamPermissions((_a = files[0]) === null || _a === void 0 ? void 0 : _a.content);
             }
-            utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} uploading rules ${clc.bold(filename)}...`);
+            utils.logLabeledBullet(RulesetType[this.type], `uploading rules ${(0, colorette_1.bold)(filename)}...`);
             newRulesetsByFilename.set(filename, gcp.rules.createRuleset(this.options.project, files));
         }
         try {
@@ -116,8 +116,7 @@ class RulesDeploy {
             if (err.status !== QUOTA_EXCEEDED_STATUS_CODE) {
                 throw err;
             }
-            utils.logBullet(clc.bold.yellow(RulesetType[this.type] + ":") +
-                " quota exceeded error while uploading rules");
+            utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");
             const history = await gcp.rules.listAllRulesets(this.options.project);
             if (history.length > RULESET_COUNT_LIMIT) {
                 const confirm = await (0, prompt_1.promptOnce)({
@@ -136,7 +135,7 @@ class RulesDeploy {
                         await gcp.rules.deleteRuleset(this.options.project, gcp.rules.getRulesetId(entry));
                         logger_1.logger.debug(`[rules] Deleted ${entry.name}`);
                     }
-                    utils.logBullet(clc.bold.yellow(RulesetType[this.type] + ":") + " retrying rules upload");
+                    utils.logLabeledWarning(RulesetType[this.type], "retrying rules upload");
                     return this.createRulesets(service);
                 }
             }
@@ -150,10 +149,10 @@ class RulesDeploy {
         await gcp.rules.updateOrCreateRelease(this.options.project, this.rulesetNames[filename], resourceName === RulesetServiceType.FIREBASE_STORAGE
             ? `${resourceName}/${subResourceName}`
             : resourceName);
-        utils.logSuccess(`${clc.bold.green(RulesetType[this.type] + ":")} released rules ${clc.bold(filename)} to ${clc.bold(resourceName)}`);
+        utils.logLabeledSuccess(RulesetType[this.type], `released rules ${(0, colorette_1.bold)(filename)} to ${(0, colorette_1.bold)(resourceName)}`);
     }
     async compileRuleset(filename, files) {
-        utils.logBullet(`${clc.bold.cyan(this.type + ":")} checking ${clc.bold(filename)} for compilation errors...`);
+        utils.logLabeledBullet(this.type, `checking ${(0, colorette_1.bold)(filename)} for compilation errors...`);
         const response = await gcp.rules.testRuleset(this.options.project, files);
         if (_.get(response, "body.issues", []).length) {
             const warnings = [];
@@ -174,11 +173,11 @@ class RulesDeploy {
             }
             if (errors.length > 0) {
                 const add = errors.length === 1 ? "" : "s";
-                const message = `Compilation error${add} in ${clc.bold(filename)}:\n${errors.join("\n")}`;
+                const message = `Compilation error${add} in ${(0, colorette_1.bold)(filename)}:\n${errors.join("\n")}`;
                 throw new error_1.FirebaseError(message, { exit: 1 });
             }
         }
-        utils.logSuccess(`${clc.bold.green(this.type + ":")} rules file ${clc.bold(filename)} compiled successfully`);
+        utils.logLabeledSuccess(this.type, `rules file ${(0, colorette_1.bold)(filename)} compiled successfully`);
     }
 }
 exports.RulesDeploy = RulesDeploy;

package/lib/serve/hosting.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = exports.start = exports.stop = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const superstatic = require("superstatic").server;
 const morgan = require("morgan");
 const detectProjectRoot_1 = require("../detectProjectRoot");
@@ -60,6 +60,7 @@ function startServer(options, config, port, init) {
         port: port,
         host: options.host,
         config: config,
+        compression: true,
         cwd: (0, detectProjectRoot_1.detectProjectRoot)(options),
         stack: "strict",
         before: {

package/lib/serve/index.js

@@ -4,6 +4,9 @@ exports.serve = void 0;
 const logger_1 = require("../logger");
 const frameworks_1 = require("../frameworks");
 const previews_1 = require("../previews");
+const track_1 = require("../track");
+const projectUtils_1 = require("../projectUtils");
+const constants_1 = require("../emulator/constants");
 const { FunctionsServer } = require("./functions");
 const TARGETS = {
     hosting: require("./hosting"),
@@ -17,12 +20,24 @@ async function serve(options) {
         [].concat(options.config.get("hosting")).some((it) => it.source)) {
         await (0, frameworks_1.prepareFrameworks)(targetNames, options, options);
     }
+    const isDemoProject = constants_1.Constants.isDemoProject((0, projectUtils_1.getProjectId)(options) || "");
+    targetNames.forEach((targetName) => {
+        void (0, track_1.trackEmulator)("emulator_run", {
+            emulator_name: targetName,
+            is_demo_project: String(isDemoProject),
+        });
+    });
     await Promise.all(targetNames.map((targetName) => {
         return TARGETS[targetName].start(options);
     }));
     await Promise.all(targetNames.map((targetName) => {
         return TARGETS[targetName].connect();
     }));
+    void (0, track_1.trackEmulator)("emulators_started", {
+        count: targetNames.length,
+        count_all: targetNames.length,
+        is_demo_project: String(isDemoProject),
+    });
     await new Promise((resolve) => {
         process.on("SIGINT", () => {
             logger_1.logger.info("Shutting down...");

package/lib/track.js

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.track = void 0;
+exports.emulatorSession = exports.trackEmulator = exports.track = exports.usageEnabled = exports.EMULATOR_GA4_MEASUREMENT_ID = void 0;
+const node_fetch_1 = require("node-fetch");
 const ua = require("universal-analytics");
 const uuid_1 = require("uuid");
+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";
+function usageEnabled() {
+    return !!configstore_1.configstore.get("usage");
+}
+exports.usageEnabled = usageEnabled;
+const FIREBASE_ANALYTICS_UA = process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3";
 let anonId = configstore_1.configstore.get("analytics-uuid");
 if (!anonId) {
     anonId = (0, uuid_1.v4)();
     configstore_1.configstore.set("analytics-uuid", anonId);
 }
-const visitor = ua(process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3", anonId, {
+const visitor = ua(FIREBASE_ANALYTICS_UA, anonId, {
     strictCidFormat: false,
     https: true,
 });
@@ -19,7 +28,7 @@ visitor.set("cd2", process.version);
 visitor.set("cd3", process.env.FIREPIT_VERSION || "none");
 function track(action, label, duration = 0) {
     return new Promise((resolve) => {
-        if (configstore_1.configstore.get("tokens") && configstore_1.configstore.get("usage")) {
+        if (configstore_1.configstore.get("tokens") && usageEnabled()) {
             visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
                 resolve();
             });
@@ -30,3 +39,113 @@ function track(action, label, duration = 0) {
     });
 }
 exports.track = track;
+const EMULATOR_GA4_API_SECRET = process.env.FIREBASE_EMULATOR_GA4_API_SECRET || "2V_zBYc4TdeoppzDaIu0zw";
+const EMULATOR_GA4_USER_PROPS = {
+    node_platform: {
+        value: process.platform,
+    },
+    node_version: {
+        value: process.version,
+    },
+    firebase_tools_version: {
+        value: pkg.version,
+    },
+    firepit_version: {
+        value: process.env.FIREPIT_VERSION || "none",
+    },
+};
+async function trackEmulator(eventName, params) {
+    const session = emulatorSession();
+    if (!session) {
+        return;
+    }
+    const oldTotalEngagementSeconds = session.totalEngagementSeconds;
+    session.totalEngagementSeconds = process.uptime();
+    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 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
+                ? { 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),
+            },
+        ],
+    };
+    if (session.validateOnly) {
+        logger_1.logger.info(`Sending Analytics for event ${eventName}`, params, body);
+    }
+    try {
+        const response = await (0, node_fetch_1.default)(url, {
+            method: "POST",
+            headers: {
+                "content-type": "application/json;charset=UTF-8",
+            },
+            body: JSON.stringify(body),
+        });
+        if (session.validateOnly) {
+            if (!response.ok) {
+                logger_1.logger.warn(`Analytics validation HTTP error: ${response.status}`);
+            }
+            const respBody = await response.text();
+            logger_1.logger.info(`Analytics validation result: ${respBody}`);
+        }
+    }
+    catch (e) {
+        if (session.validateOnly) {
+            throw e;
+        }
+        return;
+    }
+}
+exports.trackEmulator = trackEmulator;
+function emulatorSession() {
+    const validateOnly = !!process.env.FIREBASE_CLI_MP_VALIDATE;
+    if (!usageEnabled()) {
+        if (validateOnly) {
+            logger_1.logger.warn("Google Analytics is DISABLED. To enable, (re)login and opt in to collection.");
+        }
+        return;
+    }
+    if (!currentEmulatorSession) {
+        let clientId = configstore_1.configstore.get("emulator-analytics-clientId");
+        if (!clientId) {
+            clientId = (0, uuid_1.v4)();
+            configstore_1.configstore.set("emulator-analytics-clientId", clientId);
+        }
+        currentEmulatorSession = {
+            measurementId: exports.EMULATOR_GA4_MEASUREMENT_ID,
+            clientId,
+            sessionId: (Math.random() * Number.MAX_SAFE_INTEGER).toFixed(0),
+            totalEngagementSeconds: 0,
+            debugMode: isDebugMode(),
+            validateOnly,
+        };
+    }
+    return currentEmulatorSession;
+}
+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")) {
+        try {
+            require("../tsconfig.json");
+            logger_1.logger.info(`Using Google Analytics in DEBUG mode. Emulators (+ UI) events will be shown in GA Debug View only.`);
+            return true;
+        }
+        catch (_a) {
+        }
+    }
+    return false;
+}

package/lib/utils.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.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("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const process = require("process");
 const stream_1 = require("stream");
 const winston = require("winston");
 const triple_beam_1 = require("triple-beam");
 const assert_1 = require("assert");
-const ansiStrip = require("cli-color/strip");
+const stripAnsi = require("strip-ansi");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
 const logger_1 = require("./logger");
@@ -82,31 +82,31 @@ function addSubdomain(origin, subdomain) {
 }
 exports.addSubdomain = addSubdomain;
 function logSuccess(message, type = "info", data = undefined) {
-    logger_1.logger[type](clc.green.bold(`${SUCCESS_CHAR} `), message, data);
+    logger_1.logger[type](clc.green(clc.bold(`${SUCCESS_CHAR} `)), message, data);
 }
 exports.logSuccess = logSuccess;
 function logLabeledSuccess(label, message, type = "info", data = undefined) {
-    logger_1.logger[type](clc.green.bold(`${SUCCESS_CHAR}  ${label}:`), message, data);
+    logger_1.logger[type](clc.green(clc.bold(`${SUCCESS_CHAR}  ${label}:`)), message, data);
 }
 exports.logLabeledSuccess = logLabeledSuccess;
 function logBullet(message, type = "info", data = undefined) {
-    logger_1.logger[type](clc.cyan.bold("i "), message, data);
+    logger_1.logger[type](clc.cyan(clc.bold("i ")), message, data);
 }
 exports.logBullet = logBullet;
 function logLabeledBullet(label, message, type = "info", data = undefined) {
-    logger_1.logger[type](clc.cyan.bold(`i  ${label}:`), message, data);
+    logger_1.logger[type](clc.cyan(clc.bold(`i  ${label}:`)), message, data);
 }
 exports.logLabeledBullet = logLabeledBullet;
 function logWarning(message, type = "warn", data = undefined) {
-    logger_1.logger[type](clc.yellow.bold(`${WARNING_CHAR} `), message, data);
+    logger_1.logger[type](clc.yellow(clc.bold(`${WARNING_CHAR} `)), message, data);
 }
 exports.logWarning = logWarning;
 function logLabeledWarning(label, message, type = "warn", data = undefined) {
-    logger_1.logger[type](clc.yellow.bold(`${WARNING_CHAR}  ${label}:`), message, data);
+    logger_1.logger[type](clc.yellow(clc.bold(`${WARNING_CHAR}  ${label}:`)), message, data);
 }
 exports.logLabeledWarning = logLabeledWarning;
 function logLabeledError(label, message, type = "error", data = undefined) {
-    logger_1.logger[type](clc.red.bold(`${ERROR_CHAR}  ${label}:`), message, data);
+    logger_1.logger[type](clc.red(clc.bold(`${ERROR_CHAR}  ${label}:`)), message, data);
 }
 exports.logLabeledError = logLabeledError;
 function reject(message, options) {
@@ -248,6 +248,19 @@ async function promiseWhile(action, check, interval = 2500) {
     });
 }
 exports.promiseWhile = promiseWhile;
+function withTimeout(timeoutMs, promise) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error("Timed out.")), timeoutMs);
+        promise.then((value) => {
+            clearTimeout(timeout);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timeout);
+            reject(err);
+        });
+    });
+}
+exports.withTimeout = withTimeout;
 async function promiseProps(obj) {
     const resultObj = {};
     const promises = Object.keys(obj).map(async (key) => {
@@ -287,7 +300,7 @@ function setupLoggers() {
             level: "debug",
             format: winston.format.printf((info) => {
                 const segments = [info.message, ...(info[triple_beam_1.SPLAT] || [])].map(tryStringify);
-                return `${ansiStrip(segments.join(" "))}`;
+                return `${stripAnsi(segments.join(" "))}`;
             }),
         }));
     }