firebase-tools 11.2.0 → 11.3.0

package/lib/emulator/functionsEmulatorRuntime.js

@@ -104,7 +104,7 @@ class Proxied {
         return this.proxy;
     }
 }
-async function resolveDeveloperNodeModule(frb, name) {
+async function resolveDeveloperNodeModule(name) {
     const pkg = requirePackageJson();
     if (!pkg) {
         new types_1.EmulatorLog("SYSTEM", "missing-package-json", "").log();
@@ -130,20 +130,20 @@ async function resolveDeveloperNodeModule(frb, name) {
     logDebug(`Resolved module ${name}`, moduleResolution);
     return moduleResolution;
 }
-async function assertResolveDeveloperNodeModule(frb, name) {
-    const resolution = await resolveDeveloperNodeModule(frb, name);
+async function assertResolveDeveloperNodeModule(name) {
+    const resolution = await resolveDeveloperNodeModule(name);
     if (!(resolution.installed && resolution.declared && resolution.resolution && resolution.version)) {
         throw new Error(`Assertion failure: could not fully resolve ${name}: ${JSON.stringify(resolution)}`);
     }
     return resolution;
 }
-async function verifyDeveloperNodeModules(frb) {
+async function verifyDeveloperNodeModules() {
     const modBundles = [
         { name: "firebase-admin", isDev: false, minVersion: "8.9.0" },
         { name: "firebase-functions", isDev: false, minVersion: "3.13.1" },
     ];
     for (const modBundle of modBundles) {
-        const resolution = await resolveDeveloperNodeModule(frb, modBundle.name);
+        const resolution = await resolveDeveloperNodeModule(modBundle.name);
         if (!resolution.declared) {
             new types_1.EmulatorLog("SYSTEM", "missing-module", "", modBundle).log();
             return false;
@@ -240,8 +240,8 @@ function initializeNetworkFiltering() {
     });
     logDebug("Outgoing network have been stubbed.", results);
 }
-async function initializeFirebaseFunctionsStubs(frb) {
-    const firebaseFunctionsResolution = await assertResolveDeveloperNodeModule(frb, "firebase-functions");
+async function initializeFirebaseFunctionsStubs() {
+    const firebaseFunctionsResolution = await assertResolveDeveloperNodeModule("firebase-functions");
     const firebaseFunctionsRoot = (0, functionsEmulatorShared_1.findModuleRoot)("firebase-functions", firebaseFunctionsResolution.resolution);
     const httpsProviderResolution = path.join(firebaseFunctionsRoot, "lib/providers/https");
     const httpsProviderV1Resolution = path.join(firebaseFunctionsRoot, "lib/v1/providers/https");
@@ -343,10 +343,10 @@ function initializeRuntimeConfig() {
         }
     }
 }
-async function initializeFirebaseAdminStubs(frb) {
-    const adminResolution = await assertResolveDeveloperNodeModule(frb, "firebase-admin");
+async function initializeFirebaseAdminStubs() {
+    const adminResolution = await assertResolveDeveloperNodeModule("firebase-admin");
     const localAdminModule = require(adminResolution.resolution);
-    const functionsResolution = await assertResolveDeveloperNodeModule(frb, "firebase-functions");
+    const functionsResolution = await assertResolveDeveloperNodeModule("firebase-functions");
     const localFunctionsModule = require(functionsResolution.resolution);
     const defaultConfig = getDefaultConfig();
     const adminModuleProxy = new Proxied(localAdminModule);
@@ -360,7 +360,7 @@ async function initializeFirebaseAdminStubs(frb) {
         new types_1.EmulatorLog("SYSTEM", "default-admin-app-used", `config=${defaultAppOptions}`, {
             opts: defaultAppOptions,
         }).log();
-        const defaultApp = makeProxiedFirebaseApp(frb, adminModuleTarget.initializeApp(defaultAppOptions));
+        const defaultApp = makeProxiedFirebaseApp(adminModuleTarget.initializeApp(defaultAppOptions));
         logDebug("initializeApp(DEFAULT)", defaultAppOptions);
         localFunctionsModule.app.setEmulatedAdminApp(defaultApp);
         if (process.env[constants_1.Constants.FIREBASE_AUTH_EMULATOR_HOST]) {
@@ -405,7 +405,7 @@ async function initializeFirebaseAdminStubs(frb) {
         adminResolution,
     });
 }
-function makeProxiedFirebaseApp(frb, original) {
+function makeProxiedFirebaseApp(original) {
     const appProxy = new Proxied(original);
     return appProxy
         .when("firestore", (target) => {
@@ -450,8 +450,8 @@ function warnAboutStorageProd() {
     }
     new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Firebase Storage emulator is not running, so calls to Firebase Storage will affect production.").log();
 }
-async function initializeFunctionsConfigHelper(frb) {
-    const functionsResolution = await assertResolveDeveloperNodeModule(frb, "firebase-functions");
+async function initializeFunctionsConfigHelper() {
+    const functionsResolution = await assertResolveDeveloperNodeModule("firebase-functions");
     const localFunctionsModule = require(functionsResolution.resolution);
     logDebug("Checked functions.config()", {
         config: localFunctionsModule.config(),
@@ -485,34 +485,9 @@ async function initializeFunctionsConfigHelper(frb) {
 function rawBodySaver(req, res, buf) {
     req.rawBody = buf;
 }
-async function processHTTPS(trigger, frb) {
+async function processHTTPS(trigger) {
     const ephemeralServer = express();
-    const functionRouter = express.Router();
-    const socketPath = frb.socketPath;
-    if (!socketPath) {
-        new types_1.EmulatorLog("FATAL", "runtime-error", "Called processHTTPS with no socketPath").log();
-        return;
-    }
     await new Promise((resolveEphemeralServer, rejectEphemeralServer) => {
-        const handler = async (req, res) => {
-            try {
-                logDebug(`Ephemeral server handling ${req.method} request`);
-                res.on("finish", () => {
-                    instance.close((err) => {
-                        if (err) {
-                            rejectEphemeralServer(err);
-                        }
-                        else {
-                            resolveEphemeralServer();
-                        }
-                    });
-                });
-                await runHTTPS(trigger, [req, res]);
-            }
-            catch (err) {
-                rejectEphemeralServer(err);
-            }
-        };
         ephemeralServer.enable("trust proxy");
         ephemeralServer.use(bodyParser.json({
             limit: "10mb",
@@ -532,13 +507,39 @@ async function processHTTPS(trigger, frb) {
             limit: "10mb",
             verify: rawBodySaver,
         }));
-        functionRouter.all("*", handler);
-        ephemeralServer.use([`/`, `/*`], functionRouter);
-        logDebug(`Attempting to listen to socketPath: ${socketPath}`);
-        const instance = ephemeralServer.listen(socketPath, () => {
-            new types_1.EmulatorLog("SYSTEM", "runtime-status", "ready", { state: "ready" }).log();
+        let server;
+        function closeServer() {
+            if (server) {
+                server.close((err) => {
+                    if (err) {
+                        rejectEphemeralServer(err);
+                    }
+                    else {
+                        resolveEphemeralServer();
+                    }
+                });
+            }
+        }
+        ephemeralServer.get("/__/health", (req, res) => {
+            res.status(200).send();
+        });
+        ephemeralServer.all("/favicon.ico|/robots.txt", (req, res) => {
+            res.on("finish", closeServer);
+            res.status(404).send();
+        });
+        ephemeralServer.all(`/*`, async (req, res) => {
+            try {
+                logDebug(`Ephemeral server handling ${req.method} request`);
+                res.on("finish", closeServer);
+                await runHTTPS(trigger, [req, res]);
+            }
+            catch (err) {
+                rejectEphemeralServer(err);
+            }
         });
-        instance.on("error", rejectEphemeralServer);
+        logDebug(`Attempting to listen to port: ${process.env.PORT}`);
+        server = ephemeralServer.listen(process.env.PORT);
+        server.on("error", rejectEphemeralServer);
     });
 }
 async function processBackground(trigger, frb, signature) {
@@ -591,7 +592,7 @@ async function runHTTPS(trigger, args) {
         return trigger(args[0], args[1]);
     });
 }
-async function moduleResolutionDetective(frb, error) {
+async function moduleResolutionDetective(error) {
     const clues = {
         tsconfigJSON: await requireAsync("./tsconfig.json", { paths: [process.cwd()] }).catch(noOp),
         packageJSON: await requireAsync("./package.json", { paths: [process.cwd()] }).catch(noOp),
@@ -640,7 +641,7 @@ async function invokeTrigger(trigger, frb) {
             await processBackground(trigger, frb, FUNCTION_SIGNATURE);
             break;
         case "http":
-            await processHTTPS(trigger, frb);
+            await processHTTPS(trigger);
             break;
     }
     if (timeoutId) {
@@ -649,7 +650,7 @@ async function invokeTrigger(trigger, frb) {
     clearInterval(timerId);
     new types_1.EmulatorLog("INFO", "runtime-status", `Finished "${FUNCTION_TARGET_NAME}" in ~${Math.max(seconds, 1)}s`).log();
 }
-async function initializeRuntime(frb) {
+async function initializeRuntime() {
     FUNCTION_DEBUG_MODE = process.env.FUNCTION_DEBUG_MODE || "";
     if (!FUNCTION_DEBUG_MODE) {
         FUNCTION_TARGET_NAME = process.env.FUNCTION_TARGET || "";
@@ -663,19 +664,18 @@ async function initializeRuntime(frb) {
             await flushAndExit(1);
         }
     }
-    logDebug(`Disabled runtime features: ${JSON.stringify(frb.disabled_features)}`);
-    const verified = await verifyDeveloperNodeModules(frb);
+    const verified = await verifyDeveloperNodeModules();
     if (!verified) {
         new types_1.EmulatorLog("INFO", "runtime-status", `Your functions could not be parsed due to an issue with your node_modules (see above)`).log();
         return;
     }
     initializeRuntimeConfig();
     initializeNetworkFiltering();
-    await initializeFunctionsConfigHelper(frb);
-    await initializeFirebaseFunctionsStubs(frb);
-    await initializeFirebaseAdminStubs(frb);
+    await initializeFunctionsConfigHelper();
+    await initializeFirebaseFunctionsStubs();
+    await initializeFirebaseAdminStubs();
 }
-async function loadTriggers(frb, serializedFunctionTrigger) {
+async function loadTriggers(serializedFunctionTrigger) {
     let triggerModule;
     if (serializedFunctionTrigger) {
         triggerModule = eval(serializedFunctionTrigger)();
@@ -686,7 +686,7 @@ async function loadTriggers(frb, serializedFunctionTrigger) {
         }
         catch (err) {
             if (err.code !== "ERR_REQUIRE_ESM") {
-                await moduleResolutionDetective(frb, err);
+                await moduleResolutionDetective(err);
                 throw err;
             }
             const modulePath = require.resolve(process.cwd());
@@ -716,9 +716,8 @@ async function handleMessage(message) {
     }
     if (!functionModule) {
         try {
-            await initializeRuntime(runtimeArgs.frb);
             const serializedTriggers = runtimeArgs.opts ? runtimeArgs.opts.serializedTriggers : undefined;
-            functionModule = await loadTriggers(runtimeArgs.frb, serializedTriggers);
+            functionModule = await loadTriggers(serializedTriggers);
         }
         catch (e) {
             logDebug(e);
@@ -752,7 +751,7 @@ async function handleMessage(message) {
         await flushAndExit(1);
     }
 }
-function main() {
+async function main() {
     let lastSignal = new Date().getTime();
     let signalCount = 0;
     process.on("SIGINT", () => {
@@ -766,10 +765,7 @@ function main() {
             process.exit(1);
         }
     });
-    logDebug("Functions runtime initialized.", {
-        cwd: process.cwd(),
-        node_version: process.versions.node,
-    });
+    await initializeRuntime();
     let messageHandlePromise = Promise.resolve();
     process.on("message", (message) => {
         messageHandlePromise = messageHandlePromise
@@ -784,5 +780,15 @@ function main() {
     });
 }
 if (require.main === module) {
-    main();
+    main()
+        .then(() => {
+        logDebug("Functions runtime initialized.", {
+            cwd: process.cwd(),
+            node_version: process.versions.node,
+        });
+    })
+        .catch((err) => {
+        new types_1.EmulatorLog("FATAL", "runtime-error", err.message || err, err).log();
+        return flushAndExit(1);
+    });
 }

package/lib/emulator/functionsEmulatorShared.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBackendInfo = exports.getSecretLocalPath = exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.emulatedFunctionsFromEndpoints = exports.prepareEndpoints = exports.EmulatedTrigger = exports.HttpConstants = void 0;
-const _ = require("lodash");
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
+const crypto_1 = require("crypto");
+const _ = require("lodash");
 const backend = require("../deploy/functions/backend");
 const constants_1 = require("./constants");
 const proto_1 = require("../gcp/proto");
@@ -142,12 +143,13 @@ function getEmulatedTriggersFromDefinitions(definitions, module) {
     }, {});
 }
 exports.getEmulatedTriggersFromDefinitions = getEmulatedTriggersFromDefinitions;
-function getTemporarySocketPath(pid, cwd) {
+function getTemporarySocketPath() {
+    const rand = (0, crypto_1.randomBytes)(8).toString("hex");
     if (process.platform === "win32") {
-        return path.join("\\\\?\\pipe", cwd, pid.toString());
+        return path.join("\\\\?\\pipe", `fire_emu_${rand}`);
     }
     else {
-        return path.join(os.tmpdir(), `fire_emu_${pid.toString()}.sock`);
+        return path.join(os.tmpdir(), `fire_emu_${rand}.sock`);
     }
 }
 exports.getTemporarySocketPath = getTemporarySocketPath;
@@ -239,7 +241,7 @@ function formatHost(info) {
 }
 exports.formatHost = formatHost;
 function getSignatureType(def) {
-    if (def.httpsTrigger) {
+    if (def.httpsTrigger || def.blockingTrigger) {
         return "http";
     }
     return def.platform === "gcfv2" ? "cloudevent" : "event";

package/lib/emulator/functionsRuntimeWorker.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeWorkerPool = exports.RuntimeWorker = exports.RuntimeWorkerState = void 0;
+const http = require("http");
 const uuid = require("uuid");
 const types_1 = require("./types");
-const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const events_1 = require("events");
 const emulatorLogger_1 = require("./emulatorLogger");
 const error_1 = require("../error");
@@ -42,30 +42,19 @@ class RuntimeWorker {
     }
     execute(frb, opts) {
         const execFrb = Object.assign({}, frb);
-        if (!execFrb.socketPath) {
-            execFrb.socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)(this.runtime.pid, this.runtime.cwd);
-            this.log(`Assigning socketPath: ${execFrb.socketPath}`);
-        }
         const args = { frb: execFrb, opts };
         this.state = RuntimeWorkerState.BUSY;
-        this.lastArgs = args;
         this.runtime.send(args);
     }
     get state() {
         return this._state;
     }
     set state(state) {
-        if (state === RuntimeWorkerState.BUSY) {
-            this.socketReady = types_1.EmulatorLog.waitForLog(this.runtime.events, "SYSTEM", "runtime-status", (el) => {
-                return el.data.state === "ready";
-            });
-        }
         if (state === RuntimeWorkerState.IDLE) {
             for (const l of this.logListeners) {
                 this.runtime.events.removeListener("log", l);
             }
             this.logListeners = [];
-            this.socketReady = undefined;
         }
         if (state === RuntimeWorkerState.FINISHED) {
             this.runtime.events.removeAllListeners();
@@ -94,9 +83,40 @@ class RuntimeWorker {
             this.stateEvents.once(RuntimeWorkerState.FINISHED, listener);
         });
     }
-    waitForSocketReady() {
-        return (this.socketReady ||
-            Promise.reject(new Error("Cannot call waitForSocketReady() if runtime is not BUSY")));
+    isSocketReady() {
+        return new Promise((resolve, reject) => {
+            const req = http
+                .request({
+                method: "GET",
+                path: "/__/health",
+                socketPath: this.runtime.socketPath,
+            }, () => resolve())
+                .end();
+            req.on("error", (error) => {
+                reject(error);
+            });
+        });
+    }
+    async waitForSocketReady() {
+        const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+        const timeout = new Promise((resolve, reject) => {
+            setTimeout(() => {
+                reject(new error_1.FirebaseError("Failed to load function."));
+            }, 7000);
+        });
+        while (true) {
+            try {
+                await Promise.race([this.isSocketReady(), timeout]);
+                break;
+            }
+            catch (err) {
+                if (["ECONNREFUSED", "ENOENT"].includes(err === null || err === void 0 ? void 0 : err.code)) {
+                    await sleep(100);
+                    continue;
+                }
+                throw err;
+            }
+        }
     }
     log(msg) {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("DEBUG", `[worker-${this.key}-${this.id}]: ${msg}`);

package/lib/emulator/storage/apis/gcloud.js

@@ -324,7 +324,7 @@ function sendFileBytes(md, data, req, res) {
     res.setHeader("Accept-Ranges", "bytes");
     res.setHeader("Content-Type", md.contentType);
     res.setHeader("Content-Disposition", md.contentDisposition);
-    res.setHeader("Content-Encoding", md.contentEncoding);
+    res.setHeader("Content-Encoding", isGZipped ? "identity" : md.contentEncoding);
     res.setHeader("ETag", md.etag);
     res.setHeader("Cache-Control", md.cacheControl);
     res.setHeader("x-goog-generation", `${md.generation}`);

package/lib/extensions/etags.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectEtagChanges = exports.saveEtags = void 0;
+function saveEtags(rc, projectId, instances) {
+    rc.setEtags(projectId, "extensionInstances", etagsMap(instances));
+}
+exports.saveEtags = saveEtags;
+function detectEtagChanges(rc, projectId, instances) {
+    const lastDeployedEtags = rc.getEtags(projectId).extensionInstances;
+    const currentEtags = etagsMap(instances);
+    if (!lastDeployedEtags || !Object.keys(lastDeployedEtags).length) {
+        return [];
+    }
+    const changedExtensionInstances = Object.entries(lastDeployedEtags)
+        .filter(([instanceName, etag]) => etag !== currentEtags[instanceName])
+        .map((i) => i[0]);
+    const newExtensionInstances = Object.keys(currentEtags).filter((instanceName) => !lastDeployedEtags[instanceName]);
+    return newExtensionInstances.concat(changedExtensionInstances);
+}
+exports.detectEtagChanges = detectEtagChanges;
+function etagsMap(instances) {
+    return instances.reduce((acc, i) => {
+        if (i.etag) {
+            acc[i.instanceId] = i.etag;
+        }
+        return acc;
+    }, {});
+}

package/lib/extensions/warnings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
+exports.outOfBandChangesWarning = exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
 const clc = require("cli-color");
 const types_1 = require("./types");
@@ -75,3 +75,9 @@ function paramsFlagDeprecationWarning() {
         "See https://firebase.google.com/docs/extensions/manifest for more details");
 }
 exports.paramsFlagDeprecationWarning = paramsFlagDeprecationWarning;
+function outOfBandChangesWarning(instanceIds) {
+    logger_1.logger.warn("The following instances may have been changed in the Firebase console or by another machine since the last deploy from this machine.\n\t" +
+        clc.bold(instanceIds.join("\n\t")) +
+        "\nIf you proceed with this deployment, those changes will be overwritten. To avoid this, run `firebase ext:export` to sync these changes to your local extensions manifest.");
+}
+exports.outOfBandChangesWarning = outOfBandChangesWarning;

package/lib/functions/env.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadFirebaseEnvs = exports.loadUserEnvs = exports.hasUserEnvs = exports.parseStrict = exports.validateKey = exports.KeyValidationError = exports.parse = void 0;
+exports.loadFirebaseEnvs = exports.loadUserEnvs = exports.writeUserEnvs = exports.hasUserEnvs = exports.parseStrict = exports.validateKey = exports.KeyValidationError = exports.parse = void 0;
 const clc = require("cli-color");
 const fs = require("fs");
 const path = require("path");
@@ -145,6 +145,10 @@ function hasUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, })
     return findEnvfiles(functionsSource, projectId, projectAlias, isEmulator).length > 0;
 }
 exports.hasUserEnvs = hasUserEnvs;
+function writeUserEnvs(toWrite, envOpts) {
+    throw new error_1.FirebaseError("Persisting user-defined parameters to .env files is not yet implemented.");
+}
+exports.writeUserEnvs = writeUserEnvs;
 function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
     var _a;
     const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);

package/lib/functionsConfig.js

@@ -70,7 +70,7 @@ async function setVariablesRecursive(projectId, configId, varPath, val) {
         catch (e) {
         }
     }
-    if (_.isPlainObject(parsed)) {
+    if (typeof parsed === "object" && parsed !== null) {
         return Promise.all(Object.entries(parsed).map(([key, item]) => {
             const newVarPath = varPath ? [varPath, key].join("/") : key;
             return setVariablesRecursive(projectId, configId, newVarPath, item);

package/lib/gcp/rules.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testRuleset = exports.updateOrCreateRelease = exports.updateRelease = exports.createRelease = exports.createRuleset = exports.deleteRuleset = exports.getRulesetId = exports.listAllRulesets = exports.listRulesets = exports.getRulesetContent = exports.listAllReleases = exports.listReleases = exports.getLatestRulesetName = void 0;
-const _ = require("lodash");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
@@ -51,7 +50,7 @@ async function listAllReleases(projectId) {
         }
         pageToken = response.nextPageToken;
     } while (pageToken);
-    return _.orderBy(releases, ["createTime"], ["desc"]);
+    return releases.sort((a, b) => b.createTime.localeCompare(a.createTime));
 }
 exports.listAllReleases = listAllReleases;
 async function getRulesetContent(name) {
@@ -90,7 +89,7 @@ async function listAllRulesets(projectId) {
         }
         pageToken = response.nextPageToken;
     } while (pageToken);
-    return _.orderBy(rulesets, ["createTime"], ["desc"]);
+    return rulesets.sort((a, b) => b.createTime.localeCompare(a.createTime));
 }
 exports.listAllRulesets = listAllRulesets;
 function getRulesetId(ruleset) {

package/lib/gcp/runtimeconfig.js

@@ -48,7 +48,7 @@ function listVariables(configPath) {
         retryCodes: [500, 503],
     })
         .then((resp) => {
-        return Promise.resolve(resp.body.variables);
+        return Promise.resolve(resp.body.variables || []);
     });
 }
 function getVariable(varPath) {

package/lib/hosting/api.js

@@ -43,7 +43,7 @@ async function getChannel(project = "-", site, channelId) {
         return res.body;
     }
     catch (e) {
-        if (e.status === 404) {
+        if (e instanceof error_1.FirebaseError && e.status === 404) {
             return null;
         }
         throw e;
@@ -51,23 +51,22 @@ async function getChannel(project = "-", site, channelId) {
 }
 exports.getChannel = getChannel;
 async function listChannels(project = "-", site) {
-    var _a, _b;
     const channels = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites/${site}/channels`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = (_a = res.body) === null || _a === void 0 ? void 0 : _a.channels;
+            const c = res.body.channels;
             if (c) {
                 channels.push(...c);
             }
-            nextPageToken = ((_b = res.body) === null || _b === void 0 ? void 0 : _b.nextPageToken) || "";
+            nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return channels;
             }
         }
         catch (e) {
-            if (e.status === 404) {
+            if (e instanceof error_1.FirebaseError && e.status === 404) {
                 throw new error_1.FirebaseError(`could not find channels for site "${site}"`, {
                     original: e,
                 });
@@ -116,23 +115,22 @@ async function createRelease(site, channel, version) {
 }
 exports.createRelease = createRelease;
 async function listSites(project) {
-    var _a, _b;
     const sites = [];
     let nextPageToken = "";
     for (;;) {
         try {
             const res = await apiClient.get(`/projects/${project}/sites`, { queryParams: { pageToken: nextPageToken, pageSize: 10 } });
-            const c = (_a = res.body) === null || _a === void 0 ? void 0 : _a.sites;
+            const c = res.body.sites;
             if (c) {
                 sites.push(...c);
             }
-            nextPageToken = ((_b = res.body) === null || _b === void 0 ? void 0 : _b.nextPageToken) || "";
+            nextPageToken = res.body.nextPageToken || "";
             if (!nextPageToken) {
                 return sites;
             }
         }
         catch (e) {
-            if (e.status === 404) {
+            if (e instanceof error_1.FirebaseError && e.status === 404) {
                 throw new error_1.FirebaseError(`could not find sites for project "${project}"`, {
                     original: e,
                 });
@@ -148,7 +146,7 @@ async function getSite(project, site) {
         return res.body;
     }
     catch (e) {
-        if (e.status === 404) {
+        if (e instanceof error_1.FirebaseError && e.status === 404) {
             throw new error_1.FirebaseError(`could not find site "${site}" for project "${project}"`, {
                 original: e,
             });
@@ -158,7 +156,7 @@ async function getSite(project, site) {
 }
 exports.getSite = getSite;
 async function createSite(project, site, appId = "") {
-    const res = await apiClient.post(`/projects/${project}/sites`, { appId: appId }, { queryParams: { site_id: site } });
+    const res = await apiClient.post(`/projects/${project}/sites`, { appId: appId }, { queryParams: { siteId: site } });
     return res.body;
 }
 exports.createSite = createSite;

package/lib/hosting/expireUtils.js

@@ -16,8 +16,8 @@ const DURATIONS = {
 };
 exports.MAX_DURATION = 30 * Duration.DAY;
 exports.DEFAULT_DURATION = 7 * Duration.DAY;
-function calculateChannelExpireTTL(flag) {
-    const match = exports.DURATION_REGEX.exec(flag || "");
+function calculateChannelExpireTTL(flag = "") {
+    const match = exports.DURATION_REGEX.exec(flag);
     if (!match) {
         throw new error_1.FirebaseError(`"expires" flag must be a duration string (e.g. 24h or 7d) at most 30d`);
     }

package/lib/management/projects.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseProject = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.PROJECTS_CREATE_QUESTIONS = exports.ProjectParentResourceType = void 0;
-const _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
 const apiv2_1 = require("../apiv2");
@@ -110,15 +109,15 @@ async function selectProjectByPrompting() {
     return await getFirebaseProject(projectId);
 }
 async function selectProjectFromList(projects = []) {
-    let choices = projects
+    const choices = projects
         .filter((p) => !!p)
         .map((p) => {
         return {
             name: p.projectId + (p.displayName ? ` (${p.displayName})` : ""),
             value: p.projectId,
         };
-    });
-    choices = _.orderBy(choices, ["name"], ["asc"]);
+    })
+        .sort((a, b) => a.name.localeCompare(b.name));
     if (choices.length >= 25) {
         utils.logBullet(`Don't want to scroll through all your projects? If you know your project ID, ` +
             `you can initialize it directly using ${clc.bold("firebase init --project <project_id>")}.\n`);
@@ -151,7 +150,7 @@ async function promptAvailableProjectId() {
         });
     }
     else {
-        let choices = projects
+        const choices = projects
             .filter((p) => !!p)
             .map((p) => {
             const projectId = getProjectId(p);
@@ -159,8 +158,8 @@ async function promptAvailableProjectId() {
                 name: projectId + (p.displayName ? ` (${p.displayName})` : ""),
                 value: projectId,
             };
-        });
-        choices = _.orderBy(choices, ["name"], ["asc"]);
+        })
+            .sort((a, b) => a.name.localeCompare(b.name));
         return await (0, prompt_1.promptOnce)({
             type: "list",
             name: "id",