firebase-tools 11.21.0 → 11.23.0

package/lib/emulator/functionsEmulatorRuntime.js

@@ -41,6 +41,27 @@ function requireResolveAsync(moduleName, opts) {
     });
 }
 class Proxied {
+    static getOriginal(target, key) {
+        const value = target[key];
+        if (!Proxied.isExists(value)) {
+            return undefined;
+        }
+        else if (Proxied.isConstructor(value) || typeof value !== "function") {
+            return value;
+        }
+        else {
+            return value.bind(target);
+        }
+    }
+    static applyOriginal(target, thisArg, argArray) {
+        return target.apply(thisArg, argArray);
+    }
+    static isConstructor(obj) {
+        return !!obj.prototype && !!obj.prototype.constructor.name;
+    }
+    static isExists(obj) {
+        return obj !== undefined;
+    }
     constructor(original) {
         this.original = original;
         this.rewrites = {};
@@ -65,27 +86,6 @@ class Proxied {
             },
         });
     }
-    static getOriginal(target, key) {
-        const value = target[key];
-        if (!Proxied.isExists(value)) {
-            return undefined;
-        }
-        else if (Proxied.isConstructor(value) || typeof value !== "function") {
-            return value;
-        }
-        else {
-            return value.bind(target);
-        }
-    }
-    static applyOriginal(target, thisArg, argArray) {
-        return target.apply(thisArg, argArray);
-    }
-    static isConstructor(obj) {
-        return !!obj.prototype && !!obj.prototype.constructor.name;
-    }
-    static isExists(obj) {
-        return obj !== undefined;
-    }
     when(key, value) {
         this.rewrites[key] = value;
         return this;
@@ -395,7 +395,8 @@ async function initializeFirebaseAdminStubs() {
         return Proxied.getOriginal(target, "storage");
     })
         .finalize();
-    require.cache[adminResolution.resolution] = Object.assign(require.cache[adminResolution.resolution], {
+    const v = require.cache[adminResolution.resolution];
+    require.cache[adminResolution.resolution] = Object.assign(v, {
         exports: proxiedAdminModule,
         path: path.dirname(adminResolution.resolution),
     });
@@ -472,7 +473,8 @@ async function initializeFunctionsConfigHelper() {
         return proxiedConfig;
     })
         .finalize();
-    require.cache[functionsResolution.resolution] = Object.assign(require.cache[functionsResolution.resolution], {
+    const v = require.cache[functionsResolution.resolution];
+    require.cache[functionsResolution.resolution] = Object.assign(v, {
         exports: proxiedFunctionsModule,
         path: path.dirname(functionsResolution.resolution),
     });
@@ -666,18 +668,12 @@ async function main() {
     });
     app.all(`/*`, async (req, res) => {
         try {
-            new types_1.EmulatorLog("INFO", "runtime-status", `Beginning execution of "${FUNCTION_TARGET_NAME}"`).log();
             const trigger = FUNCTION_TARGET_NAME.split(".").reduce((mod, functionTargetPart) => {
                 return mod === null || mod === void 0 ? void 0 : mod[functionTargetPart];
             }, functionModule);
             if (!trigger) {
                 throw new Error(`Failed to find function ${FUNCTION_TARGET_NAME} in the loaded module`);
             }
-            const startHrTime = process.hrtime();
-            res.on("finish", () => {
-                const elapsedHrTime = process.hrtime(startHrTime);
-                new types_1.EmulatorLog("INFO", "runtime-status", `Finished "${FUNCTION_TARGET_NAME}" in ${elapsedHrTime[0] * 1000 + elapsedHrTime[1] / 1000000}ms`).log();
-            });
             switch (FUNCTION_SIGNATURE) {
                 case "event":
                 case "cloudevent":
@@ -699,21 +695,9 @@ async function main() {
             res.status(500).send(err.message);
         }
     });
-    const server = app.listen(process.env.PORT, () => {
+    app.listen(process.env.PORT, () => {
         logDebug(`Listening to port: ${process.env.PORT}`);
     });
-    if (!FUNCTION_DEBUG_MODE) {
-        let timeout = process.env.FUNCTIONS_EMULATOR_TIMEOUT_SECONDS || "60";
-        if (timeout.endsWith("s")) {
-            timeout = timeout.slice(0, -1);
-        }
-        const timeoutMs = parseInt(timeout, 10) * 1000;
-        server.setTimeout(timeoutMs, () => {
-            new types_1.EmulatorLog("FATAL", "runtime-error", `Your function timed out after ~${timeout}s. To configure this timeout, see
-      https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`).log();
-            return flushAndExit(1);
-        });
-    }
     let messageHandlePromise = Promise.resolve();
     process.on("message", (message) => {
         messageHandlePromise = messageHandlePromise

package/lib/emulator/functionsRuntimeWorker.js

@@ -15,13 +15,17 @@ var RuntimeWorkerState;
     RuntimeWorkerState["FINISHING"] = "FINISHING";
     RuntimeWorkerState["FINISHED"] = "FINISHED";
 })(RuntimeWorkerState = exports.RuntimeWorkerState || (exports.RuntimeWorkerState = {}));
+const FREE_WORKER_KEY = "~free~";
 class RuntimeWorker {
-    constructor(key, runtime) {
+    constructor(triggerId, runtime, extensionLogInfo, timeoutSeconds) {
+        this.runtime = runtime;
+        this.extensionLogInfo = extensionLogInfo;
+        this.timeoutSeconds = timeoutSeconds;
         this.stateEvents = new events_1.EventEmitter();
         this.logListeners = [];
         this._state = RuntimeWorkerState.CREATED;
         this.id = uuid.v4();
-        this.key = key;
+        this.triggerKey = triggerId || FREE_WORKER_KEY;
         this.runtime = runtime;
         const childProc = this.runtime.process;
         let msgBuffer = "";
@@ -39,8 +43,14 @@ class RuntimeWorker {
                 stdBuffer = this.processStream(data, stdBuffer);
             });
         }
+        this.logger = triggerId
+            ? emulatorLogger_1.EmulatorLogger.forFunction(triggerId, extensionLogInfo)
+            : emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS);
+        this.onLogs((log) => {
+            this.logger.handleRuntimeLog(log);
+        }, true);
         childProc.on("exit", () => {
-            this.log("exited");
+            this.logDebug("exited");
             this.state = RuntimeWorkerState.FINISHED;
         });
     }
@@ -75,23 +85,30 @@ class RuntimeWorker {
         });
     }
     request(req, resp, body) {
+        if (this.triggerKey !== FREE_WORKER_KEY) {
+            this.logInfo(`Beginning execution of "${this.triggerKey}"`);
+        }
+        const startHrTime = process.hrtime();
         this.state = RuntimeWorkerState.BUSY;
         const onFinish = () => {
+            if (this.triggerKey !== FREE_WORKER_KEY) {
+                const elapsedHrTime = process.hrtime(startHrTime);
+                this.logInfo(`Finished "${this.triggerKey}" in ${elapsedHrTime[0] * 1000 + elapsedHrTime[1] / 1000000}ms`);
+            }
             if (this.state === RuntimeWorkerState.BUSY) {
                 this.state = RuntimeWorkerState.IDLE;
             }
             else if (this.state === RuntimeWorkerState.FINISHING) {
-                this.log(`IDLE --> FINISHING`);
+                this.logDebug(`IDLE --> FINISHING`);
                 this.runtime.process.kill();
             }
         };
         return new Promise((resolve) => {
-            const proxy = http.request({
-                method: req.method,
-                path: req.path,
-                headers: req.headers,
-                socketPath: this.runtime.socketPath,
-            }, (_resp) => {
+            const reqOpts = Object.assign(Object.assign({}, this.runtime.conn.httpReqOpts()), { method: req.method, path: req.path, headers: req.headers });
+            if (this.timeoutSeconds) {
+                reqOpts.timeout = this.timeoutSeconds * 1000;
+            }
+            const proxy = http.request(reqOpts, (_resp) => {
                 resp.writeHead(_resp.statusCode || 200, _resp.headers);
                 const piped = _resp.pipe(resp);
                 piped.on("finish", () => {
@@ -99,7 +116,13 @@ class RuntimeWorker {
                     resolve();
                 });
             });
+            proxy.on("timeout", () => {
+                this.logger.log("ERROR", `Your function timed out after ~${this.timeoutSeconds}s. To configure this timeout, see
+      https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`);
+                proxy.destroy();
+            });
             proxy.on("error", (err) => {
+                this.logger.log("ERROR", `Request to function failed: ${err}`);
                 resp.writeHead(500);
                 resp.write(JSON.stringify(err));
                 resp.end();
@@ -125,7 +148,7 @@ class RuntimeWorker {
         if (state === RuntimeWorkerState.FINISHED) {
             this.runtime.events.removeAllListeners();
         }
-        this.log(state);
+        this.logDebug(state);
         this._state = state;
         this.stateEvents.emit(this._state);
     }
@@ -137,16 +160,11 @@ class RuntimeWorker {
     }
     isSocketReady() {
         return new Promise((resolve, reject) => {
-            const req = http
-                .request({
-                method: "GET",
-                path: "/__/health",
-                socketPath: this.runtime.socketPath,
-            }, () => {
+            const req = http.request(Object.assign(Object.assign({}, this.runtime.conn.httpReqOpts()), { method: "GET", path: "/__/health" }), () => {
                 this.readyForWork();
                 resolve();
-            })
-                .end();
+            });
+            req.end();
             req.on("error", (error) => {
                 reject(error);
             });
@@ -173,8 +191,11 @@ class RuntimeWorker {
             }
         }
     }
-    log(msg) {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("DEBUG", `[worker-${this.key}-${this.id}]: ${msg}`);
+    logDebug(msg) {
+        this.logger.log("DEBUG", `[worker-${this.triggerKey}-${this.id}]: ${msg}`);
+    }
+    logInfo(msg) {
+        this.logger.logLabeled("BULLET", "functions", msg);
     }
 }
 exports.RuntimeWorker = RuntimeWorker;
@@ -195,12 +216,12 @@ class RuntimeWorkerPool {
         for (const arr of this.workers.values()) {
             arr.forEach((w) => {
                 if (w.state === RuntimeWorkerState.IDLE) {
-                    this.log(`Shutting down IDLE worker (${w.key})`);
+                    this.log(`Shutting down IDLE worker (${w.triggerKey})`);
                     w.state = RuntimeWorkerState.FINISHING;
                     w.runtime.process.kill();
                 }
                 else if (w.state === RuntimeWorkerState.BUSY) {
-                    this.log(`Marking BUSY worker to finish (${w.key})`);
+                    this.log(`Marking BUSY worker to finish (${w.triggerKey})`);
                     w.state = RuntimeWorkerState.FINISHING;
                 }
             });
@@ -247,19 +268,14 @@ class RuntimeWorkerPool {
         }
         return;
     }
-    addWorker(triggerId, runtime, extensionLogInfo) {
-        const worker = new RuntimeWorker(this.getKey(triggerId), runtime);
-        this.log(`addWorker(${worker.key})`);
-        const keyWorkers = this.getTriggerWorkers(triggerId);
+    addWorker(trigger, runtime, extensionLogInfo) {
+        this.log(`addWorker(${this.getKey(trigger === null || trigger === void 0 ? void 0 : trigger.id)})`);
+        const disableTimeout = !(trigger === null || trigger === void 0 ? void 0 : trigger.id) || this.mode === types_1.FunctionsExecutionMode.SEQUENTIAL;
+        const worker = new RuntimeWorker(trigger === null || trigger === void 0 ? void 0 : trigger.id, runtime, extensionLogInfo, disableTimeout ? undefined : trigger === null || trigger === void 0 ? void 0 : trigger.timeoutSeconds);
+        const keyWorkers = this.getTriggerWorkers(trigger === null || trigger === void 0 ? void 0 : trigger.id);
         keyWorkers.push(worker);
-        this.setTriggerWorkers(triggerId, keyWorkers);
-        const logger = triggerId
-            ? emulatorLogger_1.EmulatorLogger.forFunction(triggerId, extensionLogInfo)
-            : emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS);
-        worker.onLogs((log) => {
-            logger.handleRuntimeLog(log);
-        }, true);
-        this.log(`Adding worker with key ${worker.key}, total=${keyWorkers.length}`);
+        this.setTriggerWorkers(trigger === null || trigger === void 0 ? void 0 : trigger.id, keyWorkers);
+        this.log(`Adding worker with key ${worker.triggerKey}, total=${keyWorkers.length}`);
         return worker;
     }
     getTriggerWorkers(triggerId) {

package/lib/emulator/hub.js

@@ -12,12 +12,6 @@ const registry_1 = require("./registry");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
 const pkg = require("../../package.json");
 class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
-    constructor(args) {
-        super({
-            listen: args.listen,
-        });
-        this.args = args;
-    }
     static readLocatorFile(projectId) {
         const locatorPath = this.getLocatorFilePath(projectId);
         if (!fs.existsSync(locatorPath)) {
@@ -36,6 +30,12 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const filename = `hub-${projectId}.json`;
         return path.join(dir, filename);
     }
+    constructor(args) {
+        super({
+            listen: args.listen,
+        });
+        this.args = args;
+    }
     async start() {
         await super.start();
         await this.writeLocatorFile();

package/lib/emulator/pubsubEmulator.js

@@ -13,12 +13,6 @@ const child_process_1 = require("child_process");
 const PUBSUB_KILL_COMMAND = "pubsub_pids=$(ps aux | grep '[p]ubsub-emulator' | awk '{print $2}');" +
     " if [ ! -z '$pubsub_pids' ]; then kill -9 $pubsub_pids; fi;";
 class PubsubEmulator {
-    constructor(args) {
-        this.args = args;
-        this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.PUBSUB);
-        this.triggersForTopic = new Map();
-        this.subscriptionForTopic = new Map();
-    }
     get pubsub() {
         if (!this._pubsub) {
             this._pubsub = new pubsub_1.PubSub({
@@ -28,6 +22,12 @@ class PubsubEmulator {
         }
         return this._pubsub;
     }
+    constructor(args) {
+        this.args = args;
+        this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.PUBSUB);
+        this.triggersForTopic = new Map();
+        this.subscriptionForTopic = new Map();
+    }
     async start() {
         return downloadableEmulators.start(types_1.Emulators.PUBSUB, this.args);
     }
@@ -132,20 +132,23 @@ class PubsubEmulator {
         };
     }
     createCloudEventRequestBody(topic, message) {
+        const truncatedPublishTime = new Date(message.publishTime.getMilliseconds()).toISOString();
         const data = {
             message: {
                 messageId: message.id,
-                publishTime: message.publishTime,
+                publishTime: truncatedPublishTime,
                 attributes: message.attributes,
                 orderingKey: message.orderingKey,
                 data: message.data.toString("base64"),
+                message_id: message.id,
+                publish_time: truncatedPublishTime,
             },
             subscription: this.subscriptionForTopic.get(topic).name,
         };
         return {
-            specversion: "1",
+            specversion: "1.0",
             id: uuid.v4(),
-            time: message.publishTime.toISOString(),
+            time: truncatedPublishTime,
             type: "google.cloud.pubsub.topic.v1.messagePublished",
             source: `//pubsub.googleapis.com/projects/${this.args.projectId}/topics/${topic}`,
             data,

package/lib/emulator/storage/apis/shared.js

@@ -15,7 +15,8 @@ function sendFileBytes(md, data, req, res) {
     }
     res.setHeader("Accept-Ranges", "bytes");
     res.setHeader("Content-Type", md.contentType || "application/octet-stream");
-    res.setHeader("Content-Disposition", md.contentDisposition || "attachment");
+    const fileName = md.name.split("/").pop();
+    res.setHeader("Content-Disposition", `${md.contentDisposition || "attachment"}; filename=${fileName}`);
     if (didGunzip) {
         res.setHeader("Transfer-Encoding", "chunked");
     }

package/lib/emulator/storage/cloudFunctions.js

@@ -76,7 +76,7 @@ class StorageCloudFunctions {
             time = typeof data.updated === "string" ? data.updated : data.updated.toISOString();
         }
         return {
-            specversion: "1",
+            specversion: "1.0",
             id: uuid.v4(),
             type: `google.cloud.storage.object.v1.${ceAction}`,
             source: `//storage.googleapis.com/projects/_/buckets/${objectMetadataPayload.bucket}/objects/${objectMetadataPayload.name}`,

package/lib/emulator/storage/files.js

@@ -20,15 +20,15 @@ const upload_1 = require("./upload");
 const track_1 = require("../../track");
 const types_2 = require("../types");
 class StoredFile {
-    constructor(metadata) {
-        this.metadata = metadata;
-    }
     get metadata() {
         return this._metadata;
     }
     set metadata(value) {
         this._metadata = value;
     }
+    constructor(metadata) {
+        this.metadata = metadata;
+    }
 }
 exports.StoredFile = StoredFile;
 const TRAILING_SLASHES_PATTERN = /\/+$/;
@@ -305,7 +305,7 @@ class StorageLayer {
         return this._persistence.dirPath;
     }
     async export(storageExportPath, options) {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         const bucketsList = {
             buckets: [],
         };
@@ -324,18 +324,25 @@ class StorageLayer {
         const metadataDirPath = path.join(storageExportPath, "metadata");
         await fse.ensureDir(metadataDirPath);
         try {
-            for (var _b = __asyncValues(this._files.entries()), _c; _c = await _b.next(), !_c.done;) {
-                const [, file] = _c.value;
-                const diskFileName = this._persistence.getDiskFileName(this.path(file.metadata.bucket, file.metadata.name));
-                await fse.copy(path.join(this.dirPath, diskFileName), path.join(blobsDirPath, diskFileName));
-                const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(diskFileName)) + ".json";
-                await fse.writeFile(metadataExportPath, metadata_1.StoredFileMetadata.toJSON(file.metadata));
+            for (var _d = true, _e = __asyncValues(this._files.entries()), _f; _f = await _e.next(), _a = _f.done, !_a;) {
+                _c = _f.value;
+                _d = false;
+                try {
+                    const [, file] = _c;
+                    const diskFileName = this._persistence.getDiskFileName(this.path(file.metadata.bucket, file.metadata.name));
+                    await fse.copy(path.join(this.dirPath, diskFileName), path.join(blobsDirPath, diskFileName));
+                    const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(diskFileName)) + ".json";
+                    await fse.writeFile(metadataExportPath, metadata_1.StoredFileMetadata.toJSON(file.metadata));
+                }
+                finally {
+                    _d = true;
+                }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
+                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
             }
             finally { if (e_1) throw e_1.error; }
         }

package/lib/emulator/types.js

@@ -82,15 +82,6 @@ var FunctionsExecutionMode;
     FunctionsExecutionMode["SEQUENTIAL"] = "sequential";
 })(FunctionsExecutionMode = exports.FunctionsExecutionMode || (exports.FunctionsExecutionMode = {}));
 class EmulatorLog {
-    constructor(level, type, text, data, timestamp) {
-        this.level = level;
-        this.type = type;
-        this.text = text;
-        this.data = data;
-        this.timestamp = timestamp;
-        this.timestamp = this.timestamp || new Date().toISOString();
-        this.data = this.data || {};
-    }
     get date() {
         if (!this.timestamp) {
             return new Date(0);
@@ -145,6 +136,15 @@ class EmulatorLog {
         }
         return new EmulatorLog(parsedLog.level, parsedLog.type, parsedLog.text, parsedLog.data, parsedLog.timestamp);
     }
+    constructor(level, type, text, data, timestamp) {
+        this.level = level;
+        this.type = type;
+        this.text = text;
+        this.data = data;
+        this.timestamp = timestamp;
+        this.timestamp = this.timestamp || new Date().toISOString();
+        this.data = this.data || {};
+    }
     toString() {
         return this.toStringCore(false);
     }

package/lib/extensions/askUserForConsent.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptForPublisherTOS = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 async function promptForPublisherTOS() {
@@ -17,11 +17,11 @@ async function promptForPublisherTOS() {
         "  - If you become aware or should be aware of a critical security issue in your extension, you will provide either a resolution or a written resolution plan within 48 hours.\n" +
         "  - If Google requests a critical security matter to be patched for your extension, you will respond to Google within 48 hours with either a resolution or a written resolution plan.\n" +
         "  - Google may remove your extension or terminate the agreement, if you violate any terms.";
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(termsOfServiceMsg));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(termsOfServiceMsg));
     const consented = await (0, prompt_1.promptOnce)({
         name: "consent",
         type: "confirm",
-        message: marked("Do you accept the [Firebase Extensions Publisher Terms and Conditions](https://firebase.google.com/docs/extensions/alpha/terms-of-service) and acknowledge that your information will be used in accordance with [Google's Privacy Policy](https://policies.google.com/privacy?hl=en)?"),
+        message: (0, marked_1.marked)("Do you accept the [Firebase Extensions Publisher Terms and Conditions](https://firebase.google.com/docs/extensions/alpha/terms-of-service) and acknowledge that your information will be used in accordance with [Google's Privacy Policy](https://policies.google.com/privacy?hl=en)?"),
         default: false,
     });
     if (!consented) {

package/lib/extensions/askUserForEventsConfig.js

@@ -6,7 +6,7 @@ const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
 const clc = require("colorette");
 const logger_1 = require("../logger");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 function checkAllowedEventTypesResponse(response, validEvents) {
     const validEventTypes = validEvents.map((e) => e.type);
     if (response.length === 0) {
@@ -23,7 +23,7 @@ function checkAllowedEventTypesResponse(response, validEvents) {
 exports.checkAllowedEventTypesResponse = checkAllowedEventTypesResponse;
 async function askForEventsConfig(events, projectId, instanceId) {
     var _a, _b;
-    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${marked("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
+    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${(0, marked_1.marked)("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
     if (!(await askShouldCollectEventsConfig())) {
         return undefined;
     }

package/lib/extensions/askUserForParam.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.ask = exports.checkResponse = exports.SecretLocation = void 0;
 const _ = require("lodash");
 const clc = require("colorette");
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const types_1 = require("./types");
 const secretManagerApi = require("../gcp/secretManager");
 const secretsUtils = require("./secretsUtils");
@@ -13,6 +13,7 @@ const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const projectUtils_1 = require("../projectUtils");
+const functional_1 = require("../functional");
 var SecretLocation;
 (function (SecretLocation) {
     SecretLocation[SecretLocation["CLOUD"] = 1] = "CLOUD";
@@ -67,8 +68,9 @@ async function ask(args) {
     }
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, "answer the questions below to configure your extension:");
     const substituted = (0, extensionsHelper_1.substituteParams)(args.paramSpecs, args.firebaseProjectParams);
+    const [advancedParams, standardParams] = (0, functional_1.partition)(substituted, (p) => { var _a; return (_a = p.advanced) !== null && _a !== void 0 ? _a : false; });
     const result = {};
-    const promises = substituted.map((paramSpec) => {
+    const promises = standardParams.map((paramSpec) => {
         return async () => {
             result[paramSpec.param] = await askForParam({
                 projectId: args.projectId,
@@ -78,6 +80,35 @@ async function ask(args) {
             });
         };
     });
+    if (advancedParams.length) {
+        promises.push(async () => {
+            const shouldPrompt = await (0, prompt_1.promptOnce)({
+                type: "confirm",
+                message: "Do you want to configure any advanced parameters for this instance?",
+                default: false,
+            });
+            if (shouldPrompt) {
+                const advancedPromises = advancedParams.map((paramSpec) => {
+                    return async () => {
+                        result[paramSpec.param] = await askForParam({
+                            projectId: args.projectId,
+                            instanceId: args.instanceId,
+                            paramSpec: paramSpec,
+                            reconfiguring: args.reconfiguring,
+                        });
+                    };
+                });
+                await advancedPromises.reduce((prev, cur) => prev.then(cur), Promise.resolve());
+            }
+            else {
+                for (const paramSpec of advancedParams) {
+                    if (paramSpec.required && paramSpec.default) {
+                        result[paramSpec.param] = { baseValue: paramSpec.default };
+                    }
+                }
+            }
+        });
+    }
     await promises.reduce((prev, cur) => prev.then(cur), Promise.resolve());
     logger_1.logger.info();
     return result;
@@ -91,7 +122,7 @@ async function askForParam(args) {
     let secretLocations = [];
     const description = paramSpec.description || "";
     const label = paramSpec.label.trim();
-    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${marked(description).trim()}`);
+    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${(0, marked_1.marked)(description).trim()}`);
     while (!valid) {
         switch (paramSpec.type) {
             case types_1.ParamType.SELECT:

package/lib/extensions/billingMigrationHelper.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayNode10CreateBillingNotice = exports.displayNode10UpdateBillingNotice = void 0;
-const { marked } = require("marked");
+const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");
 const extensionsHelper_1 = require("./extensionsHelper");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
 const utils_1 = require("./utils");
-marked.setOptions({
+marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const urlPricingExamples = "https://cloud.google.com/functions/pricing#pricing_examples";
@@ -39,13 +39,13 @@ function hasRuntime(spec, runtime) {
 }
 function displayNode10UpdateBillingNotice(curSpec, newSpec) {
     if (hasRuntime(curSpec, "nodejs8") && hasRuntime(newSpec, "nodejs10")) {
-        utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(billingMsgUpdate));
+        utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(billingMsgUpdate));
     }
 }
 exports.displayNode10UpdateBillingNotice = displayNode10UpdateBillingNotice;
 async function displayNode10CreateBillingNotice(spec, prompt) {
     if (hasRuntime(spec, "nodejs10")) {
-        utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(billingMsgCreate));
+        utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(billingMsgCreate));
         if (prompt) {
             const continueUpdate = await (0, prompt_1.promptOnce)({
                 type: "confirm",