firebase-tools 13.24.2 → 13.26.0

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

@@ -44,13 +44,13 @@ async function uploadExtensionAction(extensionRef, options) {
         profile = await (0, publisherApi_1.getPublisherProfile)("-", publisherId);
     }
     catch (err) {
-        if (err.status === 404) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
             throw (0, extensionsHelper_1.getMissingPublisherError)(publisherId);
         }
         throw err;
     }
     const projectNumber = `${(0, extensionsHelper_2.getPublisherProjectFromName)(profile.name)}`;
-    const { projectId } = await (0, projects_1.getFirebaseProject)(projectNumber);
+    const { projectId } = await (0, projects_1.getProject)(projectNumber);
     await (0, tos_1.acceptLatestPublisherTOS)(options, projectNumber);
     let res;
     if (options.local) {

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

@@ -36,7 +36,7 @@ exports.command = new command_1.Command("ext:dev:usage <publisherId>")
             extensions = await (0, publisherApi_1.listExtensions)(publisherId);
         }
         catch (err) {
-            throw new error_1.FirebaseError(err);
+            throw new error_1.FirebaseError((0, error_1.getErrMsg)(err));
         }
         if (extensions.length < 1) {
             throw new error_1.FirebaseError(`There are no published extensions associated with publisher ID ${clc.bold(publisherId)}. This could happen for two reasons:\n` +
@@ -77,7 +77,7 @@ exports.command = new command_1.Command("ext:dev:usage <publisherId>")
     }
     catch (err) {
         throw new error_1.FirebaseError(`Error occurred when fetching usage data for extension ${extensionName}`, {
-            original: err,
+            original: (0, error_1.getError)(err),
         });
     }
     if (!response) {

package/lib/commands/ext-install.js

@@ -110,8 +110,8 @@ exports.command = new command_1.Command("ext:install [extensionRef]")
     }
     catch (err) {
         if (!(err instanceof error_1.FirebaseError)) {
-            throw new error_1.FirebaseError(`Error occurred saving the extension to manifest: ${err.message}`, {
-                original: err,
+            throw new error_1.FirebaseError(`Error occurred saving the extension to manifest: ${(0, error_1.getErrMsg)(err)}`, {
+                original: (0, error_1.getError)(err),
             });
         }
         throw err;

package/lib/commands/index.js

@@ -17,11 +17,14 @@ function load(client) {
     client.appdistribution = {};
     client.appdistribution.distribute = loadCommand("appdistribution-distribute");
     client.appdistribution.testers = {};
+    client.appdistribution.testers.list = loadCommand("appdistribution-testers-list");
     client.appdistribution.testers.add = loadCommand("appdistribution-testers-add");
     client.appdistribution.testers.delete = loadCommand("appdistribution-testers-remove");
     client.appdistribution.group = {};
-    client.appdistribution.group.create = loadCommand("appdistribution-group-create");
-    client.appdistribution.group.delete = loadCommand("appdistribution-group-delete");
+    client.appdistribution.group.list = loadCommand("appdistribution-groups-list");
+    client.appdistribution.group.create = loadCommand("appdistribution-groups-create");
+    client.appdistribution.group.delete = loadCommand("appdistribution-groups-delete");
+    client.appdistribution.groups = client.appdistribution.group;
     client.apps = {};
     client.apps.create = loadCommand("apps-create");
     client.apps.list = loadCommand("apps-list");

package/lib/commands/use.js

@@ -53,7 +53,7 @@ exports.command = new command_1.Command("use [alias_or_project_id]")
         const hasAlias = options.rc.hasProjectAlias(newActive);
         const resolvedProject = options.rc.resolveAlias(newActive);
         (0, command_2.validateProjectId)(resolvedProject);
-        return (0, projects_1.getFirebaseProject)(resolvedProject)
+        return (0, projects_1.getProject)(resolvedProject)
             .then((foundProject) => {
             project = foundProject;
         })

package/lib/deploy/extensions/deploy.js

@@ -18,7 +18,9 @@ async function deploy(context, options, payload) {
         ...((_b = payload.instancesToUpdate) !== null && _b !== void 0 ? _b : []),
         ...((_c = payload.instancesToConfigure) !== null && _c !== void 0 ? _c : []),
     ]);
-    await (0, secrets_1.handleSecretParams)(payload, context.have, options.nonInteractive);
+    if (context.have) {
+        await (0, secrets_1.handleSecretParams)(payload, context.have, options.nonInteractive);
+    }
     const errorHandler = new errors_1.ErrorHandler();
     const validationQueue = new queue_1.default({
         retries: 5,

package/lib/deploy/extensions/deploymentSummary.js

@@ -11,7 +11,7 @@ const humanReadableUpdate = (from, to) => {
         to.ref &&
         from.ref.publisherId === to.ref.publisherId &&
         from.ref.extensionId === to.ref.extensionId) {
-        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${(_a = to.ref) === null || _a === void 0 ? void 0 : _a.version})`;
+        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${((_a = to.ref) === null || _a === void 0 ? void 0 : _a.version) || ""})`;
     }
     else {
         const fromRef = from.ref
@@ -32,6 +32,9 @@ function updatesSummary(toUpdate, have) {
     const instancesToUpdate = toUpdate
         .map((to) => {
         const from = have.find((exists) => exists.instanceId === to.instanceId);
+        if (!from) {
+            return "";
+        }
         return humanReadableUpdate(from, to);
     })
         .join("\n");

package/lib/deploy/extensions/planner.js

@@ -46,6 +46,9 @@ async function getExtensionSpec(i) {
             throw new error_1.FirebaseError("InstanceSpec had no ref or localPath, unable to get extensionSpec");
         }
     }
+    if (!i.extensionSpec) {
+        throw new error_1.FirebaseError("Internal error getting extension");
+    }
     return i.extensionSpec;
 }
 exports.getExtensionSpec = getExtensionSpec;
@@ -54,8 +57,12 @@ async function haveDynamic(projectId) {
         .filter((i) => { var _a; return ((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"; })
         .map((i) => {
         var _a;
+        const instanceId = i.name.split("/").pop();
+        if (!instanceId) {
+            throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
+        }
         const dep = {
-            instanceId: i.name.split("/").pop(),
+            instanceId,
             params: i.config.params,
             systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
             allowedEventTypes: i.config.allowedEventTypes,
@@ -77,8 +84,12 @@ async function have(projectId) {
         .filter((i) => { var _a; return !(((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"); })
         .map((i) => {
         var _a;
+        const instanceId = i.name.split("/").pop();
+        if (!instanceId) {
+            throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
+        }
         const dep = {
-            instanceId: i.name.split("/").pop(),
+            instanceId,
             params: i.config.params,
             systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
             allowedEventTypes: i.config.allowedEventTypes,
@@ -196,7 +207,7 @@ async function want(args) {
             }
         }
         catch (err) {
-            logger_1.logger.debug(`Got error reading extensions entry ${e}: ${err}`);
+            logger_1.logger.debug(`Got error reading extensions entry ${e[0]} (${e[1]}): ${(0, error_1.getErrMsg)(err)}`);
             errors.push(err);
         }
     }

package/lib/deploy/extensions/prepare.js

@@ -18,6 +18,15 @@ const v2FunctionHelper_1 = require("./v2FunctionHelper");
 const tos_1 = require("../../extensions/tos");
 const common_1 = require("../../extensions/runtimes/common");
 const functionsDeployHelper_1 = require("../functions/functionsDeployHelper");
+const matchesInstanceId = (dep) => (test) => {
+    return dep.instanceId === test.instanceId;
+};
+const isUpdate = (dep) => (test) => {
+    return dep.instanceId === test.instanceId && !refs.equal(dep.ref, test.ref);
+};
+const isConfigure = (dep) => (test) => {
+    return dep.instanceId === test.instanceId && refs.equal(dep.ref, test.ref);
+};
 async function prepareHelper(context, options, payload, wantExtensions, haveExtensions, isDynamic) {
     var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -146,12 +155,3 @@ async function prepare(context, options, payload) {
     return prepareHelper(context, options, payload, wantExtensions, haveExtensions, false);
 }
 exports.prepare = prepare;
-const matchesInstanceId = (dep) => (test) => {
-    return dep.instanceId === test.instanceId;
-};
-const isUpdate = (dep) => (test) => {
-    return dep.instanceId === test.instanceId && !refs.equal(dep.ref, test.ref);
-};
-const isConfigure = (dep) => (test) => {
-    return dep.instanceId === test.instanceId && refs.equal(dep.ref, test.ref);
-};

package/lib/deploy/functions/ensure.js

@@ -15,7 +15,7 @@ const metadataCallCache = new Map();
 async function defaultServiceAccount(e) {
     let metadataCall = metadataCallCache.get(e.project);
     if (!metadataCall) {
-        metadataCall = (0, projects_1.getFirebaseProject)(e.project);
+        metadataCall = (0, projects_1.getProject)(e.project);
         metadataCallCache.set(e.project, metadataCall);
     }
     const metadata = await metadataCall;

package/lib/deploy/lifecycleHooks.js

@@ -8,9 +8,10 @@ const error_1 = require("../error");
 const needProjectId = require("../projectUtils").needProjectId;
 const logger_1 = require("../logger");
 const path = require("path");
+const vsCodeUtils_1 = require("../vsCodeUtils");
 function runCommand(command, childOptions) {
     const escapedCommand = command.replace(/\"/g, '\\"');
-    const isVSCode = utils.isVSCodeExtension();
+    const isVSCode = (0, vsCodeUtils_1.isVSCodeExtension)();
     const nodeExecutable = isVSCode ? "node" : process.execPath;
     const crossEnvShellPath = isVSCode
         ? path.resolve(__dirname, "./cross-env/dist/bin/cross-env-shell.js")

package/lib/emulator/apphosting/config.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalAppHostingConfiguration = void 0;
 const path_1 = require("path");
 const config_1 = require("../../apphosting/config");
-async function getLocalAppHostingConfiguration(cwd) {
-    const appHostingConfigPaths = (0, config_1.discoverConfigsAtBackendRoot)(cwd);
+const yaml_1 = require("../../apphosting/yaml");
+async function getLocalAppHostingConfiguration(backendDir) {
+    const appHostingConfigPaths = (0, config_1.listAppHostingFilesInPath)(backendDir);
     const fileNameToPathMap = new Map();
     for (const path of appHostingConfigPaths) {
         const fileName = (0, path_1.basename)(path);
@@ -12,6 +13,15 @@ async function getLocalAppHostingConfiguration(cwd) {
     }
     const baseFilePath = fileNameToPathMap.get(config_1.APPHOSTING_BASE_YAML_FILE);
     const localFilePath = fileNameToPathMap.get(config_1.APPHOSTING_LOCAL_YAML_FILE);
-    return await (0, config_1.loadConfigForEnvironment)(localFilePath !== null && localFilePath !== void 0 ? localFilePath : baseFilePath, baseFilePath);
+    if (!baseFilePath && !localFilePath) {
+        return yaml_1.AppHostingYamlConfig.empty();
+    }
+    if (!baseFilePath || !localFilePath) {
+        return await yaml_1.AppHostingYamlConfig.loadFromFile((baseFilePath || localFilePath));
+    }
+    const localYamlConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localFilePath);
+    const baseConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(baseFilePath);
+    baseConfig.merge(localYamlConfig);
+    return baseConfig;
 }
 exports.getLocalAppHostingConfiguration = getLocalAppHostingConfiguration;

package/lib/emulator/apphosting/index.js

@@ -11,6 +11,7 @@ class AppHostingEmulator {
     async start() {
         const { hostname, port } = await (0, serve_1.start)({
             startCommand: this.args.startCommandOverride,
+            rootDirectory: this.args.rootDirectory,
         });
         this.args.options.host = hostname;
         this.args.options.port = port;

package/lib/emulator/apphosting/serve.js

@@ -9,19 +9,21 @@ const spawn_1 = require("../../init/spawn");
 const utils_2 = require("./utils");
 const types_1 = require("../types");
 const config_1 = require("./config");
+const projectPath_1 = require("../../projectPath");
 async function start(options) {
     const hostname = constants_1.DEFAULT_HOST;
     let port = constants_1.DEFAULT_PORTS.apphosting;
     while (!(await availablePort(hostname, port))) {
         port += 1;
     }
-    serve(port, options === null || options === void 0 ? void 0 : options.startCommand);
+    serve(port, options === null || options === void 0 ? void 0 : options.startCommand, options === null || options === void 0 ? void 0 : options.rootDirectory);
     return { hostname, port };
 }
 exports.start = start;
-async function serve(port, startCommand) {
-    const rootDir = process.cwd();
-    const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(rootDir);
+async function serve(port, startCommand, backendRelativeDir) {
+    backendRelativeDir = backendRelativeDir !== null && backendRelativeDir !== void 0 ? backendRelativeDir : "./";
+    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, backendRelativeDir);
+    const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(backendRoot);
     const environmentVariablesAsRecord = {};
     for (const env of apphostingLocalConfig.environmentVariables) {
         environmentVariablesAsRecord[env.variable] = env.value;
@@ -29,12 +31,12 @@ async function serve(port, startCommand) {
     const environmentVariablesToInject = Object.assign(Object.assign({}, environmentVariablesAsRecord), { PORT: port.toString() });
     if (startCommand) {
         utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
-        await (0, spawn_1.spawnWithCommandString)(startCommand, rootDir, environmentVariablesToInject);
+        await (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject);
         return;
     }
-    const packageManager = await (0, utils_1.discoverPackageManager)(rootDir);
+    const packageManager = await (0, utils_1.discoverPackageManager)(backendRoot);
     utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${packageManager} run dev'`);
-    await (0, spawn_1.wrapSpawn)(packageManager, ["run", "dev"], rootDir, environmentVariablesToInject);
+    await (0, spawn_1.wrapSpawn)(packageManager, ["run", "dev"], backendRoot, environmentVariablesToInject);
 }
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({

package/lib/emulator/controller.js

@@ -47,6 +47,7 @@ const fileUtils_1 = require("../dataconnect/fileUtils");
 const tasksEmulator_1 = require("./tasksEmulator");
 const apphosting_1 = require("./apphosting");
 const webhook_1 = require("../dataconnect/webhook");
+const api_1 = require("../api");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function exportOnExit(options) {
     const exportOnExitDir = options.exportOnExit;
@@ -264,7 +265,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                     portFixed: !!wsPortConfig,
                 };
             }
-            if (emulator === types_1.Emulators.DATACONNECT) {
+            if (emulator === types_1.Emulators.DATACONNECT && !(0, api_1.dataConnectLocalConnString)()) {
                 const pglitePortConfig = (_f = (_e = options.config.src.emulators) === null || _e === void 0 ? void 0 : _e.dataconnect) === null || _f === void 0 ? void 0 : _f.postgresPort;
                 listenConfig["dataconnect.postgres"] = {
                     host: config.host,
@@ -608,6 +609,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
                 host: apphostingAddr.host,
                 port: apphostingAddr.port,
                 startCommandOverride: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride,
+                rootDirectory: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.rootDirectory,
                 options,
             });
             await startEmulator(apphostingEmulator);
@@ -629,7 +631,6 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     if (listenForEmulator.ui) {
         const ui = new ui_1.EmulatorUI({
             projectId: projectId,
-            auto_download: true,
             listen: listenForEmulator[types_1.Emulators.UI],
         });
         await startEmulator(ui);

package/lib/emulator/dataconnectEmulator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataConnectEmulatorClient = exports.DataConnectEmulator = exports.dataConnectEmulatorEvents = void 0;
 const childProcess = require("child_process");
 const events_1 = require("events");
+const clc = require("colorette");
 const api_1 = require("../api");
 const constants_1 = require("./constants");
 const downloadableEmulators_1 = require("./downloadableEmulators");
@@ -26,26 +27,23 @@ class DataConnectEmulator {
         this.emulatorClient = new DataConnectEmulatorClient();
     }
     async start() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         let resolvedConfigDir;
         try {
             resolvedConfigDir = this.args.config.path(this.args.configDir);
             const info = await DataConnectEmulator.build({ configDir: resolvedConfigDir });
             if ((0, types_2.requiresVector)(info.metadata)) {
                 if (constants_1.Constants.isDemoProject(this.args.projectId)) {
-                    this.logger.logLabeled("WARN", "Data Connect", "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.");
+                    this.logger.logLabeled("WARN", "dataconnect", "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.");
                 }
                 else {
-                    this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
+                    this.logger.logLabeled("WARN", "dataconnect", "Operations that use vector_embed will make calls to production Vertex AI");
                 }
             }
         }
         catch (err) {
             this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
         }
-        const info = await (0, load_1.load)(this.args.projectId, this.args.config, this.args.configDir);
-        const dbId = ((_a = info.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.database) || "postgres";
-        const serviceId = info.dataConnectYaml.serviceId;
         await (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
             auto_download: this.args.auto_download,
             listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
@@ -55,11 +53,14 @@ class DataConnectEmulator {
         });
         this.usingExistingEmulator = false;
         if (this.args.autoconnectToPostgres) {
+            const info = await (0, load_1.load)(this.args.projectId, this.args.config, this.args.configDir);
+            const dbId = ((_a = info.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.database) || "postgres";
+            const serviceId = info.dataConnectYaml.serviceId;
             const pgPort = (_b = this.args.postgresListen) === null || _b === void 0 ? void 0 : _b[0].port;
             const pgHost = (_c = this.args.postgresListen) === null || _c === void 0 ? void 0 : _c[0].address;
             let connStr = (0, api_1.dataConnectLocalConnString)();
-            if ((0, api_1.dataConnectLocalConnString)()) {
-                this.logger.logLabeled("INFO", "Data Connect", `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${(0, api_1.dataConnectLocalConnString)()} - using that instead of starting a new database`);
+            if (connStr) {
+                this.logger.logLabeled("INFO", "dataconnect", `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${clc.bold(connStr)} - using that instead of starting a new database`);
             }
             else if (pgHost && pgPort) {
                 const pgServer = new pgliteServer_1.PostgresServer(dbId, "postgres");
@@ -71,11 +72,11 @@ class DataConnectEmulator {
                         this.logger.logLabeled("ERROR", "Data Connect", `${err}`);
                     }
                     else {
-                        this.logger.logLabeled("ERROR", "Data Connect", `Postgres threw an unexpected error, shutting down the Data Connect emulator: ${err}`);
+                        this.logger.logLabeled("ERROR", "dataconnect", `Postgres threw an unexpected error, shutting down the Data Connect emulator: ${err}`);
                     }
                     void (0, controller_1.cleanShutdown)();
                 });
-                this.logger.logLabeled("INFO", "Data Connect", `Started up Postgres server, listening on ${(_d = server.address()) === null || _d === void 0 ? void 0 : _d.toString()}`);
+                this.logger.logLabeled("INFO", "dataconnect", `Started up Postgres server, listening on ${JSON.stringify(server.address())}`);
             }
             await this.connectToPostgres(new URL(connStr), dbId, serviceId);
         }
@@ -84,14 +85,14 @@ class DataConnectEmulator {
     async connect() {
         const emuInfo = await this.emulatorClient.getInfo();
         if (!emuInfo) {
-            this.logger.logLabeled("ERROR", "Data Connect", "Could not connect to Data Connect emulator. Check dataconnect-debug.log for more details.");
+            this.logger.logLabeled("ERROR", "dataconnect", "Could not connect to Data Connect emulator. Check dataconnect-debug.log for more details.");
             return Promise.reject();
         }
         return Promise.resolve();
     }
     async stop() {
         if (this.usingExistingEmulator) {
-            this.logger.logLabeled("INFO", "Data Connect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
+            this.logger.logLabeled("INFO", "dataconnect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
             return;
         }
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.6.1",
-            expectedSize: 25309952,
-            expectedChecksum: "826692eb4ed9cf11becb595c386eb7bf",
+            version: "1.7.3",
+            expectedSize: 25211648,
+            expectedChecksum: "8410794304b2ae340c3facf07d7edc16",
         }
         : process.platform === "win32"
             ? {
-                version: "1.6.1",
-                expectedSize: 25737728,
-                expectedChecksum: "1e87a3a1f95d7b21cebf18f551619167",
+                version: "1.7.3",
+                expectedSize: 25641984,
+                expectedChecksum: "a4bd0f9d9d884528fa4494e4d7918c08",
             }
             : {
-                version: "1.6.1",
-                expectedSize: 25223320,
-                expectedChecksum: "b13218419fcaaa3ad22005ce8378412d",
+                version: "1.7.3",
+                expectedSize: 25125016,
+                expectedChecksum: "48660e6370aeed973f33c3420c3255fb",
             },
 };
 exports.DownloadDetails = {
@@ -233,8 +233,8 @@ const Commands = {
         shell: true,
     },
     ui: {
-        binary: "node",
-        args: [getExecPath(types_1.Emulators.UI)],
+        binary: "",
+        args: [],
         optionalArgs: [],
         joinArgs: false,
         shell: false,

package/lib/emulator/emulatorLogger.js

@@ -210,6 +210,9 @@ You can probably fix this by running "npm install ${systemLog.data.name}@latest"
             case "BULLET":
                 utils.logLabeledBullet(label, text, "info", mergedData);
                 break;
+            case "INFO":
+                utils.logLabeledBullet(label, text, "info", mergedData);
+                break;
             case "SUCCESS":
                 utils.logLabeledSuccess(label, text, "info", mergedData);
                 break;

package/lib/emulator/hub.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const hubExport_1 = require("./hubExport");
 const registry_1 = require("./registry");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
-const utils_1 = require("../utils");
+const vsCodeUtils_1 = require("../vsCodeUtils");
 const pkg = require("../../package.json");
 class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     static readLocatorFile(projectId) {
@@ -20,7 +20,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         }
         const data = fs.readFileSync(locatorPath, "utf8").toString();
         const locator = JSON.parse(data);
-        if (!utils_1.isVSCodeExtension && locator.version !== this.CLI_VERSION) {
+        if (!vsCodeUtils_1.isVSCodeExtension && locator.version !== this.CLI_VERSION) {
             logger_1.logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
             return undefined;
         }
@@ -41,17 +41,20 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         await super.start();
         await this.writeLocatorFile();
     }
+    getRunningEmulatorsMapping() {
+        const emulators = {};
+        for (const info of registry_1.EmulatorRegistry.listRunningWithInfo()) {
+            emulators[info.name] = Object.assign({ listen: this.args.listenForEmulator[info.name] }, info);
+        }
+        return emulators;
+    }
     async createExpressApp() {
         const app = await super.createExpressApp();
         app.get("/", (req, res) => {
             res.json(Object.assign(Object.assign({}, this.getLocator()), { host: utils.connectableHostname(this.args.listen[0].address), port: this.args.listen[0].port }));
         });
         app.get(EmulatorHub.PATH_EMULATORS, (req, res) => {
-            const body = {};
-            for (const info of registry_1.EmulatorRegistry.listRunningWithInfo()) {
-                body[info.name] = Object.assign({ listen: this.args.listenForEmulator[info.name] }, info);
-            }
-            res.json(body);
+            res.json(this.getRunningEmulatorsMapping());
         });
         app.post(EmulatorHub.PATH_EXPORT, async (req, res) => {
             if (req.headers.origin) {

package/lib/emulator/tasksEmulator.js

@@ -116,7 +116,10 @@ class TasksEmulator {
             const locationId = req.params.location_id;
             const queueName = req.params.queue_name;
             if (!this.validateQueueId(queueName)) {
-                res.status(400).send("Invalid Queue ID");
+                res.status(400).json({
+                    error: "Queue ID must start with a letter followed by up to 62 letters, numbers, " +
+                        "hyphens, or underscores and must end with a letter or a number",
+                });
                 return;
             }
             const key = `queue:${projectId}-${locationId}-${queueName}`;
@@ -139,7 +142,7 @@ class TasksEmulator {
                 defaultUri: body.defaultUri,
             };
             if (taskQueueConfig.rateLimits.maxConcurrentDispatches > 5000) {
-                res.status(400).send("cannot set maxConcurrentDispatches to a value over 5000");
+                res.status(400).json({ error: "cannot set maxConcurrentDispatches to a value over 5000" });
                 return;
             }
             this.controller.createQueue(key, taskQueueConfig);

package/lib/emulator/ui.js

@@ -1,52 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmulatorUI = void 0;
+const express = require("express");
+const path = require("path");
 const types_1 = require("./types");
 const downloadableEmulators = require("./downloadableEmulators");
 const registry_1 = require("./registry");
 const error_1 = require("../error");
+const emulatorLogger_1 = require("./emulatorLogger");
 const constants_1 = require("./constants");
 const track_1 = require("../track");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
 const experiments_1 = require("../experiments");
-class EmulatorUI {
+class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     constructor(args) {
+        super({
+            listen: args.listen,
+        });
         this.args = args;
     }
-    start() {
+    async start() {
+        await super.start();
+    }
+    async createExpressApp() {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.HUB)) {
             throw new error_1.FirebaseError(`Cannot start ${constants_1.Constants.description(types_1.Emulators.UI)} without ${constants_1.Constants.description(types_1.Emulators.HUB)}!`);
         }
-        const { auto_download: autoDownload, projectId } = this.args;
-        const env = {
-            LISTEN: JSON.stringify(ExpressBasedEmulator_1.ExpressBasedEmulator.listenOptionsFromSpecs(this.args.listen)),
-            GCLOUD_PROJECT: projectId,
-            [constants_1.Constants.FIREBASE_EMULATOR_HUB]: registry_1.EmulatorRegistry.url(types_1.Emulators.HUB).host,
-        };
-        const session = (0, track_1.emulatorSession)();
-        if (session) {
-            env[constants_1.Constants.FIREBASE_GA_SESSION] = JSON.stringify(session);
-        }
+        const hub = registry_1.EmulatorRegistry.get(types_1.Emulators.HUB);
+        const app = await super.createExpressApp();
+        const { projectId } = this.args;
         const enabledExperiments = Object.keys(experiments_1.ALL_EXPERIMENTS).filter((experimentName) => (0, experiments_1.isEnabled)(experimentName));
-        env[constants_1.Constants.FIREBASE_ENABLED_EXPERIMENTS] = JSON.stringify(enabledExperiments);
-        return downloadableEmulators.start(types_1.Emulators.UI, { auto_download: autoDownload }, env);
+        const emulatorGaSession = (0, track_1.emulatorSession)();
+        await downloadableEmulators.downloadIfNecessary(types_1.Emulators.UI);
+        const downloadDetails = downloadableEmulators.getDownloadDetails(types_1.Emulators.UI);
+        const webDir = path.join(downloadDetails.unzipDir, "client");
+        app.get("/api/config", this.jsonHandler(() => {
+            const json = Object.assign({ projectId, experiments: [] }, hub.getRunningEmulatorsMapping());
+            if (emulatorGaSession) {
+                json.analytics = emulatorGaSession;
+            }
+            if (enabledExperiments) {
+                json.experiments = enabledExperiments;
+            }
+            return Promise.resolve(json);
+        }));
+        app.use(express.static(webDir));
+        app.get("*", (_, res) => {
+            res.sendFile(path.join(webDir, "index.html"));
+        });
+        return app;
     }
     connect() {
         return Promise.resolve();
     }
-    stop() {
-        return downloadableEmulators.stop(types_1.Emulators.UI);
-    }
-    getInfo() {
-        return {
-            name: this.getName(),
-            host: this.args.listen[0].address,
-            port: this.args.listen[0].port,
-            pid: downloadableEmulators.getPID(types_1.Emulators.UI),
-        };
-    }
     getName() {
         return types_1.Emulators.UI;
     }
+    jsonHandler(handler) {
+        return (req, res) => {
+            handler(req).then((body) => {
+                res.status(200).json(body);
+            }, (err) => {
+                emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.UI).log("ERROR", err);
+                res.status(500).json({
+                    message: err.message,
+                    stack: err.stack,
+                    raw: err,
+                });
+            });
+        };
+    }
 }
 exports.EmulatorUI = EmulatorUI;