firebase-tools 11.25.1 → 11.25.3

package/lib/accountExporter.js

@@ -77,7 +77,9 @@ function transUserToArray(user) {
     arr[24] = user.lastLoginAt;
     arr[25] = user.phoneNumber;
     arr[26] = user.disabled;
-    arr[27] = user.customAttributes;
+    arr[27] = user.customAttributes
+        ? `"${user.customAttributes.replace(/(?<!\\)"/g, '""')}"`
+        : user.customAttributes;
     return arr;
 }
 function transUserJson(user) {

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "311609538bd65666eb724ef47c2e6466",
     },
     firestore: {
-        version: "1.16.0",
-        expectedSize: 63422812,
-        expectedChecksum: "6c1a43c1b327d534f83f7386c595d7ff",
+        version: "1.16.2",
+        expectedSize: 64601019,
+        expectedChecksum: "83f379a5b3d367503a860497fea3a936",
     },
     storage: {
         version: "1.1.3",
@@ -35,9 +35,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.11.4",
-            expectedSize: 3062916,
-            expectedChecksum: "1773926323b07fdb9602d882a7682882",
+            version: "1.11.5",
+            expectedSize: 3063444,
+            expectedChecksum: "4045fef65cf71fb9d83b01fb8b160141",
         },
     pubsub: {
         version: "0.7.1",

package/lib/frameworks/angular/index.js

@@ -8,7 +8,6 @@ const fs_extra_1 = require("fs-extra");
 const promises_1 = require("fs/promises");
 const __1 = require("..");
 const prompt_1 = require("../../prompt");
-const proxy_1 = require("../../hosting/proxy");
 const utils_1 = require("../utils");
 exports.name = "Angular";
 exports.support = "experimental";
@@ -87,7 +86,7 @@ async function getDevModeHandle(dir) {
             process.stderr.write(data);
         });
     });
-    return (0, proxy_1.proxyRequestHandler)(await host, "Angular Live Development Server", { forceCascade: true });
+    return (0, utils_1.simpleProxy)(await host);
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {

package/lib/frameworks/docs/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/frameworks/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerResponseProxy = exports.prepareFrameworks = exports.findDependency = exports.discover = exports.relativeRequire = exports.WebFrameworks = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.NODE_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = void 0;
+exports.prepareFrameworks = exports.findDependency = exports.discover = exports.relativeRequire = exports.WebFrameworks = exports.ALLOWED_SSR_REGIONS = exports.DEFAULT_REGION = exports.NODE_VERSION = exports.FIREBASE_ADMIN_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.FIREBASE_FRAMEWORKS_VERSION = void 0;
 const path_1 = require("path");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
 const fs_1 = require("fs");
 const url_1 = require("url");
-const http_1 = require("http");
 const promises_1 = require("fs/promises");
 const fs_extra_1 = require("fs-extra");
 const clc = require("colorette");
@@ -236,8 +235,9 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
                 }
             }
         }
-        if (firebaseDefaults)
+        if (firebaseDefaults) {
             process.env.__FIREBASE_DEFAULTS__ = JSON.stringify(firebaseDefaults);
+        }
         const results = await discover(getProjectPath());
         if (!results)
             throw new Error("Epic fail.");
@@ -273,8 +273,10 @@ async function prepareFrameworks(targetNames, context, options, emulators = [])
         }
         config.webFramework = `${framework}${codegenFunctionsDirectory ? "_ssr" : ""}`;
         if (codegenFunctionsDirectory) {
-            if (firebaseDefaults)
+            if (firebaseDefaults) {
                 firebaseDefaults._authTokenSyncURL = "/__session";
+                process.env.__FIREBASE_DEFAULTS__ = JSON.stringify(firebaseDefaults);
+            }
             const rewrite = {
                 source: "**",
                 function: {
@@ -416,47 +418,3 @@ function codegenDevModeFunctionsDirectory() {
     const packageJson = {};
     return Promise.resolve({ packageJson, frameworksEntry: "_devMode" });
 }
-function createServerResponseProxy(req, res, next) {
-    const proxiedRes = new http_1.ServerResponse(req);
-    const buffer = [];
-    proxiedRes.write = new Proxy(proxiedRes.write.bind(proxiedRes), {
-        apply: (target, thisArg, args) => {
-            target.call(thisArg, ...args);
-            buffer.push(["write", args]);
-        },
-    });
-    proxiedRes.setHeader = new Proxy(proxiedRes.setHeader.bind(proxiedRes), {
-        apply: (target, thisArg, args) => {
-            target.call(thisArg, ...args);
-            buffer.push(["setHeader", args]);
-        },
-    });
-    proxiedRes.removeHeader = new Proxy(proxiedRes.removeHeader.bind(proxiedRes), {
-        apply: (target, thisArg, args) => {
-            target.call(thisArg, ...args);
-            buffer.push(["removeHeader", args]);
-        },
-    });
-    proxiedRes.writeHead = new Proxy(proxiedRes.writeHead.bind(proxiedRes), {
-        apply: (target, thisArg, args) => {
-            target.call(thisArg, ...args);
-            buffer.push(["writeHead", args]);
-        },
-    });
-    proxiedRes.end = new Proxy(proxiedRes.end.bind(proxiedRes), {
-        apply: (target, thisArg, args) => {
-            target.call(thisArg, ...args);
-            if (proxiedRes.statusCode === 404) {
-                next();
-            }
-            else {
-                for (const [fn, args] of buffer) {
-                    res[fn](...args);
-                }
-                res.end(...args);
-            }
-        },
-    });
-    return proxiedRes;
-}
-exports.createServerResponseProxy = createServerResponseProxy;

package/lib/frameworks/next/index.js

@@ -284,11 +284,10 @@ async function getDevModeHandle(dir, hostingEmulatorInfo) {
     });
     const handler = nextApp.getRequestHandler();
     await nextApp.prepare();
-    return (req, res, next) => {
+    return (0, utils_2.simpleProxy)(async (req, res) => {
         const parsedUrl = (0, url_1.parse)(req.url, true);
-        const proxy = (0, __1.createServerResponseProxy)(req, res, next);
-        handler(req, proxy, parsedUrl);
-    };
+        await handler(req, res, parsedUrl);
+    });
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(dir) {

package/lib/frameworks/utils.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnIfCustomBuildScript = exports.readJSON = exports.isUrl = void 0;
+exports.simpleProxy = exports.warnIfCustomBuildScript = exports.readJSON = exports.isUrl = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
+const http_1 = require("http");
+const logger_1 = require("../logger");
 function isUrl(url) {
     return /^https?:\/\//.test(url);
 }
@@ -22,3 +24,46 @@ async function warnIfCustomBuildScript(dir, framework, defaultBuildScripts) {
     }
 }
 exports.warnIfCustomBuildScript = warnIfCustomBuildScript;
+function simpleProxy(hostOrRequestHandler) {
+    const agent = new http_1.Agent({ keepAlive: true });
+    return async (originalReq, originalRes, next) => {
+        const { method, headers, url: path } = originalReq;
+        if (!method || !path) {
+            return originalRes.end();
+        }
+        const firebaseDefaultsJSON = process.env.__FIREBASE_DEFAULTS__;
+        const authTokenSyncURL = firebaseDefaultsJSON && JSON.parse(firebaseDefaultsJSON)._authTokenSyncURL;
+        if (path === authTokenSyncURL) {
+            return next();
+        }
+        if (typeof hostOrRequestHandler === "string") {
+            const host = hostOrRequestHandler;
+            const { hostname, port, protocol, username, password } = new URL(host);
+            const auth = username || password ? `${username}:${password}` : undefined;
+            const opts = {
+                agent,
+                auth,
+                protocol,
+                hostname,
+                port,
+                path,
+                method,
+                headers: Object.assign(Object.assign({}, headers), { host, "X-Forwarded-Host": headers.host }),
+            };
+            const req = (0, http_1.request)(opts, (response) => {
+                const { statusCode, statusMessage, headers } = response;
+                originalRes.writeHead(statusCode, statusMessage, headers);
+                response.pipe(originalRes);
+            });
+            originalReq.pipe(req);
+            req.on("error", (err) => {
+                logger_1.logger.debug("Error encountered while proxying request:", method, path, err);
+                originalRes.end();
+            });
+        }
+        else {
+            await hostOrRequestHandler(originalReq, originalRes);
+        }
+    };
+}
+exports.simpleProxy = simpleProxy;

package/lib/frameworks/vite/index.js

@@ -7,7 +7,6 @@ const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const __1 = require("..");
-const proxy_1 = require("../../hosting/proxy");
 const prompt_1 = require("../../prompt");
 const utils_1 = require("../utils");
 exports.name = "Vite";
@@ -83,7 +82,7 @@ async function getDevModeHandle(dir) {
             process.stderr.write(data);
         });
     });
-    return (0, proxy_1.proxyRequestHandler)(await host, "Vite Development Server", { forceCascade: true });
+    return (0, utils_1.simpleProxy)(await host);
 }
 exports.getDevModeHandle = getDevModeHandle;
 async function getConfig(root) {

package/lib/init/features/hosting/github.js

@@ -247,7 +247,7 @@ async function promptForRepo(options, ghAccessToken) {
                     keyId = body.key_id;
                 }
                 catch (e) {
-                    if (e.status === 403) {
+                    if ([403, 404].includes(e.status)) {
                         logger_1.logger.info();
                         logger_1.logger.info();
                         (0, utils_1.logWarning)("The provided authorization cannot be used with this repository. If this repository is in an organization, did you remember to grant access?", "error");

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.25.1",
+  "version": "11.25.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.25.1",
+      "version": "11.25.3",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "11.25.1",
+  "version": "11.25.3",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/templates/extensions/javascript/WELCOME.md

@@ -1,4 +1,4 @@
-This directory now contains the source files for a simple extension called **greet-the-world**. You can try it out right away in the Firebase Emulator suite - just naviagte to the integration-test directory and run:
+This directory now contains the source files for a simple extension called **greet-the-world**. You can try it out right away in the Firebase Emulator suite - just navigate to the integration-test directory and run:
 
 `firebase emulators:start --project=<project-id>`