firebase-tools 11.13.0 → 11.14.0

package/lib/hosting/runTags.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureLatestRevisionTagged = exports.setRewriteTags = exports.setGarbageCollectionThreshold = exports.gcTagsForServices = exports.TODO_TAG_NAME = void 0;
+const run = require("../gcp/run");
+const api = require("./api");
+const error_1 = require("../error");
+const functional_1 = require("../functional");
+exports.TODO_TAG_NAME = "this is an invalid tag name so it cannot be real";
+async function gcTagsForServices(project, services) {
+    var _a;
+    const validTagsByServiceByRegion = {};
+    const sites = await api.listSites(project);
+    const allVersionsNested = await Promise.all(sites.map((site) => api.listVersions(site.name)));
+    const activeVersions = [...(0, functional_1.flattenArray)(allVersionsNested)].filter((version) => {
+        return version.status === "CREATED" || version.status === "FINALIZED";
+    });
+    for (const version of activeVersions) {
+        for (const rewrite of ((_a = version === null || version === void 0 ? void 0 : version.config) === null || _a === void 0 ? void 0 : _a.rewrites) || []) {
+            if (!("run" in rewrite) || !rewrite.run.tag) {
+                continue;
+            }
+            validTagsByServiceByRegion[rewrite.run.region] =
+                validTagsByServiceByRegion[rewrite.run.region] || {};
+            validTagsByServiceByRegion[rewrite.run.region][rewrite.run.serviceId] =
+                validTagsByServiceByRegion[rewrite.run.region][rewrite.run.serviceId] || new Set();
+            validTagsByServiceByRegion[rewrite.run.region][rewrite.run.serviceId].add(rewrite.run.tag);
+        }
+    }
+    for (const service of services) {
+        const { region, serviceId } = run.gcpIds(service);
+        service.spec.traffic = (service.spec.traffic || []).filter((traffic) => {
+            var _a, _b;
+            if (traffic.percent) {
+                return true;
+            }
+            if (!traffic.tag) {
+                return true;
+            }
+            if (!traffic.tag.startsWith("fh-")) {
+                return true;
+            }
+            if ((_b = (_a = validTagsByServiceByRegion[region]) === null || _a === void 0 ? void 0 : _a[serviceId]) === null || _b === void 0 ? void 0 : _b.has(traffic.tag)) {
+                return true;
+            }
+            return false;
+        });
+    }
+}
+exports.gcTagsForServices = gcTagsForServices;
+let garbageCollectionThreshold = 500;
+function setGarbageCollectionThreshold(threshold) {
+    garbageCollectionThreshold = threshold;
+}
+exports.setGarbageCollectionThreshold = setGarbageCollectionThreshold;
+async function setRewriteTags(rewrites, project, version) {
+    const services = await Promise.all(rewrites
+        .map((rewrite) => {
+        if (!("run" in rewrite)) {
+            return null;
+        }
+        if (rewrite.run.tag !== exports.TODO_TAG_NAME) {
+            return null;
+        }
+        return run.getService(`projects/${project}/locations/${rewrite.run.region}/services/${rewrite.run.serviceId}`);
+    })
+        .filter((s) => s !== null));
+    if (!services.length) {
+        return;
+    }
+    const needsGC = services
+        .map((service) => {
+        return service.spec.traffic.filter((traffic) => traffic.tag).length;
+    })
+        .some((length) => length >= garbageCollectionThreshold);
+    if (needsGC) {
+        await exports.gcTagsForServices(project, services);
+    }
+    const tags = await exports.ensureLatestRevisionTagged(services, `fh-${version}`);
+    for (const rewrite of rewrites) {
+        if (!("run" in rewrite) || rewrite.run.tag !== exports.TODO_TAG_NAME) {
+            continue;
+        }
+        const tag = tags[rewrite.run.region][rewrite.run.serviceId];
+        rewrite.run.tag = tag;
+    }
+}
+exports.setRewriteTags = setRewriteTags;
+async function ensureLatestRevisionTagged(services, defaultTag) {
+    var _a;
+    const tags = {};
+    const updateServices = [];
+    for (const service of services) {
+        const { projectNumber, region, serviceId } = run.gcpIds(service);
+        tags[region] = tags[region] || {};
+        const latestRevisionTarget = (_a = service.status) === null || _a === void 0 ? void 0 : _a.traffic.find((target) => target.latestRevision);
+        if (!latestRevisionTarget) {
+            throw new error_1.FirebaseError(`Assertion failed: service ${service.metadata.name} has no latestRevision traffic target`);
+        }
+        const latestRevision = latestRevisionTarget.revisionName;
+        const alreadyTagged = service.spec.traffic.find((target) => target.revisionName === latestRevision && target.tag);
+        if (alreadyTagged) {
+            tags[region][serviceId] = alreadyTagged.tag;
+            continue;
+        }
+        tags[region][serviceId] = defaultTag;
+        service.spec.traffic.push({
+            revisionName: latestRevision,
+            tag: defaultTag,
+        });
+        updateServices.push(run.updateService(`projects/${projectNumber}/locations/${region}/services/${serviceId}`, service));
+    }
+    await Promise.all(updateServices);
+    return tags;
+}
+exports.ensureLatestRevisionTagged = ensureLatestRevisionTagged;
+//# sourceMappingURL=runTags.js.map

package/lib/hosting/runTags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runTags.js","sourceRoot":"","sources":["../../src/hosting/runTags.ts"],"names":[],"mappings":"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"}

package/lib/init/features/emulators.js

@@ -85,6 +85,9 @@ async function doSetup(setup, config) {
             },
         ]);
     }
+    if (setup.config.emulators.singleProjectMode === undefined) {
+        setup.config.emulators.singleProjectMode = true;
+    }
     if (selections.download) {
         for (const selected of selections.emulators) {
             if ((0, types_1.isDownloadableEmulator)(selected)) {

package/lib/init/features/emulators.js.map

@@ -1 +1 @@
-{"version":3,"file":"emulators.js","sourceRoot":"","sources":["../../../src/init/features/emulators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emulators.js","sourceRoot":"","sources":["../../../src/init/features/emulators.ts"],"names":[],"mappings":"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"}

package/lib/serve/hosting.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = exports.start = exports.stop = void 0;
-const clc = require("colorette");
-const superstatic = require("superstatic").server;
 const morgan = require("morgan");
+const superstatic_1 = require("superstatic");
+const clc = require("colorette");
 const detectProjectRoot_1 = require("../detectProjectRoot");
 const error_1 = require("../error");
 const implicitInit_1 = require("../hosting/implicitInit");
 const initMiddleware_1 = require("../hosting/initMiddleware");
-const normalizedHostingConfigs_1 = require("../hosting/normalizedHostingConfigs");
+const config = require("../hosting/config");
 const cloudRunProxy_1 = require("../hosting/cloudRunProxy");
 const functionsProxy_1 = require("../hosting/functionsProxy");
 const stream_1 = require("stream");
@@ -58,18 +58,17 @@ function startServer(options, config, port, init) {
     const after = options.frameworksDevModeHandle && {
         files: options.frameworksDevModeHandle,
     };
-    const server = superstatic({
+    const server = (0, superstatic_1.server)({
         debug: false,
         port: port,
-        host: options.host,
+        hostname: options.host,
         config: config,
         compression: true,
-        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options),
+        cwd: (0, detectProjectRoot_1.detectProjectRoot)(options) || undefined,
         stack: "strict",
         before: {
             files: (req, res, next) => {
-                morganMiddleware(req, res, () => {
-                });
+                morganMiddleware(req, res, () => null);
                 firebaseMiddleware(req, res, next);
             },
         },
@@ -102,7 +101,10 @@ function stop() {
 exports.stop = stop;
 async function start(options) {
     const init = await (0, implicitInit_1.implicitInit)(options);
-    const configs = (0, normalizedHostingConfigs_1.normalizedHostingConfigs)(options);
+    let configs = config.extract(options);
+    configs = config.filterOnly(configs, options.only);
+    configs = config.filterExcept(configs, options.except);
+    config.validate(configs, options);
     for (let i = 0; i < configs.length; i++) {
         const port = i === 0 ? options.port : options.port + 4 + i;
         startServer(options, configs[i], port, init);

package/lib/serve/hosting.js.map

@@ -1 +1 @@
-{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/serve/hosting.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/serve/hosting.ts"],"names":[],"mappings":"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"}