firebase-tools 11.15.0 → 11.16.1

package/lib/commands/database-push.js

@@ -19,6 +19,7 @@ exports.command = new command_1.Command("database:push <path> [infile]")
     .description("add a new JSON object to a list of data in your Firebase")
     .option("-d, --data <data>", "specify escaped JSON directly")
     .option("--instance <instance>", "use the database <instance>.firebaseio.com (if omitted, use default database instance)")
+    .option("--disable-triggers", "suppress any Cloud functions triggered by this operation")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.update"])
     .before(requireDatabaseInstance_1.requireDatabaseInstance)
     .before(database_1.populateInstanceDetails)
@@ -30,6 +31,9 @@ exports.command = new command_1.Command("database:push <path> [infile]")
     const inStream = utils.stringToStream(options.data) || (infile ? fs.createReadStream(infile) : process.stdin);
     const origin = (0, api_1.realtimeOriginOrEmulatorOrCustomUrl)(options.instanceDetails.databaseUrl);
     const u = new url_1.URL(utils.getDatabaseUrl(origin, options.instance, path + ".json"));
+    if (options.disableTriggers) {
+        u.searchParams.set("disableTriggers", "true");
+    }
     if (!infile && !options.data) {
         utils.explainStdin();
     }
@@ -41,6 +45,7 @@ exports.command = new command_1.Command("database:push <path> [infile]")
             method: "POST",
             path: u.pathname,
             body: inStream,
+            queryParams: u.searchParams,
         });
     }
     catch (err) {

package/lib/commands/database-remove.js

@@ -16,6 +16,7 @@ exports.command = new command_1.Command("database:remove <path>")
     .description("remove data from your Firebase at the specified path")
     .option("-f, --force", "pass this option to bypass confirmation prompt")
     .option("--instance <instance>", "use the database <instance>.firebaseio.com (if omitted, use default database instance)")
+    .option("--disable-triggers", "suppress any Cloud functions triggered by this operation")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.update"])
     .before(requireDatabaseInstance_1.requireDatabaseInstance)
     .before(database_1.populateInstanceDetails)
@@ -35,7 +36,7 @@ exports.command = new command_1.Command("database:remove <path>")
     if (!confirm) {
         return utils.reject("Command aborted.", { exit: 1 });
     }
-    const removeOps = new remove_1.default(options.instance, path, origin);
+    const removeOps = new remove_1.default(options.instance, path, origin, !!options.disableTriggers);
     await removeOps.execute();
     utils.logSuccess("Data removed successfully");
 });

package/lib/commands/database-set.js

@@ -21,6 +21,7 @@ exports.command = new command_1.Command("database:set <path> [infile]")
     .option("-d, --data <data>", "specify escaped JSON directly")
     .option("-f, --force", "pass this option to bypass confirmation prompt")
     .option("--instance <instance>", "use the database <instance>.firebaseio.com (if omitted, use default database instance)")
+    .option("--disable-triggers", "suppress any Cloud functions triggered by this operation")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.update"])
     .before(requireDatabaseInstance_1.requireDatabaseInstance)
     .before(database_1.populateInstanceDetails)
@@ -32,6 +33,9 @@ exports.command = new command_1.Command("database:set <path> [infile]")
     const origin = (0, api_1.realtimeOriginOrEmulatorOrCustomUrl)(options.instanceDetails.databaseUrl);
     const dbPath = utils.getDatabaseUrl(origin, options.instance, path);
     const dbJsonURL = new url_1.URL(utils.getDatabaseUrl(origin, options.instance, path + ".json"));
+    if (options.disableTriggers) {
+        dbJsonURL.searchParams.set("disableTriggers", "true");
+    }
     const confirm = await (0, prompt_1.promptOnce)({
         type: "confirm",
         name: "force",
@@ -51,6 +55,7 @@ exports.command = new command_1.Command("database:set <path> [infile]")
             method: "PUT",
             path: dbJsonURL.pathname,
             body: inStream,
+            queryParams: dbJsonURL.searchParams,
         });
     }
     catch (err) {

package/lib/commands/database-update.js

@@ -21,6 +21,7 @@ exports.command = new command_1.Command("database:update <path> [infile]")
     .option("-d, --data <data>", "specify escaped JSON directly")
     .option("-f, --force", "pass this option to bypass confirmation prompt")
     .option("--instance <instance>", "use the database <instance>.firebaseio.com (if omitted, use default database instance)")
+    .option("--disable-triggers", "suppress any Cloud functions triggered by this operation")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.update"])
     .before(requireDatabaseInstance_1.requireDatabaseInstance)
     .before(database_1.populateInstanceDetails)
@@ -44,6 +45,9 @@ exports.command = new command_1.Command("database:update <path> [infile]")
         (infile && fs.createReadStream(infile)) ||
         process.stdin;
     const jsonUrl = new url_1.URL(utils.getDatabaseUrl(origin, options.instance, path + ".json"));
+    if (options.disableTriggers) {
+        jsonUrl.searchParams.set("disableTriggers", "true");
+    }
     if (!infile && !options.data) {
         utils.explainStdin();
     }
@@ -53,6 +57,7 @@ exports.command = new command_1.Command("database:update <path> [infile]")
             method: "PATCH",
             path: jsonUrl.pathname,
             body: inStream,
+            queryParams: jsonUrl.searchParams,
         });
     }
     catch (err) {

package/lib/database/remove.js

@@ -15,9 +15,9 @@ const INITIAL_DELETE_BATCH_SIZE = 25;
 const INITIAL_LIST_NUM_SUB_PATH = 100;
 const MAX_LIST_NUM_SUB_PATH = 204800;
 class DatabaseRemove {
-    constructor(instance, path, host) {
+    constructor(instance, path, host, disableTriggers) {
         this.path = path;
-        this.remote = new removeRemote_1.RTDBRemoveRemote(instance, host);
+        this.remote = new removeRemote_1.RTDBRemoveRemote(instance, host, disableTriggers);
         this.deleteJobStack = new stack_1.Stack({
             name: "delete stack",
             concurrency: 1,

package/lib/database/removeRemote.js

@@ -6,9 +6,10 @@ const url_1 = require("url");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 class RTDBRemoveRemote {
-    constructor(instance, host) {
+    constructor(instance, host, disableTriggers) {
         this.instance = instance;
         this.host = host;
+        this.disableTriggers = disableTriggers;
         const url = new url_1.URL(utils.getDatabaseUrl(this.host, this.instance, "/"));
         this.apiClient = new apiv2_1.Client({ urlPrefix: url.origin, auth: true });
     }
@@ -25,7 +26,11 @@ class RTDBRemoveRemote {
     async patch(path, body, note) {
         const t0 = Date.now();
         const url = new url_1.URL(utils.getDatabaseUrl(this.host, this.instance, path + ".json"));
-        const queryParams = { print: "silent", writeSizeLimit: "tiny" };
+        const queryParams = {
+            print: "silent",
+            writeSizeLimit: "tiny",
+            disableTriggers: this.disableTriggers.toString(),
+        };
         const res = await this.apiClient.request({
             method: "PATCH",
             path: url.pathname,

package/lib/deploy/functions/build.js

@@ -160,6 +160,9 @@ function toBackend(build, paramValues) {
     const bkEndpoints = [];
     for (const endpointId of Object.keys(build.endpoints)) {
         const bdEndpoint = build.endpoints[endpointId];
+        if (r.resolveBoolean(bdEndpoint.omit || false)) {
+            continue;
+        }
         let regions = bdEndpoint.region;
         if (typeof regions === "undefined") {
             regions = [api.functionsDefaultRegion];

package/lib/deploy/functions/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveCpu = exports.inferBlockingDetails = exports.updateEndpointTargetedStatus = exports.inferDetailsFromExisting = exports.prepare = void 0;
+exports.resolveCpuAndConcurrency = exports.inferBlockingDetails = exports.updateEndpointTargetedStatus = exports.inferDetailsFromExisting = exports.prepare = exports.EVENTARC_SOURCE_ENV = void 0;
 const clc = require("colorette");
 const backend = require("./backend");
 const build = require("./build");
@@ -25,6 +25,8 @@ const v1_1 = require("../../functions/events/v1");
 const serviceusage_1 = require("../../gcp/serviceusage");
 const applyHash_1 = require("./cache/applyHash");
 const backend_1 = require("./backend");
+const functional_1 = require("../../functional");
+exports.EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -94,7 +96,18 @@ async function prepare(context, options, payload) {
             }
         }
         for (const endpoint of backend.allEndpoints(wantBackend)) {
-            endpoint.environmentVariables = wantBackend.environmentVariables;
+            endpoint.environmentVariables = wantBackend.environmentVariables || {};
+            let resource;
+            if (endpoint.platform === "gcfv1") {
+                resource = `projects/${endpoint.project}/locations/${endpoint.region}/functions/${endpoint.id}`;
+            }
+            else if (endpoint.platform === "gcfv2") {
+                resource = `projects/${endpoint.project}/locations/${endpoint.region}/services/${endpoint.id}`;
+            }
+            else {
+                (0, functional_1.assertExhaustive)(endpoint.platform);
+            }
+            endpoint.environmentVariables[exports.EVENTARC_SOURCE_ENV] = resource;
             endpoint.codebase = codebase;
         }
         wantBackends[codebase] = wantBackend;
@@ -143,7 +156,7 @@ async function prepare(context, options, payload) {
     for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
         inferDetailsFromExisting(wantBackend, haveBackend, codebaseUsesEnvs.includes(codebase));
         await (0, triggerRegionHelper_1.ensureTriggerRegions)(wantBackend);
-        resolveCpu(wantBackend);
+        resolveCpuAndConcurrency(wantBackend);
         validate.endpointsAreValid(wantBackend);
         inferBlockingDetails(wantBackend);
     }
@@ -205,9 +218,6 @@ function inferDetailsFromExisting(want, have, usedDotenv) {
         if (typeof wantE.availableMemoryMb === "undefined" && haveE.availableMemoryMb) {
             wantE.availableMemoryMb = haveE.availableMemoryMb;
         }
-        if (typeof wantE.concurrency === "undefined" && haveE.concurrency) {
-            wantE.concurrency = haveE.concurrency;
-        }
         if (typeof wantE.cpu === "undefined" && haveE.cpu) {
             wantE.cpu = haveE.cpu;
         }
@@ -264,7 +274,7 @@ function inferBlockingDetails(want) {
     }
 }
 exports.inferBlockingDetails = inferBlockingDetails;
-function resolveCpu(want) {
+function resolveCpuAndConcurrency(want) {
     for (const e of backend.allEndpoints(want)) {
         if (e.platform === "gcfv1") {
             continue;
@@ -275,6 +285,9 @@ function resolveCpu(want) {
         else if (!e.cpu) {
             e.cpu = backend.memoryToGen2Cpu(e.availableMemoryMb || backend.DEFAULT_MEMORY);
         }
+        if (!e.concurrency) {
+            e.concurrency = e.cpu >= 1 ? backend.DEFAULT_CONCURRENCY : 1;
+        }
     }
 }
-exports.resolveCpu = resolveCpu;
+exports.resolveCpuAndConcurrency = resolveCpuAndConcurrency;

package/lib/deploy/functions/release/fabricator.js

@@ -167,9 +167,9 @@ class Fabricator {
         if (apiFunction.httpsTrigger) {
             apiFunction.httpsTrigger.securityLevel = "SECURE_ALWAYS";
         }
-        apiFunction.sourceToken = await scraper.tokenPromise();
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.createFunction(apiFunction);
             return poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         })
@@ -301,9 +301,9 @@ class Fabricator {
             throw new Error("Precondition failed");
         }
         const apiFunction = gcf.functionFromEndpoint(endpoint, sourceUrl);
-        apiFunction.sourceToken = await scraper.tokenPromise();
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.updateFunction(apiFunction);
             return await poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         })

package/lib/deploy/functions/release/sourceTokenScraper.js

@@ -1,18 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceTokenScraper = void 0;
+const error_1 = require("../../../error");
+const functional_1 = require("../../../functional");
 const logger_1 = require("../../../logger");
 class SourceTokenScraper {
-    constructor() {
-        this.firstCall = true;
+    constructor(validDurationMs = 1500000) {
+        this.tokenValidDurationMs = validDurationMs;
         this.promise = new Promise((resolve) => (this.resolve = resolve));
+        this.fetchState = "NONE";
     }
-    tokenPromise() {
-        if (this.firstCall) {
-            this.firstCall = false;
-            return Promise.resolve(undefined);
+    async getToken() {
+        if (this.fetchState === "NONE") {
+            this.fetchState = "FETCHING";
+            return undefined;
         }
-        return this.promise;
+        else if (this.fetchState === "FETCHING") {
+            return this.promise;
+        }
+        else if (this.fetchState === "VALID") {
+            if (this.isTokenExpired()) {
+                this.fetchState = "FETCHING";
+                this.promise = new Promise((resolve) => (this.resolve = resolve));
+                return undefined;
+            }
+            return this.promise;
+        }
+        else {
+            (0, functional_1.assertExhaustive)(this.fetchState);
+        }
+    }
+    isTokenExpired() {
+        if (this.expiry === undefined) {
+            throw new error_1.FirebaseError("Your deployment is checking the expiration of a source token that has not yet been polled. " +
+                "Hitting this case should never happen and should be considered a bug. " +
+                "Please file an issue at https://github.com/firebase/firebase-tools/issues " +
+                "and try deploying your functions again.");
+        }
+        return Date.now() >= this.expiry;
     }
     get poller() {
         return (op) => {
@@ -21,6 +46,8 @@ class SourceTokenScraper {
                 const [, , , region] = ((_c = (_b = op.metadata) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.split("/")) || [];
                 logger_1.logger.debug(`Got source token ${(_d = op.metadata) === null || _d === void 0 ? void 0 : _d.sourceToken} for region ${region}`);
                 this.resolve((_e = op.metadata) === null || _e === void 0 ? void 0 : _e.sourceToken);
+                this.fetchState = "VALID";
+                this.expiry = Date.now() + this.tokenValidDurationMs;
             }
         };
     }

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -51,6 +51,7 @@ function assertBuildEndpoint(ep, id) {
         region: "array",
         platform: (platform) => build.AllFunctionsPlatforms.includes(platform),
         entryPoint: "string",
+        omit: "Field<boolean>?",
         availableMemoryMb: (mem) => mem === null || isCEL(mem) || build.isValidMemoryOption(mem),
         maxInstances: "Field<number>?",
         minInstances: "Field<number>?",
@@ -259,7 +260,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     if ("serviceAccountEmail" in ep) {
         parsed.serviceAccount = ep.serviceAccountEmail;
     }
-    (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
+    (0, proto_1.copyIfPresent)(parsed, ep, "omit", "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
     (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
         if (!senvs) {
             return null;

package/lib/deploy/hosting/convertConfig.js

@@ -36,13 +36,13 @@ function extractPattern(type, source) {
 function findEndpointForRewrite(site, targetBackend, id, region) {
     const endpoints = backend.allEndpoints(targetBackend).filter((e) => e.id === id);
     if (endpoints.length === 0) {
-        return;
+        return { matchingEndpoint: undefined, foundMatchingId: false };
     }
     if (endpoints.length === 1) {
         if (region && region !== endpoints[0].region) {
-            return;
+            return { matchingEndpoint: undefined, foundMatchingId: true };
         }
-        return endpoints[0];
+        return { matchingEndpoint: endpoints[0], foundMatchingId: true };
     }
     if (!region) {
         const us = endpoints.find((e) => e.region === "us-central1");
@@ -51,15 +51,19 @@ function findEndpointForRewrite(site, targetBackend, id, region) {
         }
         (0, utils_1.logLabeledBullet)(`hosting[${site}]`, `Function \`${id}\` found in multiple regions, defaulting to \`us-central1\`. ` +
             `To rewrite to a different region, specify a \`region\` for the rewrite in \`firebase.json\`.`);
-        return us;
+        return { matchingEndpoint: us, foundMatchingId: true };
     }
-    return endpoints.find((e) => e.region === region);
+    return {
+        matchingEndpoint: endpoints.find((e) => e.region === region),
+        foundMatchingId: true,
+    };
 }
 exports.findEndpointForRewrite = findEndpointForRewrite;
-async function convertConfig(context, deploy) {
+async function convertConfig(context, functionsPayload, deploy) {
     var _a, _b, _c, _d;
     const config = {};
     const hasBackends = !!((_a = deploy.config.rewrites) === null || _a === void 0 ? void 0 : _a.some((r) => "function" in r || "run" in r));
+    const wantBackend = backend.merge(...Object.values(functionsPayload.functions || {}).map((c) => c.wantBackend));
     let haveBackend = backend.empty();
     if (hasBackends) {
         try {
@@ -87,8 +91,18 @@ async function convertConfig(context, deploy) {
             }
             const id = rewrite.function.functionId;
             const region = rewrite.function.region;
-            const endpoint = findEndpointForRewrite(deploy.config.site, haveBackend, id, region);
+            const deployingEndpointSearch = findEndpointForRewrite(deploy.config.site, wantBackend, id, region);
+            const existingEndpointSearch = !deployingEndpointSearch.foundMatchingId && !deployingEndpointSearch.matchingEndpoint
+                ? findEndpointForRewrite(deploy.config.site, haveBackend, id, region)
+                : undefined;
+            const endpoint = deployingEndpointSearch.matchingEndpoint
+                ? deployingEndpointSearch.matchingEndpoint
+                : existingEndpointSearch === null || existingEndpointSearch === void 0 ? void 0 : existingEndpointSearch.matchingEndpoint;
             if (!endpoint) {
+                if (deployingEndpointSearch.foundMatchingId || (existingEndpointSearch === null || existingEndpointSearch === void 0 ? void 0 : existingEndpointSearch.foundMatchingId)) {
+                    throw new error_1.FirebaseError(`Unable to find a valid endpoint for function. Functions matching the rewrite
+  are present but in the wrong region.`);
+                }
                 (0, utils_1.logLabeledWarning)(`hosting[${deploy.config.site}]`, `Unable to find a valid endpoint for function \`${id}\`, but still including it in the config`);
                 const apiRewrite = Object.assign(Object.assign({}, target), { function: id });
                 if (region) {

package/lib/deploy/hosting/prepare.js

@@ -6,6 +6,7 @@ const api = require("../../hosting/api");
 const config = require("../../hosting/config");
 const deploymentTool = require("../../deploymentTool");
 const functional_1 = require("../../functional");
+const track_1 = require("../../track");
 async function prepare(context, options) {
     if (options.public) {
         if (Array.isArray(options.config.get("hosting"))) {
@@ -17,11 +18,21 @@ async function prepare(context, options) {
     if (configs.length === 0) {
         return Promise.resolve();
     }
-    const version = {
-        status: "CREATED",
-        labels: deploymentTool.labels(),
-    };
-    const versions = await Promise.all(configs.map((config) => api.createVersion(config.site, version)));
+    const versions = await Promise.all(configs.map(async (config) => {
+        const labels = Object.assign({}, deploymentTool.labels());
+        if (config.webFramework) {
+            labels["firebase-web-framework"] = config.webFramework;
+        }
+        const version = {
+            status: "CREATED",
+            labels,
+        };
+        const [, versionName] = await Promise.all([
+            (0, track_1.track)("hosting_deploy", config.webFramework || "classic"),
+            api.createVersion(config.site, version),
+        ]);
+        return versionName;
+    }));
     context.hosting = {
         deploys: [],
     };

package/lib/deploy/hosting/release.js

@@ -6,7 +6,7 @@ const logger_1 = require("../../logger");
 const utils = require("../../utils");
 const convertConfig_1 = require("./convertConfig");
 const error_1 = require("../../error");
-async function release(context, options) {
+async function release(context, options, functionsPayload) {
     if (!context.hosting || !context.hosting.deploys) {
         return;
     }
@@ -18,7 +18,7 @@ async function release(context, options) {
         utils.logLabeledBullet(`hosting[${deploy.config.site}]`, "finalizing version...");
         const update = {
             status: "FINALIZED",
-            config: await (0, convertConfig_1.convertConfig)(context, deploy),
+            config: await (0, convertConfig_1.convertConfig)(context, functionsPayload, deploy),
         };
         const versionId = utils.last(deploy.version.split("/"));
         const finalizedVersion = await api.updateVersion(deploy.config.site, versionId, update);

package/lib/dynamicImport.js

@@ -1,15 +1,12 @@
-"use strict";
 const { pathToFileURL } = require("url");
-exports.dynamicImport = function (mod) {
-    if (mod.startsWith("file://"))
-        return Promise.resolve().then(() => require(mod));
-    if (mod.startsWith("/"))
-        return Promise.resolve().then(() => require(pathToFileURL(mod).toString()));
+
+exports.dynamicImport = function(mod) {
+    if (mod.startsWith("file://")) return import(mod);
+    if (mod.startsWith("/")) return import(pathToFileURL(mod).toString());
     try {
         const path = require.resolve(mod);
-        return Promise.resolve().then(() => require(pathToFileURL(path).toString()));
-    }
-    catch (e) {
+        return import(pathToFileURL(path).toString());
+    } catch(e) {
         return Promise.reject(e);
     }
-};
+}

package/lib/emulator/auth/server.js

@@ -259,9 +259,8 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
             defaultProjectId !== projectId) {
             const errorString = `Multiple projectIds are not recommended in single project mode. ` +
                 `Requested project ID ${projectId}, but the emulator is configured for ` +
-                `${defaultProjectId}. This warning will become an error in the future. To opt-out of ` +
-                `single project mode add/set the \'"single_project_mode"\' false' property in the` +
-                ` firebase.json emulators config.`;
+                `${defaultProjectId}. To opt-out of single project mode add/set the ` +
+                `\'"singleProjectMode"\' false' property in the firebase.json emulators config.`;
             emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.AUTH).log("WARN", errorString);
             if (singleProjectMode === index_1.SingleProjectMode.ERROR) {
                 throw new errors_2.BadRequestError(errorString);

package/lib/emulator/download.js

@@ -27,6 +27,7 @@ async function downloadEmulator(name) {
     if (emulator.unzipDir) {
         await unzip(emulator.downloadPath, emulator.unzipDir);
     }
+    await new Promise((f) => setTimeout(f, 2000));
     const executablePath = emulator.binaryPath || emulator.downloadPath;
     fs.chmodSync(executablePath, 0o755);
     removeOldFiles(name, emulator);
@@ -54,7 +55,7 @@ function unzip(zipPath, unzipDir) {
         fs.createReadStream(zipPath)
             .pipe(unzipper.Extract({ path: unzipDir }))
             .on("error", reject)
-            .on("finish", resolve);
+            .on("close", resolve);
     });
 }
 function removeOldFiles(name, emulator, removeAllVersions = false) {

package/lib/emulator/downloadableEmulators.js

@@ -16,79 +16,94 @@ const download_1 = require("../emulator/download");
 const experiments = require("../experiments");
 const EMULATOR_INSTANCE_KILL_TIMEOUT = 4000;
 const CACHE_DIR = process.env.FIREBASE_EMULATORS_PATH || path.join(os.homedir(), ".cache", "firebase", "emulators");
+const EMULATOR_UPDATE_DETAILS = {
+    database: {
+        version: "4.11.0",
+        expectedSize: 34318940,
+        expectedChecksum: "311609538bd65666eb724ef47c2e6466",
+    },
+    firestore: {
+        version: "1.15.1",
+        expectedSize: 61475851,
+        expectedChecksum: "4f41d24a3c0f3b55ea22804a424cc0ee",
+    },
+    storage: {
+        version: "1.1.1",
+        expectedSize: 46448285,
+        expectedChecksum: "691982db4019d49d345a97151bdea7e2",
+    },
+    ui: experiments.isEnabled("emulatoruisnapshot")
+        ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
+        : {
+            version: "1.11.1",
+            expectedSize: 3061713,
+            expectedChecksum: "a4944414518be206280b495f526f18bf",
+        },
+    pubsub: {
+        version: "0.7.1",
+        expectedSize: 65137179,
+        expectedChecksum: "b59a6e705031a54a69e5e1dced7ca9bf",
+    },
+};
 exports.DownloadDetails = {
     database: {
-        downloadPath: path.join(CACHE_DIR, "firebase-database-emulator-v4.10.0.jar"),
-        version: "4.10.0",
+        downloadPath: path.join(CACHE_DIR, `firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`),
+        version: EMULATOR_UPDATE_DETAILS.database.version,
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v4.10.0.jar",
-            expectedSize: 34230230,
-            expectedChecksum: "e99b23f0e723813de4f4ea0e879b46b0",
+            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`,
+            expectedSize: EMULATOR_UPDATE_DETAILS.database.expectedSize,
+            expectedChecksum: EMULATOR_UPDATE_DETAILS.database.expectedChecksum,
             namePrefix: "firebase-database-emulator",
         },
     },
     firestore: {
-        downloadPath: path.join(CACHE_DIR, "cloud-firestore-emulator-v1.15.1.jar"),
-        version: "1.15.1",
+        downloadPath: path.join(CACHE_DIR, `cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`),
+        version: EMULATOR_UPDATE_DETAILS.firestore.version,
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.15.1.jar",
-            expectedSize: 61475851,
-            expectedChecksum: "4f41d24a3c0f3b55ea22804a424cc0ee",
+            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`,
+            expectedSize: EMULATOR_UPDATE_DETAILS.firestore.expectedSize,
+            expectedChecksum: EMULATOR_UPDATE_DETAILS.firestore.expectedChecksum,
             namePrefix: "cloud-firestore-emulator",
         },
     },
     storage: {
-        downloadPath: path.join(CACHE_DIR, "cloud-storage-rules-runtime-v1.1.1.jar"),
-        version: "1.1.1",
+        downloadPath: path.join(CACHE_DIR, `cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`),
+        version: EMULATOR_UPDATE_DETAILS.storage.version,
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.1.1.jar",
-            expectedSize: 46448285,
-            expectedChecksum: "691982db4019d49d345a97151bdea7e2",
+            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`,
+            expectedSize: EMULATOR_UPDATE_DETAILS.storage.expectedSize,
+            expectedChecksum: EMULATOR_UPDATE_DETAILS.storage.expectedChecksum,
             namePrefix: "cloud-storage-rules-emulator",
         },
     },
-    ui: experiments.isEnabled("emulatoruisnapshot")
-        ? {
-            version: "SNAPSHOT",
-            downloadPath: path.join(CACHE_DIR, "ui-vSNAPSHOT.zip"),
-            unzipDir: path.join(CACHE_DIR, "ui-vSNAPSHOT"),
-            binaryPath: path.join(CACHE_DIR, "ui-vSNAPSHOT", "server", "server.js"),
-            opts: {
-                cacheDir: CACHE_DIR,
-                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vSNAPSHOT.zip",
-                expectedSize: -1,
-                expectedChecksum: "",
-                skipCache: true,
-                skipChecksumAndSize: true,
-                namePrefix: "ui",
-            },
-        }
-        : {
-            version: "1.11.1",
-            downloadPath: path.join(CACHE_DIR, "ui-v1.11.1.zip"),
-            unzipDir: path.join(CACHE_DIR, "ui-v1.11.1"),
-            binaryPath: path.join(CACHE_DIR, "ui-v1.11.1", "server", "server.js"),
-            opts: {
-                cacheDir: CACHE_DIR,
-                remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.11.1.zip",
-                expectedSize: 3061713,
-                expectedChecksum: "a4944414518be206280b495f526f18bf",
-                namePrefix: "ui",
-            },
+    ui: {
+        version: EMULATOR_UPDATE_DETAILS.ui.version,
+        downloadPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`),
+        unzipDir: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`),
+        binaryPath: path.join(CACHE_DIR, `ui-v${EMULATOR_UPDATE_DETAILS.ui.version}`, "server", "server.js"),
+        opts: {
+            cacheDir: CACHE_DIR,
+            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v${EMULATOR_UPDATE_DETAILS.ui.version}.zip`,
+            expectedSize: EMULATOR_UPDATE_DETAILS.ui.expectedSize,
+            expectedChecksum: EMULATOR_UPDATE_DETAILS.ui.expectedChecksum,
+            skipCache: experiments.isEnabled("emulatoruisnapshot"),
+            skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"),
+            namePrefix: "ui",
         },
+    },
     pubsub: {
-        downloadPath: path.join(CACHE_DIR, "pubsub-emulator-0.1.0.zip"),
-        version: "0.1.0",
-        unzipDir: path.join(CACHE_DIR, "pubsub-emulator-0.1.0"),
-        binaryPath: path.join(CACHE_DIR, "pubsub-emulator-0.1.0", `pubsub-emulator/bin/cloud-pubsub-emulator${process.platform === "win32" ? ".bat" : ""}`),
+        downloadPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`),
+        version: EMULATOR_UPDATE_DETAILS.pubsub.version,
+        unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
+        binaryPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`, `pubsub-emulator/bin/cloud-pubsub-emulator${process.platform === "win32" ? ".bat" : ""}`),
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.1.0.zip",
-            expectedSize: 36623622,
-            expectedChecksum: "81704b24737d4968734d3e175f4cde71",
+            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`,
+            expectedSize: EMULATOR_UPDATE_DETAILS.pubsub.expectedSize,
+            expectedChecksum: EMULATOR_UPDATE_DETAILS.pubsub.expectedChecksum,
             namePrefix: "pubsub-emulator",
         },
     },