firebase-tools 12.4.8 → 12.5.1

package/lib/deploy/functions/release/fabricator.js

@@ -95,17 +95,18 @@ class Fabricator {
             deployResults.push(result);
         };
         const upserts = [];
-        const scraper = new sourceTokenScraper_1.SourceTokenScraper();
+        const scraperV1 = new sourceTokenScraper_1.SourceTokenScraper();
+        const scraperV2 = new sourceTokenScraper_1.SourceTokenScraper();
         for (const endpoint of changes.endpointsToCreate) {
             this.logOpStart("creating", endpoint);
-            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraper)));
+            upserts.push(handle("create", endpoint, () => this.createEndpoint(endpoint, scraperV1, scraperV2)));
         }
         for (const endpoint of changes.endpointsToSkip) {
             utils.logSuccess(this.getLogSuccessMessage("skip", endpoint));
         }
         for (const update of changes.endpointsToUpdate) {
             this.logOpStart("updating", update.endpoint);
-            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraper)));
+            upserts.push(handle("update", update.endpoint, () => this.updateEndpoint(update, scraperV1, scraperV2)));
         }
         await utils.allSettled(upserts);
         if (deployResults.find((r) => r.error)) {
@@ -126,31 +127,31 @@ class Fabricator {
         await utils.allSettled(deletes);
         return deployResults;
     }
-    async createEndpoint(endpoint, scraper) {
+    async createEndpoint(endpoint, scraperV1, scraperV2) {
         endpoint.labels = Object.assign(Object.assign({}, endpoint.labels), deploymentTool.labels());
         if (endpoint.platform === "gcfv1") {
-            await this.createV1Function(endpoint, scraper);
+            await this.createV1Function(endpoint, scraperV1);
         }
         else if (endpoint.platform === "gcfv2") {
-            await this.createV2Function(endpoint);
+            await this.createV2Function(endpoint, scraperV2);
         }
         else {
             (0, functional_1.assertExhaustive)(endpoint.platform);
         }
         await this.setTrigger(endpoint);
     }
-    async updateEndpoint(update, scraper) {
+    async updateEndpoint(update, scraperV1, scraperV2) {
         update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
-            await this.createEndpoint(update.endpoint, scraper);
+            await this.createEndpoint(update.endpoint, scraperV1, scraperV2);
             return;
         }
         if (update.endpoint.platform === "gcfv1") {
-            await this.updateV1Function(update.endpoint, scraper);
+            await this.updateV1Function(update.endpoint, scraperV1);
         }
         else if (update.endpoint.platform === "gcfv2") {
-            await this.updateV2Function(update.endpoint);
+            await this.updateV2Function(update.endpoint, scraperV2);
         }
         else {
             (0, functional_1.assertExhaustive)(update.endpoint.platform);
@@ -221,7 +222,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async createV2Function(endpoint) {
+    async createV2Function(endpoint, scraper) {
         var _a, _b, _c, _d, _e;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -275,8 +276,9 @@ class Fabricator {
         while (!resultFunction) {
             resultFunction = await this.functionExecutor
                 .run(async () => {
+                apiFunction.buildConfig.sourceToken = await scraper.getToken();
                 const op = await gcfV2.createFunction(apiFunction);
-                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
+                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
             })
                 .catch(async (err) => {
                 if (err.code === CLOUD_RUN_RESOURCE_EXHAUSTED_CODE) {
@@ -366,7 +368,7 @@ class Fabricator {
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
     }
-    async updateV2Function(endpoint) {
+    async updateV2Function(endpoint, scraper) {
         var _a, _b, _c, _d;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
@@ -379,8 +381,9 @@ class Fabricator {
         }
         const resultFunction = await this.functionExecutor
             .run(async () => {
+            apiFunction.buildConfig.sourceToken = await scraper.getToken();
             const op = await gcfV2.updateFunction(apiFunction);
-            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
+            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })
             .catch(rethrowAs(endpoint, "update"));
         endpoint.uri = (_c = resultFunction.serviceConfig) === null || _c === void 0 ? void 0 : _c.uri;

package/lib/deploy/functions/release/sourceTokenScraper.js

@@ -5,8 +5,9 @@ const error_1 = require("../../../error");
 const functional_1 = require("../../../functional");
 const logger_1 = require("../../../logger");
 class SourceTokenScraper {
-    constructor(validDurationMs = 1500000) {
+    constructor(validDurationMs = 1500000, fetchTimeoutMs = 180000) {
         this.tokenValidDurationMs = validDurationMs;
+        this.fetchTimeoutMs = fetchTimeoutMs;
         this.promise = new Promise((resolve) => (this.resolve = resolve));
         this.fetchState = "NONE";
     }
@@ -16,7 +17,13 @@ class SourceTokenScraper {
             return undefined;
         }
         else if (this.fetchState === "FETCHING") {
-            return this.promise;
+            const timeout = new Promise((resolve) => {
+                setTimeout(() => {
+                    this.fetchState = "NONE";
+                    resolve(undefined);
+                }, this.fetchTimeoutMs);
+            });
+            return Promise.race([this.promise, timeout]);
         }
         else if (this.fetchState === "VALID") {
             if (this.isTokenExpired()) {

package/lib/emulator/extensionsEmulator.js

@@ -92,11 +92,7 @@ class ExtensionsEmulator {
         this.installAndBuildSourceCode(sourceCodePath);
     }
     hasValidSource(args) {
-        const requiredFiles = [
-            "./extension.yaml",
-            "./functions/package.json",
-            "./functions/node_modules",
-        ];
+        const requiredFiles = ["./extension.yaml", "./functions/package.json"];
         if (!fs.existsSync(args.path)) {
             return false;
         }

package/lib/extensions/emulator/optionsHelper.js

@@ -1,42 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
-const fs = require("fs-extra");
-const path = require("path");
+exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = void 0;
 const paramHelper = require("../paramHelper");
 const specHelper = require("./specHelper");
-const localHelper = require("../localHelper");
 const triggerHelper = require("./triggerHelper");
 const types_1 = require("../types");
 const extensionsHelper = require("../extensionsHelper");
 const planner = require("../../deploy/extensions/planner");
-const config_1 = require("../../config");
-const error_1 = require("../../error");
-const emulatorLogger_1 = require("../../emulator/emulatorLogger");
 const projectUtils_1 = require("../../projectUtils");
-const types_2 = require("../../emulator/types");
-async function buildOptions(options) {
-    const extDevDir = localHelper.findExtensionYaml(process.cwd());
-    options.extDevDir = extDevDir;
-    const spec = await specHelper.readExtensionYaml(extDevDir);
-    extensionsHelper.validateSpec(spec);
-    const params = getParams(options, spec);
-    extensionsHelper.validateCommandLineParams(params, spec.params);
-    const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, params);
-    let testConfig;
-    if (options.testConfig) {
-        testConfig = readTestConfigFile(options.testConfig);
-        checkTestConfig(testConfig, functionResources);
-    }
-    options.config = buildConfig(functionResources, testConfig);
-    options.extDevEnv = params;
-    const functionEmuTriggerDefs = functionResources.map((r) => triggerHelper.functionResourceToEmulatedTriggerDefintion(r));
-    options.extDevTriggers = functionEmuTriggerDefs;
-    options.extDevRuntime = specHelper.getRuntime(functionResources);
-    return options;
-}
-exports.buildOptions = buildOptions;
 async function getExtensionFunctionInfo(instance, paramValues) {
+    var _a, _b;
     const spec = await planner.getExtensionSpec(instance);
     const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, paramValues);
     const extensionTriggers = functionResources
@@ -46,8 +19,8 @@ async function getExtensionFunctionInfo(instance, paramValues) {
         return trigger;
     });
     const runtime = specHelper.getRuntime(functionResources);
-    const nonSecretEnv = getNonSecretEnv(spec.params, paramValues);
-    const secretEnvVariables = getSecretEnvVars(spec.params, paramValues);
+    const nonSecretEnv = getNonSecretEnv((_a = spec.params) !== null && _a !== void 0 ? _a : [], paramValues);
+    const secretEnvVariables = getSecretEnvVars((_b = spec.params) !== null && _b !== void 0 ? _b : [], paramValues);
     return {
         extensionTriggers,
         runtime,
@@ -98,102 +71,3 @@ function getParams(options, extensionSpec) {
     return extensionsHelper.substituteParams(unsubbedParams, unsubbedParams);
 }
 exports.getParams = getParams;
-function checkTestConfig(testConfig, functionResources) {
-    const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.FUNCTIONS);
-    if (!testConfig.functions && functionResources.length) {
-        logger.log("WARN", "This extension uses functions," +
-            "but 'firebase.json' provided by --test-config is missing a top-level 'functions' object." +
-            "Functions will not be emulated.");
-    }
-    if (!testConfig.firestore && shouldEmulateFirestore(functionResources)) {
-        logger.log("WARN", "This extension interacts with Cloud Firestore," +
-            "but 'firebase.json' provided by --test-config is missing a top-level 'firestore' object." +
-            "Cloud Firestore will not be emulated.");
-    }
-    if (!testConfig.database && shouldEmulateDatabase(functionResources)) {
-        logger.log("WARN", "This extension interacts with Realtime Database," +
-            "but 'firebase.json' provided by --test-config is missing a top-level 'database' object." +
-            "Realtime Database will not be emulated.");
-    }
-    if (!testConfig.storage && shouldEmulateStorage(functionResources)) {
-        logger.log("WARN", "This extension interacts with Cloud Storage," +
-            "but 'firebase.json' provided by --test-config is missing a top-level 'storage' object." +
-            "Cloud Storage will not be emulated.");
-    }
-}
-function readTestConfigFile(testConfigPath) {
-    try {
-        const buf = fs.readFileSync(path.resolve(testConfigPath));
-        return JSON.parse(buf.toString());
-    }
-    catch (err) {
-        throw new error_1.FirebaseError(`Error reading --test-config file: ${err.message}\n`, {
-            original: err,
-        });
-    }
-}
-function buildConfig(functionResources, testConfig) {
-    const config = new config_1.Config(testConfig || {}, { projectDir: process.cwd(), cwd: process.cwd() });
-    const emulateFunctions = shouldEmulateFunctions(functionResources);
-    if (!testConfig) {
-        if (emulateFunctions) {
-            config.set("functions", {});
-        }
-        if (shouldEmulateFirestore(functionResources)) {
-            config.set("firestore", {});
-        }
-        if (shouldEmulateDatabase(functionResources)) {
-            config.set("database", {});
-        }
-        if (shouldEmulatePubsub(functionResources)) {
-            config.set("pubsub", {});
-        }
-        if (shouldEmulateStorage(functionResources)) {
-            config.set("storage", {});
-        }
-    }
-    if (config.src.functions) {
-        const sourceDirectory = getFunctionSourceDirectory(functionResources);
-        config.set("functions.source", sourceDirectory);
-    }
-    return config;
-}
-function getFunctionSourceDirectory(functionResources) {
-    var _a;
-    let sourceDirectory;
-    for (const r of functionResources) {
-        const dir = ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.sourceDirectory) || "functions";
-        if (!sourceDirectory) {
-            sourceDirectory = dir;
-        }
-        else if (sourceDirectory !== dir) {
-            throw new error_1.FirebaseError(`Found function resources with different sourceDirectories: '${sourceDirectory}' and '${dir}'. The extensions emulator only supports a single sourceDirectory.`);
-        }
-    }
-    return sourceDirectory || "functions";
-}
-function shouldEmulateFunctions(resources) {
-    return resources.length > 0;
-}
-function shouldEmulate(emulatorName, resources) {
-    var _a, _b;
-    for (const r of resources) {
-        const eventType = ((_b = (_a = r.properties) === null || _a === void 0 ? void 0 : _a.eventTrigger) === null || _b === void 0 ? void 0 : _b.eventType) || "";
-        if (eventType.includes(emulatorName)) {
-            return true;
-        }
-    }
-    return false;
-}
-function shouldEmulateFirestore(resources) {
-    return shouldEmulate("cloud.firestore", resources);
-}
-function shouldEmulateDatabase(resources) {
-    return shouldEmulate("google.firebase.database", resources);
-}
-function shouldEmulatePubsub(resources) {
-    return shouldEmulate("google.pubsub", resources);
-}
-function shouldEmulateStorage(resources) {
-    return shouldEmulate("google.storage", resources);
-}

package/lib/extensions/emulator/specHelper.js

@@ -26,9 +26,20 @@ function wrappedSafeLoad(source) {
     }
 }
 async function readExtensionYaml(directory) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const extensionYaml = await readFileFromDirectory(directory, SPEC_FILE);
     const source = extensionYaml.source;
-    return wrappedSafeLoad(source);
+    const spec = wrappedSafeLoad(source);
+    spec.params = (_a = spec.params) !== null && _a !== void 0 ? _a : [];
+    spec.systemParams = (_b = spec.systemParams) !== null && _b !== void 0 ? _b : [];
+    spec.resources = (_c = spec.resources) !== null && _c !== void 0 ? _c : [];
+    spec.apis = (_d = spec.apis) !== null && _d !== void 0 ? _d : [];
+    spec.roles = (_e = spec.roles) !== null && _e !== void 0 ? _e : [];
+    spec.externalServices = (_f = spec.externalServices) !== null && _f !== void 0 ? _f : [];
+    spec.events = (_g = spec.events) !== null && _g !== void 0 ? _g : [];
+    spec.lifecycleEvents = (_h = spec.lifecycleEvents) !== null && _h !== void 0 ? _h : [];
+    spec.contributors = (_j = spec.contributors) !== null && _j !== void 0 ? _j : [];
+    return spec;
 }
 exports.readExtensionYaml = readExtensionYaml;
 async function readPostinstall(directory) {

package/lib/frameworks/next/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
+exports.ESBUILD_VERSION = exports.APP_PATHS_MANIFEST = exports.ROUTES_MANIFEST = exports.PRERENDER_MANIFEST = exports.PAGES_MANIFEST = exports.MIDDLEWARE_MANIFEST = exports.IMAGES_MANIFEST = exports.EXPORT_MARKER = exports.APP_PATH_ROUTES_MANIFEST = void 0;
 exports.APP_PATH_ROUTES_MANIFEST = "app-path-routes-manifest.json";
 exports.EXPORT_MARKER = "export-marker.json";
 exports.IMAGES_MANIFEST = "images-manifest.json";
@@ -9,3 +9,4 @@ exports.PAGES_MANIFEST = "pages-manifest.json";
 exports.PRERENDER_MANIFEST = "prerender-manifest.json";
 exports.ROUTES_MANIFEST = "routes-manifest.json";
 exports.APP_PATHS_MANIFEST = "app-paths-manifest.json";
+exports.ESBUILD_VERSION = "0.19.2";

package/lib/frameworks/next/index.js

@@ -327,7 +327,7 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir) {
             const esbuildArgs = productionDeps
                 .map((it) => `--external:${it}`)
                 .concat("--bundle", "--platform=node", `--target=node${constants_1.NODE_VERSION}`, `--outdir=${destDir}`, "--log-level=error");
-            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", "esbuild", "next.config.js", ...esbuildArgs], {
+            const bundle = (0, cross_spawn_1.sync)("npx", ["--yes", `esbuild@${constants_2.ESBUILD_VERSION}`, "next.config.js", ...esbuildArgs], {
                 cwd: sourceDir,
                 timeout: BUNDLE_NEXT_CONFIG_TIMEOUT,
             });

package/package.json

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