firebase-tools 11.14.2 → 11.14.3-canary.0

package/lib/deploy/hosting/convertConfig.js

@@ -70,9 +70,9 @@ async function convertConfig(context, deploy) {
                 if (err.status === 403) {
                     logger_1.logger.debug(`Deploying hosting site ${deploy.config.site}, did not have permissions to check for backends: `, err);
                 }
-                else {
-                    throw err;
-                }
+            }
+            else {
+                throw err;
             }
         }
     }

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) {
+async function release(context, options) {
     if (!context.hosting || !context.hosting.deploys) {
         return;
     }
@@ -28,7 +28,11 @@ async function release(context) {
         if (context.hostingChannel) {
             logger_1.logger.debug("[hosting] releasing to channel:", context.hostingChannel);
         }
-        const release = await api.createRelease(deploy.config.site, context.hostingChannel || "live", deploy.version);
+        const otherReleaseOpts = {};
+        if (options.message) {
+            otherReleaseOpts.message = options.message;
+        }
+        const release = await api.createRelease(deploy.config.site, context.hostingChannel || "live", deploy.version, otherReleaseOpts);
         logger_1.logger.debug("[hosting] release:", release);
         utils.logLabeledSuccess(`hosting[${deploy.config.site}]`, "release complete");
     }));

package/lib/emulator/constants.js

@@ -19,7 +19,7 @@ exports.FIND_AVAILBLE_PORT_BY_DEFAULT = {
     ui: true,
     hub: true,
     logging: true,
-    hosting: false,
+    hosting: true,
     functions: false,
     firestore: false,
     database: false,

package/lib/emulator/hostingEmulator.js

@@ -8,10 +8,14 @@ class HostingEmulator {
     constructor(args) {
         this.args = args;
     }
-    start() {
+    async start() {
         this.args.options.host = this.args.host;
         this.args.options.port = this.args.port;
-        return serveHosting.start(this.args.options);
+        const { ports } = await serveHosting.start(this.args.options);
+        this.args.port = ports[0];
+        if (ports.length > 1) {
+            this.reservedPorts = ports.slice(1);
+        }
     }
     connect() {
         return Promise.resolve();
@@ -26,6 +30,7 @@ class HostingEmulator {
             name: this.getName(),
             host,
             port,
+            reservedPorts: this.reservedPorts,
         };
     }
     getName() {

package/lib/emulator/portUtils.js

@@ -10,6 +10,7 @@ const dns_1 = require("./dns");
 const types_1 = require("./types");
 const constants_1 = require("./constants");
 const emulatorLogger_1 = require("./emulatorLogger");
+const node_child_process_1 = require("node:child_process");
 const RESTRICTED_PORTS = new Set([
     1,
     7,
@@ -95,8 +96,15 @@ function suggestUnrestricted(port) {
 async function checkListenable(arg1, port) {
     const addr = port === undefined ? arg1 : listenSpec(arg1, port);
     return new Promise((resolve, reject) => {
-        const dummyServer = (0, node_net_1.createServer)(() => {
-        });
+        if (process.platform === "darwin") {
+            try {
+                (0, node_child_process_1.execSync)(`lsof -i :${addr.port} -sTCP:LISTEN`);
+                return resolve(false);
+            }
+            catch (e) {
+            }
+        }
+        const dummyServer = (0, node_net_1.createServer)();
         dummyServer.once("error", (err) => {
             dummyServer.removeAllListeners();
             const e = err;
@@ -189,13 +197,25 @@ async function resolveHostAndAssignPorts(listenConfig) {
                     emuLogger.logLabeled("DEBUG", name, `portUtils: skipping restricted port ${p}`);
                     continue;
                 }
+                if (p === 5001 && /^hosting/i.exec(name)) {
+                    continue;
+                }
                 const available = [];
                 const unavailable = [];
                 let i;
                 for (i = 0; i < addrs.length; i++) {
                     const addr = addrs[i];
                     const listen = listenSpec(addr, p);
-                    if (await checkListenable(listen)) {
+                    let listenable;
+                    try {
+                        listenable = await checkListenable(listen);
+                    }
+                    catch (err) {
+                        emuLogger.logLabeled("WARN", name, `Error when trying to check port ${p} on ${addr.address}: ${err}`);
+                        unavailable.push(addr.address);
+                        continue;
+                    }
+                    if (listenable) {
                         available.push(listen);
                     }
                     else {

package/lib/frameworks/next/index.js

@@ -85,7 +85,7 @@ async function init(setup) {
         message: "What language would you like to use?",
         choices: ["JavaScript", "TypeScript"],
     });
-    (0, child_process_1.execSync)(`npx --yes create-next-app@latest ${setup.hosting.source} ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
+    (0, child_process_1.execSync)(`npx --yes create-next-app@latest -e hello-world ${setup.hosting.source} ${language === "TypeScript" ? "--ts" : ""}`, { stdio: "inherit" });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir) {

package/lib/gcp/cloudfunctions.js

@@ -177,6 +177,7 @@ async function list(projectId, region) {
         logger_1.logger.debug(`[functions] ${err === null || err === void 0 ? void 0 : err.message}`);
         throw new error_1.FirebaseError(`Failed to list functions for ${projectId}`, {
             original: err,
+            status: err instanceof error_1.FirebaseError ? err.status : undefined,
         });
     }
 }

package/lib/hosting/api.js

@@ -124,12 +124,8 @@ async function cloneVersion(site, versionName, finalize = false) {
     return pollRes;
 }
 exports.cloneVersion = cloneVersion;
-async function createRelease(site, channel, version) {
-    const res = await apiClient.request({
-        method: "POST",
-        path: `/projects/-/sites/${site}/channels/${channel}/releases`,
-        queryParams: { versionName: version },
-    });
+async function createRelease(site, channel, version, partialRelease) {
+    const res = await apiClient.post(`/projects/-/sites/${site}/channels/${channel}/releases`, partialRelease, { queryParams: { versionName: version } });
     return res.body;
 }
 exports.createRelease = createRelease;

package/lib/serve/hosting.js

@@ -4,6 +4,7 @@ exports.connect = exports.start = exports.stop = void 0;
 const morgan = require("morgan");
 const superstatic_1 = require("superstatic");
 const clc = require("colorette");
+const net_1 = require("net");
 const detectProjectRoot_1 = require("../detectProjectRoot");
 const error_1 = require("../error");
 const implicitInit_1 = require("../hosting/implicitInit");
@@ -15,10 +16,9 @@ const stream_1 = require("stream");
 const emulatorLogger_1 = require("../emulator/emulatorLogger");
 const types_1 = require("../emulator/types");
 const utils_1 = require("../utils");
-const child_process_1 = require("child_process");
 const requireHostingSite_1 = require("../requireHostingSite");
-const MAX_PORT_ATTEMPTS = 10;
-let attempts = 0;
+const projectUtils_1 = require("../projectUtils");
+const portUtils_1 = require("../emulator/portUtils");
 let destroyServer = undefined;
 const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HOSTING);
 function startServer(options, config, port, init) {
@@ -33,29 +33,6 @@ function startServer(options, config, port, init) {
     const morganMiddleware = morgan("combined", {
         stream: morganStream,
     });
-    const portInUse = () => {
-        const message = "Port " + options.port + " is not available.";
-        logger.log("WARN", clc.yellow("hosting: ") + message + " Trying another port...");
-        if (attempts < MAX_PORT_ATTEMPTS) {
-            attempts++;
-            startServer(options, config, port + 5, init);
-        }
-        else {
-            logger.log("WARN", message);
-            throw new error_1.FirebaseError("Could not find an open port for hosting development server.", {
-                exit: 1,
-            });
-        }
-    };
-    if (process.platform === "darwin") {
-        try {
-            (0, child_process_1.execSync)(`lsof -i :${port} -sTCP:LISTEN`);
-            portInUse();
-            return;
-        }
-        catch (e) {
-        }
-    }
     const after = options.frameworksDevModeHandle && {
         files: options.frameworksDevModeHandle,
     };
@@ -88,12 +65,8 @@ function startServer(options, config, port, init) {
     });
     destroyServer = (0, utils_1.createDestroyer)(server);
     server.on("error", (err) => {
-        if (err.code === "EADDRINUSE") {
-            portInUse();
-        }
-        else {
-            throw new error_1.FirebaseError("An error occurred while starting the hosting development server:\n\n" + err.toString(), { exit: 1 });
-        }
+        logger.log("DEBUG", `Error from superstatic server: ${err.stack || ""}`);
+        throw new error_1.FirebaseError(`An error occurred while starting the hosting development server:\n\n${err.message}`);
     });
 }
 function stop() {
@@ -107,17 +80,36 @@ async function start(options) {
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
         catch (_a) {
-            options.site = JSON.parse(init.json).projectId;
+            if (init.json) {
+                options.site = JSON.parse(init.json).projectId;
+            }
+            else {
+                options.site = (0, projectUtils_1.getProjectId)(options) || "site";
+            }
         }
     }
     const configs = config.hostingConfig(options);
+    const assignedPorts = new Set([5001]);
     for (let i = 0; i < configs.length; i++) {
-        const port = i === 0 ? options.port : options.port + 4 + i;
+        let port = i === 0 ? options.port : options.port + 4 + i;
+        while (assignedPorts.has(port) || !(await availablePort(options.host, port))) {
+            port += 1;
+        }
+        assignedPorts.add(port);
         startServer(options, configs[i], port, init);
     }
+    assignedPorts.delete(5001);
+    return { ports: Array.from(assignedPorts) };
 }
 exports.start = start;
 async function connect() {
     await Promise.resolve();
 }
 exports.connect = connect;
+function availablePort(host, port) {
+    return (0, portUtils_1.checkListenable)({
+        address: host,
+        port,
+        family: (0, net_1.isIPv4)(host) ? "IPv4" : "IPv6",
+    });
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.14.2",
+  "version": "11.14.3-canary.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.14.2",
+      "version": "11.14.3-canary.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",

package/package.json

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