firebase-tools 12.4.3 → 12.4.4

package/lib/apiv2.js

@@ -233,6 +233,7 @@ class Client {
                     }
                     catch (thrown) {
                         const err = thrown instanceof Error ? thrown : new Error(thrown);
+                        logger_1.logger.debug(`*** [apiv2] error from fetch(${fetchURL}, ${JSON.stringify(fetchOptions)}): ${err}`);
                         const isAbortError = err.name.includes("AbortError");
                         if (isAbortError) {
                             throw new error_1.FirebaseError(`Timeout reached making request to ${fetchURL}`, {

package/lib/commands/database-instances-list.js

@@ -1,76 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const command_1 = require("../command");
 const Table = require("cli-table");
+const command_1 = require("../command");
 const clc = require("colorette");
 const ora = require("ora");
 const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
-const projectUtils_1 = require("../projectUtils");
-const firedata = require("../gcp/firedata");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const experiments = require("../experiments");
-const projectUtils_2 = require("../projectUtils");
+const projectUtils_1 = require("../projectUtils");
 const database_1 = require("../management/database");
-function logInstances(instances) {
-    if (instances.length === 0) {
-        logger_1.logger.info(clc.bold("No database instances found."));
-        return;
-    }
-    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
-    const table = new Table({ head: tableHead, style: { head: ["green"] } });
-    instances.forEach((db) => {
-        table.push([db.name, db.location, db.type, db.state]);
-    });
-    logger_1.logger.info(table.toString());
-}
-function logInstancesCount(count = 0) {
-    if (count === 0) {
-        return;
-    }
-    logger_1.logger.info("");
-    logger_1.logger.info(`${count} database instance(s) total.`);
-}
 exports.command = new command_1.Command("database:instances:list")
     .description("list realtime database instances, optionally filtered by a specified location")
     .before(requirePermissions_1.requirePermissions, ["firebasedatabase.instances.list"])
+    .option("-l, --location <location>", "(optional) location for the database instance, defaults to all regions")
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.DATABASE)
     .action(async (options) => {
     const location = (0, database_1.parseDatabaseLocation)(options.location, database_1.DatabaseLocation.ANY);
     const spinner = ora("Preparing the list of your Firebase Realtime Database instances" +
         `${location === database_1.DatabaseLocation.ANY ? "" : ` for location: ${location}`}`).start();
-    let instances;
-    if (experiments.isEnabled("rtdbmanagement")) {
-        const projectId = (0, projectUtils_2.needProjectId)(options);
-        try {
-            instances = await (0, database_1.listDatabaseInstances)(projectId, location);
-        }
-        catch (err) {
-            spinner.fail();
-            throw err;
-        }
-        spinner.succeed();
-        logInstances(instances);
-        logInstancesCount(instances.length);
-        return instances;
-    }
-    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    let instances = [];
     try {
-        instances = await firedata.listDatabaseInstances(projectNumber);
+        instances = await (0, database_1.listDatabaseInstances)(projectId, location);
     }
     catch (err) {
         spinner.fail();
         throw err;
     }
     spinner.succeed();
-    for (const instance of instances) {
-        logger_1.logger.info(instance.instance);
+    if (instances.length === 0) {
+        logger_1.logger.info(clc.bold("No database instances found."));
+        return;
+    }
+    if (!experiments.isEnabled("rtdbmanagement")) {
+        for (const instance of instances) {
+            logger_1.logger.info(instance.name);
+        }
+        logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+        return instances;
     }
-    logger_1.logger.info(`Project ${options.project} has ${instances.length} database instances`);
+    const tableHead = ["Database Instance Name", "Location", "Type", "State"];
+    const table = new Table({ head: tableHead, style: { head: ["green"] } });
+    for (const db of instances) {
+        table.push([db.name, db.location, db.type, db.state]);
+    }
+    logger_1.logger.info(table.toString());
+    logger_1.logger.info(`${instances.length} database instance(s) total.`);
     return instances;
 });
-if (experiments.isEnabled("rtdbmanagement")) {
-    exports.command = exports.command.option("-l, --location <location>", "(optional) location for the database instance, defaults to us-central1");
-}

package/lib/deploy/functions/prepare.js

@@ -295,7 +295,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         logger_1.logger.debug(`Building ${runtimeDelegate.name} source`);
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
-        (0, utils_1.logLabeledBullet)("functions", `Loading and anaylzing source code for codebase ${codebase} to determine what to deploy`);
+        (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
         wantBuilds[codebase] = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
         wantBuilds[codebase].runtime = codebaseConfig.runtime;
     }

package/lib/emulator/functionsRuntimeWorker.js

@@ -84,7 +84,7 @@ class RuntimeWorker {
             });
         });
     }
-    request(req, resp, body) {
+    request(req, resp, body, debug) {
         if (this.triggerKey !== FREE_WORKER_KEY) {
             this.logInfo(`Beginning execution of "${this.triggerKey}"`);
         }
@@ -124,6 +124,10 @@ class RuntimeWorker {
                 const piped = _resp.pipe(resp);
                 piped.on("finish", () => finishReq("finish"));
             });
+            if (debug) {
+                proxy.setSocketKeepAlive(false);
+                proxy.setTimeout(0);
+            }
             proxy.on("timeout", () => {
                 this.logger.log("ERROR", `Your function timed out after ~${this.timeoutSeconds}s. To configure this timeout, see
       https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`);
@@ -260,7 +264,7 @@ class RuntimeWorkerPool {
         if (debug) {
             await worker.sendDebugMsg(debug);
         }
-        return worker.request(req, resp, body);
+        return worker.request(req, resp, body, !!debug);
     }
     getIdleWorker(triggerId) {
         this.cleanUpWorkers();

package/lib/functionsShellCommandAction.js

@@ -7,7 +7,7 @@ const _ = require("lodash");
 const request = require("request");
 const util = require("util");
 const functions_1 = require("./serve/functions");
-const LocalFunction = require("./localFunction");
+const localFunction_1 = require("./localFunction");
 const utils = require("./utils");
 const logger_1 = require("./logger");
 const shell = require("./emulator/functionsEmulatorShell");
@@ -73,9 +73,9 @@ const actionFunction = async (options) => {
         const initializeContext = (context) => {
             for (const trigger of emulator.triggers) {
                 if (emulator.emulatedFunctions.includes(trigger.id)) {
-                    const localFunction = new LocalFunction(trigger, emulator.urls, emulator);
+                    const localFunction = new localFunction_1.default(trigger, emulator.urls, emulator);
                     const triggerNameDotNotation = trigger.name.replace(/-/g, ".");
-                    _.set(context, triggerNameDotNotation, localFunction.call);
+                    _.set(context, triggerNameDotNotation, localFunction.makeFn());
                 }
             }
             context.help =

package/lib/localFunction.js

@@ -1,191 +1,204 @@
 "use strict";
-var _ = require("lodash");
-var request = require("request");
-var { encodeFirestoreValue } = require("./firestore/encodeFirestoreValue");
-var utils = require("./utils");
-var LocalFunction = function (trigger, urls, controller) {
-    const isCallable = _.get(trigger, ["labels", "deployment-callable"], "false");
-    this.id = trigger.id;
-    this.name = trigger.name;
-    this.eventTrigger = trigger.eventTrigger;
-    this.httpsTrigger = trigger.httpsTrigger;
-    this.controller = controller;
-    this.url = _.get(urls, this.id);
-    if (this.httpsTrigger) {
-        if (isCallable == "true") {
-            this.call = this._constructCallableFunc.bind(this);
-        }
-        else {
-            this.call = request.defaults({
-                callback: this._requestCallBack,
-                baseUrl: this.url,
-                uri: "",
-            });
-        }
+Object.defineProperty(exports, "__esModule", { value: true });
+const request = require("request");
+const utils = require("./utils");
+const encodeFirestoreValue_1 = require("./firestore/encodeFirestoreValue");
+class LocalFunction {
+    constructor(trigger, urls, controller) {
+        this.trigger = trigger;
+        this.controller = controller;
+        this.paramWildcardRegex = new RegExp("{[^/{}]*}", "g");
+        this.url = urls[trigger.id];
     }
-    else {
-        this.call = this._call.bind(this);
-    }
-};
-LocalFunction.prototype._isDatabaseFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
-};
-LocalFunction.prototype._isFirestoreFunc = function (eventTrigger) {
-    return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
-};
-LocalFunction.prototype._substituteParams = function (resource, params) {
-    var wildcardRegex = new RegExp("{[^/{}]*}", "g");
-    return resource.replace(wildcardRegex, function (wildcard) {
-        var wildcardNoBraces = wildcard.slice(1, -1);
-        var sub = _.get(params, wildcardNoBraces);
-        return sub || wildcardNoBraces + utils.randomInt(1, 9);
-    });
-};
-LocalFunction.prototype._constructCallableFunc = function (data, opts) {
-    opts = opts || {};
-    var headers = {};
-    if (opts.instanceIdToken) {
-        headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+    substituteParams(resource, params) {
+        if (!params) {
+            return resource;
+        }
+        return resource.replace(this.paramWildcardRegex, (wildcard) => {
+            const wildcardNoBraces = wildcard.slice(1, -1);
+            const sub = params === null || params === void 0 ? void 0 : params[wildcardNoBraces];
+            return sub || `${wildcardNoBraces}${utils.randomInt(1, 9)}`;
+        });
     }
-    return request.post({
-        callback: this._requestCallBack,
-        baseUrl: this.url,
-        uri: "",
-        body: { data: data },
-        json: true,
-        headers: headers,
-    });
-};
-LocalFunction.prototype._constructAuth = function (auth, authType) {
-    if (_.get(auth, "admin") || _.get(auth, "variable")) {
-        return auth;
+    constructCallableFunc(data, opts) {
+        opts = opts || {};
+        const headers = {};
+        if (opts.instanceIdToken) {
+            headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
+        }
+        return request.post({
+            callback: (...args) => this.requestCallBack(...args),
+            baseUrl: this.url,
+            uri: "",
+            body: { data },
+            json: true,
+            headers: headers,
+        });
     }
-    if (typeof authType !== "undefined") {
-        switch (authType) {
-            case "USER":
-                return {
-                    variable: {
-                        uid: _.get(auth, "uid", ""),
-                        token: _.get(auth, "token", {}),
-                    },
-                };
-            case "ADMIN":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: true };
-            case "UNAUTHENTICATED":
-                if (_.get(auth, "uid") || _.get(auth, "token")) {
-                    throw new Error("authType and auth are incompatible.");
-                }
-                return { admin: false };
-            default:
-                throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+    constructAuth(auth, authType) {
+        var _a, _b, _c;
+        if ((auth === null || auth === void 0 ? void 0 : auth.admin) || (auth === null || auth === void 0 ? void 0 : auth.variable)) {
+            return {
+                admin: auth.admin || false,
+                variable: auth.variable,
+            };
         }
+        if (authType) {
+            switch (authType) {
+                case "USER":
+                    return {
+                        admin: false,
+                        variable: {
+                            uid: (_a = auth === null || auth === void 0 ? void 0 : auth.uid) !== null && _a !== void 0 ? _a : "",
+                            token: (_b = auth === null || auth === void 0 ? void 0 : auth.token) !== null && _b !== void 0 ? _b : {},
+                        },
+                    };
+                case "ADMIN":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: true };
+                case "UNAUTHENTICATED":
+                    if ((auth === null || auth === void 0 ? void 0 : auth.uid) || (auth === null || auth === void 0 ? void 0 : auth.token)) {
+                        throw new Error("authType and auth are incompatible.");
+                    }
+                    return { admin: false };
+                default:
+                    throw new Error("Unrecognized authType, valid values are: " + "ADMIN, USER, and UNAUTHENTICATED");
+            }
+        }
+        if (auth) {
+            return {
+                admin: false,
+                variable: {
+                    uid: (_c = auth.uid) !== null && _c !== void 0 ? _c : "",
+                    token: auth.token || {},
+                },
+            };
+        }
+        return { admin: true };
     }
-    if (auth) {
+    makeFirestoreValue(input) {
+        if (typeof input === "undefined" ||
+            input === null ||
+            (typeof input === "object" && Object.keys(input).length === 0)) {
+            return {};
+        }
+        if (typeof input !== "object") {
+            throw new Error("Firestore data must be key-value pairs.");
+        }
+        const currentTime = new Date().toISOString();
         return {
-            variable: {
-                uid: auth.uid,
-                token: auth.token || {},
-            },
+            fields: (0, encodeFirestoreValue_1.encodeFirestoreValue)(input),
+            createTime: currentTime,
+            updateTime: currentTime,
         };
     }
-    return { admin: true };
-};
-LocalFunction.prototype._makeFirestoreValue = function (input) {
-    if (typeof input === "undefined" || _.isEmpty(input)) {
-        return {};
-    }
-    if (typeof input !== "object") {
-        throw new Error("Firestore data must be key-value pairs.");
-    }
-    var currentTime = new Date().toISOString();
-    return {
-        fields: encodeFirestoreValue(input),
-        createTime: currentTime,
-        updateTime: currentTime,
-    };
-};
-LocalFunction.prototype._requestCallBack = function (err, response, body) {
-    if (err) {
-        return console.warn("\nERROR SENDING REQUEST: " + err);
-    }
-    var status = response ? response.statusCode + ", " : "";
-    var bodyString = body;
-    if (typeof body === "string") {
-        try {
-            bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+    requestCallBack(err, response, body) {
+        if (err) {
+            return console.warn("\nERROR SENDING REQUEST: " + err);
         }
-        catch (e) {
+        const status = response ? response.statusCode + ", " : "";
+        let bodyString = body;
+        if (typeof bodyString === "string") {
+            try {
+                bodyString = JSON.stringify(JSON.parse(bodyString), null, 2);
+            }
+            catch (e) {
+            }
+        }
+        else {
+            bodyString = JSON.stringify(body, null, 2);
         }
+        return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
     }
-    else {
-        bodyString = JSON.stringify(body, null, 2);
+    isDatabaseFn(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Database";
     }
-    return console.log("\nRESPONSE RECEIVED FROM FUNCTION: " + status + bodyString);
-};
-LocalFunction.prototype._call = function (data, opts) {
-    opts = opts || {};
-    var operationType;
-    var dataPayload;
-    if (this.httpsTrigger) {
-        this.controller.call(this.name, data || {});
+    isFirestoreFunc(eventTrigger) {
+        return utils.getFunctionsEventProvider(eventTrigger.eventType) === "Firestore";
     }
-    else if (this.eventTrigger) {
-        if (this._isDatabaseFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        data: null,
-                        delta: data,
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        data: data,
-                        delta: null,
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        data: data.before,
-                        delta: data.after,
-                    };
+    triggerEvent(data, opts) {
+        opts = opts || {};
+        let operationType;
+        let dataPayload;
+        if (this.trigger.httpsTrigger) {
+            this.controller.call(this.trigger.name, data || {}, opts);
+        }
+        else if (this.trigger.eventTrigger) {
+            if (this.isDatabaseFn(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            data: null,
+                            delta: data,
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            data: data,
+                            delta: null,
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            data: data.before,
+                            delta: data.after,
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                opts.auth = this.constructAuth(opts.auth, opts.authType);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else if (this.isFirestoreFunc(this.trigger.eventTrigger)) {
+                operationType = utils.last(this.trigger.eventTrigger.eventType.split("."));
+                switch (operationType) {
+                    case "create":
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data),
+                            oldValue: {},
+                        };
+                        break;
+                    case "delete":
+                        dataPayload = {
+                            value: {},
+                            oldValue: this.makeFirestoreValue(data),
+                        };
+                        break;
+                    default:
+                        dataPayload = {
+                            value: this.makeFirestoreValue(data.after),
+                            oldValue: this.makeFirestoreValue(data.before),
+                        };
+                }
+                opts.resource = this.substituteParams(this.trigger.eventTrigger.resource, opts.params);
+                this.controller.call(this.trigger.name, dataPayload, opts);
+            }
+            else {
+                this.controller.call(this.trigger.name, data || {}, opts);
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            opts.auth = this._constructAuth(opts.auth, opts.authType);
-            this.controller.call(this.name, dataPayload, opts);
         }
-        else if (this._isFirestoreFunc(this.eventTrigger)) {
-            operationType = utils.last(this.eventTrigger.eventType.split("."));
-            switch (operationType) {
-                case "create":
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data),
-                        oldValue: {},
-                    };
-                    break;
-                case "delete":
-                    dataPayload = {
-                        value: {},
-                        oldValue: this._makeFirestoreValue(data),
-                    };
-                    break;
-                default:
-                    dataPayload = {
-                        value: this._makeFirestoreValue(data.after),
-                        oldValue: this._makeFirestoreValue(data.before),
-                    };
+        return console.log("Successfully invoked function.");
+    }
+    makeFn() {
+        var _a;
+        if (this.trigger.httpsTrigger) {
+            const isCallable = !!((_a = this.trigger.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]);
+            if (isCallable) {
+                return (data, opt) => this.constructCallableFunc(data, opt);
+            }
+            else {
+                return request.defaults({
+                    callback: (...args) => this.requestCallBack(...args),
+                    baseUrl: this.url,
+                    uri: "",
+                });
             }
-            opts.resource = this._substituteParams(this.eventTrigger.resource, opts.params);
-            this.controller.call(this.name, dataPayload, opts);
         }
         else {
-            this.controller.call(this.name, data || {}, opts);
+            return (data, opt) => this.triggerEvent(data, opt);
         }
     }
-    return "Successfully invoked function.";
-};
-module.exports = LocalFunction;
+}
+exports.default = LocalFunction;

package/lib/requireAuth.js

@@ -24,6 +24,14 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
+    let clientEmail;
+    try {
+        const credentials = await client.getCredentials();
+        clientEmail = credentials.client_email;
+    }
+    catch (e) {
+        logger_1.logger.debug(`Error getting account credentials.`);
+    }
     if (!options.isVSCE && (0, monospace_1.isMonospaceEnv)()) {
         await (0, monospace_1.selectProjectInMonospace)({
             projectRoot: options.config.projectDir,
@@ -31,6 +39,7 @@ async function autoAuth(options, authScopes) {
             isVSCE: options.isVSCE,
         });
     }
+    return clientEmail;
 }
 async function requireAuth(options) {
     api.setScopes([scopes.CLOUD_PLATFORM, scopes.FIREBASE_PLATFORM]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.4.3",
+  "version": "12.4.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -103,7 +103,7 @@
     "request": "^2.87.0",
     "retry": "^0.13.1",
     "rimraf": "^3.0.0",
-    "semver": "^5.7.1",
+    "semver": "^7.5.2",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
     "strip-ansi": "^6.0.1",

package/standalone/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^2.4.2",
-    "npm": "^6.10.2",
+    "npm": "^9.8.0",
     "shelljs": "^0.8.3",
     "shx": "^0.3.2",
     "user-home": "^2.0.0"

package/lib/gcp/firedata.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listDatabaseInstances = void 0;
-const api_1 = require("../api");
-const apiv2_1 = require("../apiv2");
-const logger_1 = require("../logger");
-const utils = require("../utils");
-function _handleErrorResponse(response) {
-    if (response.body && response.body.error) {
-        return utils.reject(response.body.error, { code: 2 });
-    }
-    logger_1.logger.debug("[firedata] error:", response.status, response.body);
-    return utils.reject("Unexpected error encountered with FireData.", {
-        code: 2,
-    });
-}
-async function listDatabaseInstances(projectNumber) {
-    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
-    const response = await client.get(`/projects/${projectNumber}/databases`, {
-        resolveOnHTTPError: true,
-    });
-    if (response.status === 200) {
-        return response.body.instance;
-    }
-    return _handleErrorResponse(response);
-}
-exports.listDatabaseInstances = listDatabaseInstances;