firebase-tools 15.22.4 → 15.23.0

package/lib/hosting/proxy.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyRequestHandler = proxyRequestHandler;
 exports.errorRequestHandler = errorRequestHandler;
 const lodash_1 = require("lodash");
-const node_fetch_1 = require("node-fetch");
 const stream_1 = require("stream");
 const url_1 = require("url");
 const apiv2_1 = require("../apiv2");
@@ -41,7 +40,7 @@ function proxyRequestHandler(url, rewriteIdentifier, options = {}) {
             passThrough = new stream_1.PassThrough();
             req.pipe(passThrough);
         }
-        const headers = new node_fetch_1.Headers({
+        const headers = new Headers({
             "X-Forwarded-Host": req.headers.host || "",
             "X-Original-Url": req.url || "",
             Pragma: "no-cache",
@@ -83,13 +82,14 @@ function proxyRequestHandler(url, rewriteIdentifier, options = {}) {
             });
         }
         catch (err) {
+            logger_1.logger.error("[PROXY ERROR]", err);
             const isAbortError = err instanceof error_1.FirebaseError && err.original?.name.includes("AbortError");
             const isTimeoutError = err instanceof error_1.FirebaseError &&
-                err.original instanceof node_fetch_1.FetchError &&
-                err.original.code === "ETIMEDOUT";
+                (err.original?.code === "ETIMEDOUT" ||
+                    err.original?.cause?.code === "ETIMEDOUT");
             const isSocketTimeoutError = err instanceof error_1.FirebaseError &&
-                err.original instanceof node_fetch_1.FetchError &&
-                err.original.code === "ESOCKETTIMEDOUT";
+                (err.original?.code === "ESOCKETTIMEDOUT" ||
+                    err.original?.cause?.code === "ESOCKETTIMEDOUT");
             if (isAbortError || isTimeoutError || isSocketTimeoutError) {
                 res.statusCode = 504;
                 return res.end("Timed out waiting for function to respond.\n");
@@ -97,38 +97,60 @@ function proxyRequestHandler(url, rewriteIdentifier, options = {}) {
             res.statusCode = 500;
             return res.end(`An internal error occurred while proxying for ${rewriteIdentifier}\n`);
         }
+        finally {
+            if (passThrough) {
+                passThrough.resume();
+            }
+        }
+        const resHeaders = {};
+        for (const [key, value] of proxyRes.response.headers.entries()) {
+            resHeaders[key.toLowerCase()] = value;
+        }
         if (proxyRes.status === 404) {
-            const cascade = proxyRes.response.headers.get("x-cascade");
-            if (options.forceCascade || (cascade && cascade.toUpperCase() === "PASS")) {
+            const cascade = resHeaders["x-cascade"];
+            if (options.forceCascade ||
+                (typeof cascade === "string" && cascade.toUpperCase() === "PASS")) {
                 return next();
             }
         }
-        if (!proxyRes.response.headers.get("cache-control")) {
-            proxyRes.response.headers.set("cache-control", "private");
+        if (!resHeaders["cache-control"]) {
+            resHeaders["cache-control"] = "private";
         }
-        const cc = proxyRes.response.headers.get("cache-control");
-        if (cc && !cc.includes("private")) {
-            proxyRes.response.headers.delete("set-cookie");
+        const cc = resHeaders["cache-control"];
+        if (typeof cc === "string" && !cc.includes("private")) {
+            delete resHeaders["set-cookie"];
         }
-        proxyRes.response.headers.set("vary", makeVary(proxyRes.response.headers.get("vary")));
-        const location = proxyRes.response.headers.get("location");
-        if (location) {
+        const vary = resHeaders["vary"];
+        resHeaders["vary"] = makeVary(typeof vary === "string" ? vary : null);
+        const location = resHeaders["location"];
+        if (typeof location === "string" && location) {
             try {
                 const locationURL = new url_1.URL(location);
                 if (locationURL.origin === u.origin) {
                     const unborkedLocation = location.replace(locationURL.origin, "");
-                    proxyRes.response.headers.set("location", unborkedLocation);
+                    resHeaders["location"] = unborkedLocation;
                 }
             }
             catch (e) {
                 logger_1.logger.debug(`[hosting] had trouble parsing location header, but this may be okay: "${location}"`);
             }
         }
-        for (const [key, value] of Object.entries(proxyRes.response.headers.raw())) {
-            res.setHeader(key, value);
+        for (const key of Object.keys(resHeaders)) {
+            const value = resHeaders[key];
+            if (key === "set-cookie") {
+                if (typeof proxyRes.response.headers.getSetCookie === "function") {
+                    res.setHeader(key, proxyRes.response.headers.getSetCookie());
+                }
+                else {
+                    res.setHeader(key, value);
+                }
+            }
+            else {
+                res.setHeader(key, value);
+            }
         }
         res.statusCode = proxyRes.status;
-        proxyRes.response.body.pipe(res);
+        proxyRes.body.pipe(res);
     };
 }
 function errorRequestHandler(error) {

package/lib/management/apps.js

@@ -84,9 +84,11 @@ https://firebase.google.com/docs/flutter/setup
 async function initiateIosAppCreation(options) {
     if (!options.nonInteractive) {
         options.displayName = options.displayName || (await getDisplayName());
+        const promptAppStoreId = !options.bundleId;
         options.bundleId = options.bundleId || (await (0, prompt_1.input)("Please specify your iOS app bundle ID:"));
-        options.appStoreId =
-            options.appStoreId || (await (0, prompt_1.input)("Please specify your iOS app App Store ID:"));
+        if (promptAppStoreId && !options.appStoreId) {
+            options.appStoreId = await (0, prompt_1.input)("Please specify your iOS app App Store ID:");
+        }
     }
     if (!options.bundleId) {
         throw new error_1.FirebaseError("Bundle ID for iOS app cannot be empty");

package/lib/profiler.js

@@ -5,7 +5,6 @@ const fs = require("fs");
 const ora = require("ora");
 const readline = require("readline");
 const tmp = require("tmp");
-const abort_controller_1 = require("abort-controller");
 const apiv2_1 = require("./apiv2");
 const api_1 = require("./database/api");
 const logger_1 = require("./logger");
@@ -26,7 +25,7 @@ async function profiler(options) {
         color: "yellow",
     });
     const outputFormat = options.raw ? "RAW" : options.parent.json ? "JSON" : "TXT";
-    const controller = new abort_controller_1.default();
+    const controller = new AbortController();
     const generateReport = () => {
         rl.close();
         spinner.stop();

package/lib/streamUtils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringToStream = stringToStream;
+exports.streamToString = streamToString;
+const stream_1 = require("stream");
+function stringToStream(text) {
+    if (!text) {
+        return undefined;
+    }
+    const s = new stream_1.Readable();
+    s.push(text);
+    s.push(null);
+    return s;
+}
+function streamToString(s) {
+    return new Promise((resolve, reject) => {
+        let b = "";
+        s.on("error", reject);
+        s.on("data", (d) => {
+            b += d.toString();
+        });
+        s.once("end", () => resolve(b));
+    });
+}

package/lib/track.js

@@ -8,7 +8,6 @@ exports.trackVSCode = trackVSCode;
 exports.emulatorSession = emulatorSession;
 exports.vscodeSession = vscodeSession;
 exports.cliSession = cliSession;
-const node_fetch_1 = require("node-fetch");
 const crypto_1 = require("crypto");
 const auth_1 = require("./auth");
 const configstore_1 = require("./configstore");
@@ -134,7 +133,7 @@ async function _ga4Track(args) {
         logger_1.logger.info(`Sending Analytics for event ${eventName} to property ${session.measurementId}`, params, body);
     }
     try {
-        const response = await (0, node_fetch_1.default)(url, {
+        const response = await fetch(url, {
             method: "POST",
             headers: {
                 "content-type": "application/json;charset=UTF-8",