firebase-tools 12.4.7 → 12.5.0

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

@@ -132,7 +132,7 @@ class Fabricator {
             await this.createV1Function(endpoint, scraper);
         }
         else if (endpoint.platform === "gcfv2") {
-            await this.createV2Function(endpoint);
+            await this.createV2Function(endpoint, scraper);
         }
         else {
             (0, functional_1.assertExhaustive)(endpoint.platform);
@@ -150,7 +150,7 @@ class Fabricator {
             await this.updateV1Function(update.endpoint, scraper);
         }
         else if (update.endpoint.platform === "gcfv2") {
-            await this.updateV2Function(update.endpoint);
+            await this.updateV2Function(update.endpoint, scraper);
         }
         else {
             (0, functional_1.assertExhaustive)(update.endpoint.platform);
@@ -221,7 +221,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 +275,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 +367,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 +380,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/deploy/lifecycleHooks.js

@@ -10,13 +10,12 @@ const logger_1 = require("../logger");
 const path = require("path");
 function runCommand(command, childOptions) {
     const escapedCommand = command.replace(/\"/g, '\\"');
-    const translatedCommand = '"' +
-        process.execPath +
-        '" "' +
-        path.resolve(require.resolve("cross-env"), "..", "bin", "cross-env-shell.js") +
-        '" "' +
-        escapedCommand +
-        '"';
+    const isVSCode = utils.isVSCodeExtension();
+    const nodeExecutable = isVSCode ? "node" : process.execPath;
+    const crossEnvShellPath = isVSCode
+        ? path.resolve(__dirname, "./cross-env/dist/bin/cross-env-shell.js")
+        : path.resolve(require.resolve("cross-env"), "..", "bin", "cross-env-shell.js");
+    const translatedCommand = '"' + nodeExecutable + '" "' + crossEnvShellPath + '" "' + escapedCommand + '"';
     return new Promise((resolve, reject) => {
         logger_1.logger.info("Running command: " + command);
         if (translatedCommand === "") {