firebase-tools 11.14.0 → 11.14.2

package/lib/emulator/env.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setEnvVarsForEmulators = void 0;
+const constants_1 = require("./constants");
+const types_1 = require("./types");
+const registry_1 = require("./registry");
+function setEnvVarsForEmulators(env) {
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.DATABASE)) {
+        env[constants_1.Constants.FIREBASE_DATABASE_EMULATOR_HOST] = registry_1.EmulatorRegistry.url(types_1.Emulators.DATABASE).host;
+    }
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.FIRESTORE)) {
+        const { host } = registry_1.EmulatorRegistry.url(types_1.Emulators.FIRESTORE);
+        env[constants_1.Constants.FIRESTORE_EMULATOR_HOST] = host;
+        env[constants_1.Constants.FIRESTORE_EMULATOR_ENV_ALT] = host;
+    }
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.STORAGE)) {
+        const { host } = registry_1.EmulatorRegistry.url(types_1.Emulators.STORAGE);
+        env[constants_1.Constants.FIREBASE_STORAGE_EMULATOR_HOST] = host;
+        env[constants_1.Constants.CLOUD_STORAGE_EMULATOR_HOST] = `http://${host}`;
+    }
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.AUTH)) {
+        env[constants_1.Constants.FIREBASE_AUTH_EMULATOR_HOST] = registry_1.EmulatorRegistry.url(types_1.Emulators.AUTH).host;
+    }
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.HUB)) {
+        env[constants_1.Constants.FIREBASE_EMULATOR_HUB] = registry_1.EmulatorRegistry.url(types_1.Emulators.HUB).host;
+    }
+    const pubsubEmulator = registry_1.EmulatorRegistry.isRunning(types_1.Emulators.PUBSUB);
+    if (pubsubEmulator) {
+        env[constants_1.Constants.PUBSUB_EMULATOR_HOST] = registry_1.EmulatorRegistry.url(types_1.Emulators.PUBSUB).host;
+    }
+    if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
+        env[constants_1.Constants.CLOUD_EVENTARC_EMULATOR_HOST] = `http://${registry_1.EmulatorRegistry.url(types_1.Emulators.EVENTARC).host}`;
+    }
+}
+exports.setEnvVarsForEmulators = setEnvVarsForEmulators;

package/lib/emulator/eventarcEmulator.js

@@ -7,7 +7,6 @@ const types_1 = require("./types");
 const utils_1 = require("../utils");
 const emulatorLogger_1 = require("./emulatorLogger");
 const registry_1 = require("./registry");
-const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 class EventarcEmulator {
     constructor(args) {
@@ -77,21 +76,16 @@ class EventarcEmulator {
         return hub;
     }
     async triggerCustomEventFunction(channel, event) {
-        const functionsEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
-        if (!functionsEmulator) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.FUNCTIONS)) {
             this.logger.log("INFO", "Functions emulator not found. This should not happen.");
             return Promise.reject();
         }
         const key = `${event.type}-${channel}`;
         const triggers = this.customEvents[key] || [];
-        const apiClient = new apiv2_1.Client({
-            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(functionsEmulator.getInfo())}`,
-            auth: false,
-        });
         return await Promise.all(triggers
             .filter((trigger) => !trigger.eventTrigger.eventFilters ||
             this.matchesAll(event, trigger.eventTrigger.eventFilters))
-            .map((trigger) => apiClient
+            .map((trigger) => registry_1.EmulatorRegistry.client(types_1.Emulators.FUNCTIONS)
             .request({
             method: "POST",
             path: `/functions/projects/${trigger.projectId}/triggers/${trigger.triggerName}`,
@@ -146,4 +140,3 @@ class EventarcEmulator {
     }
 }
 exports.EventarcEmulator = EventarcEmulator;
-//# sourceMappingURL=eventarcEmulator.js.map

package/lib/emulator/events/types.js

@@ -26,4 +26,3 @@ class EventUtils {
     }
 }
 exports.EventUtils = EventUtils;
-//# sourceMappingURL=types.js.map

package/lib/emulator/extensions/postinstall.js

@@ -4,33 +4,33 @@ exports.replaceConsoleLinks = void 0;
 const registry_1 = require("../registry");
 const types_1 = require("../types");
 function replaceConsoleLinks(postinstall) {
-    const uiInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.UI);
-    const uiUrl = uiInfo ? `http://${registry_1.EmulatorRegistry.getInfoHostString(uiInfo)}` : "unknown";
+    const uiRunning = registry_1.EmulatorRegistry.isRunning(types_1.Emulators.UI);
+    const uiUrl = uiRunning ? registry_1.EmulatorRegistry.url(types_1.Emulators.UI).toString() : "unknown";
     let subbedPostinstall = postinstall;
     const linkReplacements = new Map([
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/storage[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/${types_1.Emulators.STORAGE}`,
+            `${uiUrl}${types_1.Emulators.STORAGE}`,
         ],
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/firestore[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/${types_1.Emulators.FIRESTORE}`,
+            `${uiUrl}${types_1.Emulators.FIRESTORE}`,
         ],
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/database[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/${types_1.Emulators.DATABASE}`,
+            `${uiUrl}${types_1.Emulators.DATABASE}`,
         ],
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/authentication[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/${types_1.Emulators.AUTH}`,
+            `${uiUrl}${types_1.Emulators.AUTH}`,
         ],
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/functions[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/logs`,
+            `${uiUrl}logs`,
         ],
         [
             /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/extensions[A-Za-z0-9\/-]*(?=[\)\]\s])/,
-            `${uiUrl}/${types_1.Emulators.EXTENSIONS}`,
+            `${uiUrl}${types_1.Emulators.EXTENSIONS}`,
         ],
     ]);
     for (const [consoleLinkRegex, replacement] of linkReplacements) {
@@ -39,4 +39,3 @@ function replaceConsoleLinks(postinstall) {
     return subbedPostinstall;
 }
 exports.replaceConsoleLinks = replaceConsoleLinks;
-//# sourceMappingURL=postinstall.js.map

package/lib/emulator/extensions/validation.js

@@ -68,4 +68,3 @@ function checkForUnemulatedTriggerTypes(backend, options) {
     return [...new Set(unemulatedTriggers)];
 }
 exports.checkForUnemulatedTriggerTypes = checkForUnemulatedTriggerTypes;
-//# sourceMappingURL=validation.js.map

package/lib/emulator/extensionsEmulator.js

@@ -40,11 +40,11 @@ class ExtensionsEmulator {
         return Promise.resolve();
     }
     getInfo() {
-        const info = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.FUNCTIONS);
-        if (!info) {
+        const functionsEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
+        if (!functionsEmulator) {
             throw new error_1.FirebaseError("Extensions Emulator is running but Functions emulator is not. This should never happen.");
         }
-        return info;
+        return functionsEmulator.getInfo();
     }
     getName() {
         return types_1.Emulators.EXTENSIONS;
@@ -222,12 +222,12 @@ class ExtensionsEmulator {
         return filteredBackends;
     }
     extensionDetailsUILink(backend) {
-        const uiInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.UI);
-        if (!uiInfo || !backend.extensionInstanceId) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.UI) || !backend.extensionInstanceId) {
             return "";
         }
-        const uiUrl = registry_1.EmulatorRegistry.getInfoHostString(uiInfo);
-        return clc.underline(clc.bold(`http://${uiUrl}/${types_1.Emulators.EXTENSIONS}/${backend.extensionInstanceId}`));
+        const uiUrl = registry_1.EmulatorRegistry.url(types_1.Emulators.UI);
+        uiUrl.pathname = `/${types_1.Emulators.EXTENSIONS}/${backend.extensionInstanceId}`;
+        return clc.underline(clc.bold(uiUrl.toString()));
     }
     extensionsInfoTable(options) {
         var _a;
@@ -250,4 +250,3 @@ class ExtensionsEmulator {
     }
 }
 exports.ExtensionsEmulator = ExtensionsEmulator;
-//# sourceMappingURL=extensionsEmulator.js.map

package/lib/emulator/firestoreEmulator.js

@@ -10,15 +10,13 @@ const downloadableEmulators = require("./downloadableEmulators");
 const types_1 = require("../emulator/types");
 const registry_1 = require("./registry");
 const constants_1 = require("./constants");
-const apiv2_1 = require("../apiv2");
 class FirestoreEmulator {
     constructor(args) {
         this.args = args;
     }
     async start() {
-        const functionsInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.FUNCTIONS);
-        if (functionsInfo) {
-            this.args.functions_emulator = registry_1.EmulatorRegistry.getInfoHostString(functionsInfo);
+        if (registry_1.EmulatorRegistry.isRunning(types_1.Emulators.FUNCTIONS)) {
+            this.args.functions_emulator = registry_1.EmulatorRegistry.url(types_1.Emulators.FUNCTIONS).host;
         }
         if (this.args.rules && this.args.project_id) {
             const rulesPath = this.args.rules;
@@ -62,6 +60,8 @@ class FirestoreEmulator {
             port,
             pid: downloadableEmulators.getPID(types_1.Emulators.FIRESTORE),
             reservedPorts: reservedPorts,
+            webSocketHost: this.args.websocket_port ? host : undefined,
+            webSocketPort: this.args.websocket_port ? this.args.websocket_port : undefined,
         };
     }
     getName() {
@@ -69,7 +69,6 @@ class FirestoreEmulator {
     }
     async updateRules(content) {
         const projectId = this.args.project_id;
-        const info = this.getInfo();
         const body = {
             ignore_errors: true,
             rules: {
@@ -81,11 +80,7 @@ class FirestoreEmulator {
                 ],
             },
         };
-        const client = new apiv2_1.Client({
-            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(info)}`,
-            auth: false,
-        });
-        const res = await client.put(`/emulator/v1/projects/${projectId}:securityRules`, body);
+        const res = await registry_1.EmulatorRegistry.client(types_1.Emulators.FIRESTORE).put(`/emulator/v1/projects/${projectId}:securityRules`, body);
         if (res.body && Array.isArray(res.body.issues)) {
             return res.body.issues;
         }
@@ -99,5 +94,3 @@ class FirestoreEmulator {
     }
 }
 exports.FirestoreEmulator = FirestoreEmulator;
-FirestoreEmulator.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
-//# sourceMappingURL=firestoreEmulator.js.map

package/lib/emulator/functionsEmulator.js

@@ -31,8 +31,8 @@ const runtimes = require("../deploy/functions/runtimes");
 const backend = require("../deploy/functions/backend");
 const functionsEnv = require("../functions/env");
 const v1_1 = require("../functions/events/v1");
-const apiv2_1 = require("../apiv2");
 const build_1 = require("../deploy/functions/build");
+const env_1 = require("./env");
 const EVENT_INVOKE = "functions:invoke";
 const EVENT_INVOKE_GA4 = "functions_invoke";
 const DATABASE_PATH_PATTERN = new RegExp("^projects/[^/]+/instances/([^/]+)/refs(/.*)$");
@@ -60,8 +60,16 @@ class FunctionsEmulator {
         }
         this.workQueue = new workQueue_1.WorkQueue(mode);
     }
-    static getHttpFunctionUrl(host, port, projectId, name, region) {
-        return `http://${host}:${port}/${projectId}/${region}/${name}`;
+    static getHttpFunctionUrl(projectId, name, region, info) {
+        let url;
+        if (info) {
+            url = new url_1.URL("http://" + (0, functionsEmulatorShared_1.formatHost)(info));
+        }
+        else {
+            url = registry_1.EmulatorRegistry.url(types_1.Emulators.FUNCTIONS);
+        }
+        url.pathname = `/${projectId}/${region}/${name}`;
+        return url.toString();
     }
     async getCredentialsEnvironment() {
         const credentialEnv = {};
@@ -124,7 +132,7 @@ class FunctionsEmulator {
                 this.workQueue.submit(() => {
                     return new Promise((resolve, reject) => {
                         const trigReq = http.request({
-                            host,
+                            host: (0, utils_1.connectableHostname)(host),
                             port,
                             method: req.method,
                             path: `/functions/projects/${projectId}/triggers/${triggerId}`,
@@ -312,10 +320,9 @@ class FunctionsEmulator {
             }
             let added = false;
             let url = undefined;
-            const { host, port } = this.getInfo();
             if (definition.httpsTrigger) {
                 added = true;
-                url = FunctionsEmulator.getHttpFunctionUrl(host, port, this.args.projectId, definition.name, definition.region);
+                url = FunctionsEmulator.getHttpFunctionUrl(this.args.projectId, definition.name, definition.region);
             }
             else if (definition.eventTrigger) {
                 const service = (0, functionsEmulatorShared_1.getFunctionService)(definition);
@@ -346,8 +353,7 @@ class FunctionsEmulator {
                 }
             }
             else if (definition.blockingTrigger) {
-                const { host, port } = this.getInfo();
-                url = FunctionsEmulator.getHttpFunctionUrl(host, port, this.args.projectId, definition.name, definition.region);
+                url = FunctionsEmulator.getHttpFunctionUrl(this.args.projectId, definition.name, definition.region);
                 added = this.addBlockingTrigger(url, definition.blockingTrigger);
             }
             else {
@@ -374,19 +380,14 @@ class FunctionsEmulator {
         }
     }
     addEventarcTrigger(projectId, key, eventTrigger) {
-        const eventarcEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.EVENTARC);
-        if (!eventarcEmu) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
             return Promise.resolve(false);
         }
         const bundle = {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "eventarc.googleapis.com" }),
         };
         logger_1.logger.debug(`addEventarcTrigger`, JSON.stringify(bundle));
-        const client = new apiv2_1.Client({
-            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(eventarcEmu.getInfo())}`,
-            auth: false,
-        });
-        return client
+        return registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC)
             .post(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle)
             .then(() => true)
             .catch((err) => {
@@ -399,16 +400,12 @@ class FunctionsEmulator {
             !this.blockingFunctionsConfig.forwardInboundCredentials) {
             return;
         }
-        const authEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.AUTH);
-        if (!authEmu) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.AUTH)) {
             return;
         }
         const path = `/identitytoolkit.googleapis.com/v2/projects/${this.getProjectId()}/config?updateMask=blockingFunctions`;
         try {
-            const client = new apiv2_1.Client({
-                urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(authEmu.getInfo())}`,
-                auth: false,
-            });
+            const client = registry_1.EmulatorRegistry.client(types_1.Emulators.AUTH);
             await client.patch(path, { blockingFunctions: this.blockingFunctionsConfig }, {
                 headers: { Authorization: "Bearer owner" },
             });
@@ -461,18 +458,14 @@ class FunctionsEmulator {
         return { bundle, apiPath, instance };
     }
     async addRealtimeDatabaseTrigger(projectId, key, eventTrigger, signature, region) {
-        const databaseEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.DATABASE);
-        if (!databaseEmu) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.DATABASE)) {
             return false;
         }
         const { bundle, apiPath, instance } = signature === "cloudevent"
             ? this.getV2DatabaseApiAttributes(projectId, key, eventTrigger, region)
             : this.getV1DatabaseApiAttributes(projectId, key, eventTrigger);
         logger_1.logger.debug(`addRealtimeDatabaseTrigger[${instance}]`, JSON.stringify(bundle));
-        const client = new apiv2_1.Client({
-            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(databaseEmu.getInfo())}`,
-            auth: false,
-        });
+        const client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATABASE);
         try {
             await client.post(apiPath, bundle, { headers: { Authorization: "Bearer owner" } });
         }
@@ -483,18 +476,14 @@ class FunctionsEmulator {
         return true;
     }
     async addFirestoreTrigger(projectId, key, eventTrigger) {
-        const firestoreEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.FIRESTORE);
-        if (!firestoreEmu) {
+        if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.FIRESTORE)) {
             return Promise.resolve(false);
         }
         const bundle = JSON.stringify({
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "firestore.googleapis.com" }),
         });
         logger_1.logger.debug(`addFirestoreTrigger`, JSON.stringify(bundle));
-        const client = new apiv2_1.Client({
-            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(firestoreEmu.getInfo())}`,
-            auth: false,
-        });
+        const client = registry_1.EmulatorRegistry.client(types_1.Emulators.FIRESTORE);
         try {
             await client.put(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle);
         }
@@ -718,32 +707,7 @@ class FunctionsEmulator {
             skipTokenVerification: true,
             enableCors: true,
         });
-        const firestoreEmulator = this.getEmulatorInfo(types_1.Emulators.FIRESTORE);
-        if (firestoreEmulator != null) {
-            envs[constants_1.Constants.FIRESTORE_EMULATOR_HOST] = (0, functionsEmulatorShared_1.formatHost)(firestoreEmulator);
-        }
-        const databaseEmulator = this.getEmulatorInfo(types_1.Emulators.DATABASE);
-        if (databaseEmulator) {
-            envs[constants_1.Constants.FIREBASE_DATABASE_EMULATOR_HOST] = (0, functionsEmulatorShared_1.formatHost)(databaseEmulator);
-        }
-        const authEmulator = this.getEmulatorInfo(types_1.Emulators.AUTH);
-        if (authEmulator) {
-            envs[constants_1.Constants.FIREBASE_AUTH_EMULATOR_HOST] = (0, functionsEmulatorShared_1.formatHost)(authEmulator);
-        }
-        const storageEmulator = this.getEmulatorInfo(types_1.Emulators.STORAGE);
-        if (storageEmulator) {
-            envs[constants_1.Constants.FIREBASE_STORAGE_EMULATOR_HOST] = (0, functionsEmulatorShared_1.formatHost)(storageEmulator);
-            envs[constants_1.Constants.CLOUD_STORAGE_EMULATOR_HOST] = `http://${(0, functionsEmulatorShared_1.formatHost)(storageEmulator)}`;
-        }
-        const pubsubEmulator = this.getEmulatorInfo(types_1.Emulators.PUBSUB);
-        if (pubsubEmulator) {
-            const pubsubHost = (0, functionsEmulatorShared_1.formatHost)(pubsubEmulator);
-            process.env.PUBSUB_EMULATOR_HOST = pubsubHost;
-        }
-        const eventarcEmulator = this.getEmulatorInfo(types_1.Emulators.EVENTARC);
-        if (eventarcEmulator) {
-            envs[constants_1.Constants.CLOUD_EVENTARC_EMULATOR_HOST] = `http://${(0, functionsEmulatorShared_1.formatHost)(eventarcEmulator)}`;
-        }
+        (0, env_1.setEnvVarsForEmulators)(envs);
         if (this.args.debugPort) {
             envs["FUNCTION_DEBUG_MODE"] = "true";
         }
@@ -821,7 +785,7 @@ class FunctionsEmulator {
             }
             else {
                 const { host } = this.getInfo();
-                args.unshift(`--inspect=${host}:${this.args.debugPort}`);
+                args.unshift(`--inspect=${(0, utils_1.connectableHostname)(host)}:${this.args.debugPort}`);
             }
         }
         const pnpPath = path.join(backend.functionsDir, ".pnp.js");
@@ -959,4 +923,3 @@ class FunctionsEmulator {
     }
 }
 exports.FunctionsEmulator = FunctionsEmulator;
-//# sourceMappingURL=functionsEmulator.js.map

package/lib/emulator/functionsEmulatorRuntime.js

@@ -740,4 +740,3 @@ if (require.main === module) {
         return flushAndExit(1);
     });
 }
-//# sourceMappingURL=functionsEmulatorRuntime.js.map

package/lib/emulator/functionsEmulatorShared.js

@@ -14,6 +14,7 @@ const postinstall_1 = require("./extensions/postinstall");
 const services_1 = require("../deploy/functions/services");
 const prepare_1 = require("../deploy/functions/prepare");
 const events = require("../functions/events");
+const utils_1 = require("../utils");
 const V2_EVENTS = [
     events.v2.PUBSUB_PUBLISH_EVENT,
     ...events.v2.STORAGE_EVENTS,
@@ -246,11 +247,12 @@ function findModuleRoot(moduleName, filepath) {
 }
 exports.findModuleRoot = findModuleRoot;
 function formatHost(info) {
-    if (info.host.includes(":")) {
-        return `[${info.host}]:${info.port}`;
+    const host = (0, utils_1.connectableHostname)(info.host);
+    if (host.includes(":")) {
+        return `[${host}]:${info.port}`;
     }
     else {
-        return `${info.host}:${info.port}`;
+        return `${host}:${info.port}`;
     }
 }
 exports.formatHost = formatHost;
@@ -303,4 +305,3 @@ function toBackendInfo(e, cf3Triggers) {
     }));
 }
 exports.toBackendInfo = toBackendInfo;
-//# sourceMappingURL=functionsEmulatorShared.js.map

package/lib/emulator/functionsEmulatorShell.js

@@ -16,7 +16,7 @@ class FunctionsEmulatorShell {
         utils.logLabeledBullet("functions", `Loaded functions: ${entryPoints.join(", ")}`);
         for (const trigger of this.triggers) {
             if (trigger.httpsTrigger) {
-                this.urls[trigger.id] = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(this.emu.getInfo().host, this.emu.getInfo().port, this.emu.getProjectId(), trigger.name, trigger.region);
+                this.urls[trigger.id] = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(this.emu.getProjectId(), trigger.name, trigger.region, this.emu.getInfo());
             }
         }
     }
@@ -54,4 +54,3 @@ class FunctionsEmulatorShell {
     }
 }
 exports.FunctionsEmulatorShell = FunctionsEmulatorShell;
-//# sourceMappingURL=functionsEmulatorShell.js.map

package/lib/emulator/functionsEmulatorUtils.js

@@ -89,4 +89,3 @@ function isLocalHost(href) {
     return !!href.match(/^(http(s)?:\/\/)?(localhost|127.0.0.1|\[::1])/);
 }
 exports.isLocalHost = isLocalHost;
-//# sourceMappingURL=functionsEmulatorUtils.js.map

package/lib/emulator/functionsRuntimeWorker.js

@@ -277,4 +277,3 @@ class RuntimeWorkerPool {
     }
 }
 exports.RuntimeWorkerPool = RuntimeWorkerPool;
-//# sourceMappingURL=functionsRuntimeWorker.js.map

package/lib/emulator/hostingEmulator.js

@@ -33,4 +33,3 @@ class HostingEmulator {
     }
 }
 exports.HostingEmulator = HostingEmulator;
-//# sourceMappingURL=hostingEmulator.js.map

package/lib/emulator/hub.js

@@ -1,37 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmulatorHub = void 0;
-const cors = require("cors");
-const express = require("express");
 const os = require("os");
 const fs = require("fs");
 const path = require("path");
-const bodyParser = require("body-parser");
 const utils = require("../utils");
 const logger_1 = require("../logger");
-const constants_1 = require("./constants");
 const types_1 = require("./types");
 const hubExport_1 = require("./hubExport");
 const registry_1 = require("./registry");
+const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
 const pkg = require("../../package.json");
-class EmulatorHub {
+class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
     constructor(args) {
+        super({
+            listen: args.listen,
+        });
         this.args = args;
-        this.hub = express();
-        this.hub.use(cors({ origin: true }));
-        this.hub.use(bodyParser.json());
-        this.hub.get("/", (req, res) => {
-            res.json(this.getLocator());
+    }
+    static readLocatorFile(projectId) {
+        const locatorPath = this.getLocatorFilePath(projectId);
+        if (!fs.existsSync(locatorPath)) {
+            return undefined;
+        }
+        const data = fs.readFileSync(locatorPath, "utf8").toString();
+        const locator = JSON.parse(data);
+        if (locator.version !== this.CLI_VERSION) {
+            logger_1.logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
+            return undefined;
+        }
+        return locator;
+    }
+    static getLocatorFilePath(projectId) {
+        const dir = os.tmpdir();
+        const filename = `hub-${projectId}.json`;
+        return path.join(dir, filename);
+    }
+    async start() {
+        await super.start();
+        await this.writeLocatorFile();
+    }
+    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 }));
         });
-        this.hub.get(EmulatorHub.PATH_EMULATORS, (req, res) => {
+        app.get(EmulatorHub.PATH_EMULATORS, (req, res) => {
             const body = {};
-            for (const emulator of registry_1.EmulatorRegistry.listRunning()) {
-                const info = registry_1.EmulatorRegistry.getInfo(emulator);
-                body[emulator] = info;
+            for (const info of registry_1.EmulatorRegistry.listRunningWithInfo()) {
+                body[info.name] = Object.assign({ listen: this.args.listenForEmulator[info.name] }, info);
             }
             res.json(body);
         });
-        this.hub.post(EmulatorHub.PATH_EXPORT, async (req, res) => {
+        app.post(EmulatorHub.PATH_EXPORT, async (req, res) => {
             const path = req.body.path;
             const initiatedBy = req.body.initiatedBy || "unknown";
             utils.logLabeledBullet("emulators", `Received export request. Exporting data to ${path}.`);
@@ -53,7 +74,7 @@ class EmulatorHub {
                 });
             }
         });
-        this.hub.put(EmulatorHub.PATH_DISABLE_FUNCTIONS, async (req, res) => {
+        app.put(EmulatorHub.PATH_DISABLE_FUNCTIONS, async (req, res) => {
             utils.logLabeledBullet("emulators", `Disabling Cloud Functions triggers, non-HTTP functions will not execute.`);
             const instance = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
             if (!instance) {
@@ -64,7 +85,7 @@ class EmulatorHub {
             await emu.disableBackgroundTriggers();
             res.status(200).json({ enabled: false });
         });
-        this.hub.put(EmulatorHub.PATH_ENABLE_FUNCTIONS, async (req, res) => {
+        app.put(EmulatorHub.PATH_ENABLE_FUNCTIONS, async (req, res) => {
             utils.logLabeledBullet("emulators", `Enabling Cloud Functions triggers, non-HTTP functions will execute.`);
             const instance = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
             if (!instance) {
@@ -75,58 +96,29 @@ class EmulatorHub {
             await emu.reloadTriggers();
             res.status(200).json({ enabled: true });
         });
-    }
-    static readLocatorFile(projectId) {
-        const locatorPath = this.getLocatorFilePath(projectId);
-        if (!fs.existsSync(locatorPath)) {
-            return undefined;
-        }
-        const data = fs.readFileSync(locatorPath, "utf8").toString();
-        const locator = JSON.parse(data);
-        if (locator.version !== this.CLI_VERSION) {
-            logger_1.logger.debug(`Found locator with mismatched version, ignoring: ${JSON.stringify(locator)}`);
-            return undefined;
-        }
-        return locator;
-    }
-    static getLocatorFilePath(projectId) {
-        const dir = os.tmpdir();
-        const filename = `hub-${projectId}.json`;
-        return path.join(dir, filename);
-    }
-    async start() {
-        const { host, port } = this.getInfo();
-        const server = this.hub.listen(port, host);
-        this.destroyServer = utils.createDestroyer(server);
-        await this.writeLocatorFile();
-    }
-    async connect() {
+        return app;
     }
     async stop() {
-        if (this.destroyServer) {
-            await this.destroyServer();
-        }
+        await super.stop();
         await this.deleteLocatorFile();
     }
-    getInfo() {
-        const host = this.args.host || constants_1.Constants.getDefaultHost();
-        const port = this.args.port || constants_1.Constants.getDefaultPort(types_1.Emulators.HUB);
-        return {
-            name: this.getName(),
-            host,
-            port,
-        };
-    }
     getName() {
         return types_1.Emulators.HUB;
     }
     getLocator() {
-        const { host, port } = this.getInfo();
         const version = pkg.version;
+        const origins = [];
+        for (const spec of this.args.listen) {
+            if (spec.family === "IPv6") {
+                origins.push(`http://[${utils.connectableHostname(spec.address)}]:${spec.port}`);
+            }
+            else {
+                origins.push(`http://${utils.connectableHostname(spec.address)}:${spec.port}`);
+            }
+        }
         return {
             version,
-            host,
-            port,
+            origins,
         };
     }
     async writeLocatorFile() {
@@ -168,4 +160,3 @@ EmulatorHub.PATH_EXPORT = "/_admin/export";
 EmulatorHub.PATH_DISABLE_FUNCTIONS = "/functions/disableBackgroundTriggers";
 EmulatorHub.PATH_ENABLE_FUNCTIONS = "/functions/enableBackgroundTriggers";
 EmulatorHub.PATH_EMULATORS = "/emulators";
-//# sourceMappingURL=hub.js.map