firebase-tools 13.20.2 → 13.21.0

package/lib/emulator/apphosting/index.js

@@ -1,34 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppHostingEmulator = void 0;
-const emulatorLogger_1 = require("../emulatorLogger");
 const types_1 = require("../types");
 const serve_1 = require("./serve");
+const utils_1 = require("./utils");
 class AppHostingEmulator {
     constructor(args) {
         this.args = args;
-        this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
     }
     async start() {
-        this.args.options.host = this.args.host;
-        this.args.options.port = this.args.port;
-        this.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "starting apphosting emulator");
-        const { port } = await (0, serve_1.start)(this.args.options);
-        this.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, `serving on port ${port}`);
+        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "starting apphosting emulator");
+        const { hostname, port } = await (0, serve_1.start)();
+        this.args.options.host = hostname;
+        this.args.options.port = port;
     }
     connect() {
-        this.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
+        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
         return Promise.resolve();
     }
     stop() {
-        this.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
+        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
         return Promise.resolve();
     }
     getInfo() {
         return {
             name: types_1.Emulators.APPHOSTING,
-            host: this.args.host,
-            port: this.args.port,
+            host: this.args.options.host,
+            port: this.args.options.port,
         };
     }
     getName() {

package/lib/emulator/apphosting/serve.js

@@ -1,18 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve = exports.start = void 0;
+exports.start = void 0;
 const net_1 = require("net");
 const portUtils_1 = require("../portUtils");
+const utils_1 = require("./utils");
+const constants_1 = require("../constants");
 const spawn_1 = require("../../init/spawn");
-async function start(options) {
-    let port = options.port;
-    while (!(await availablePort(options.host, port))) {
+const config_1 = require("./config");
+async function start() {
+    const hostname = constants_1.DEFAULT_HOST;
+    let port = constants_1.DEFAULT_PORTS.apphosting;
+    while (!(await availablePort(hostname, port))) {
         port += 1;
     }
-    serve(options, port);
-    return { port };
+    serve(port);
+    return { hostname, port };
 }
 exports.start = start;
+async function serve(port) {
+    const rootDir = process.cwd();
+    const packageManager = await (0, utils_1.discoverPackageManager)(rootDir);
+    const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(rootDir);
+    await (0, spawn_1.wrapSpawn)(packageManager, ["run", "dev"], rootDir, Object.assign(Object.assign({}, apphostingLocalConfig.environmentVariables), { PORT: port }));
+}
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({
         address: host,
@@ -20,7 +30,3 @@ function availablePort(host, port) {
         family: (0, net_1.isIPv4)(host) ? "IPv4" : "IPv6",
     });
 }
-async function serve(options, port) {
-    await (0, spawn_1.wrapSpawn)("npm", ["run", "dev", "--", "-H", options.host, "-p", port], process.cwd());
-}
-exports.serve = serve;

package/lib/emulator/apphosting/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.discoverPackageManager = exports.logger = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const emulatorLogger_1 = require("../emulatorLogger");
+const types_1 = require("../types");
+exports.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
+async function discoverPackageManager(rootdir) {
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "pnpm-lock.yaml"))) {
+        return "pnpm";
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "yarn.lock"))) {
+        return "yarn";
+    }
+    return "npm";
+}
+exports.discoverPackageManager = discoverPackageManager;

package/lib/emulator/controller.js

@@ -79,6 +79,9 @@ function filterEmulatorTargets(options) {
     targets = targets.filter((e) => {
         return options.config.has(e) || options.config.has(`emulators.${e}`);
     });
+    if (targets.includes(types_1.Emulators.FUNCTIONS) && !targets.includes(types_1.Emulators.EXTENSIONS)) {
+        targets.push(types_1.Emulators.EXTENSIONS);
+    }
     const onlyOptions = options.only;
     if (onlyOptions) {
         const only = onlyOptions.split(",").map((o) => {
@@ -210,6 +213,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             : await (0, projectUtils_1.needProjectNumber)(options);
         const aliases = (0, projectUtils_1.getAliases)(options, projectId);
         extensionEmulator = new extensionsEmulator_1.ExtensionsEmulator({
+            options,
             projectId,
             projectDir: options.config.projectDir,
             projectNumber,
@@ -217,7 +221,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             extensions: options.config.get("extensions"),
         });
         const extensionsBackends = await extensionEmulator.getExtensionBackends();
-        const filteredExtensionsBackends = extensionEmulator.filterUnemulatedTriggers(options, extensionsBackends);
+        const filteredExtensionsBackends = extensionEmulator.filterUnemulatedTriggers(extensionsBackends);
         emulatableBackends.push(...filteredExtensionsBackends);
         (0, track_1.trackGA4)("extensions_emulated", {
             number_of_extensions_emulated: filteredExtensionsBackends.length,
@@ -374,6 +378,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             debugPort: inspectFunctions,
             verbosity: options.logVerbosity,
             projectAlias: options.projectAlias,
+            extensionsEmulator: extensionEmulator,
         });
         await startEmulator(functionsEmulator);
         const eventarcAddr = legacyGetFirstAddr(types_1.Emulators.EVENTARC);

package/lib/emulator/downloadableEmulators.js

@@ -37,9 +37,9 @@ const EMULATOR_UPDATE_DETAILS = {
     ui: experiments.isEnabled("emulatoruisnapshot")
         ? { version: "SNAPSHOT", expectedSize: -1, expectedChecksum: "" }
         : {
-            version: "1.13.0",
-            expectedSize: 3605485,
-            expectedChecksum: "ec0aa91592c56af9ff7df18168d58459",
+            version: "1.14.0",
+            expectedSize: 3615311,
+            expectedChecksum: "30763ff4a8b81e2c482f05b56799b5c0",
         },
     pubsub: {
         version: "0.8.14",
@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.4.4",
-            expectedSize: 25142016,
-            expectedChecksum: "9b071275feaba21e04bbb0db842f945d",
+            version: "1.5.0",
+            expectedSize: 25215744,
+            expectedChecksum: "670ad771cf36b07c52a71f580df89994",
         }
         : process.platform === "win32"
             ? {
-                version: "1.4.4",
-                expectedSize: 25567744,
-                expectedChecksum: "d23bf88b04a09d666ae927a107317611",
+                version: "1.5.0",
+                expectedSize: 25643520,
+                expectedChecksum: "b565e4609f08eb2299b7bec7e0cac0dc",
             }
             : {
-                version: "1.4.4",
-                expectedSize: 25055384,
-                expectedChecksum: "9c04a6c4738088305eb1a7b2a5d34df4",
+                version: "1.5.0",
+                expectedSize: 25129112,
+                expectedChecksum: "9a08671b89f557d096c075f6a5ac87db",
             },
 };
 exports.DownloadDetails = {

package/lib/emulator/eventarcEmulator.js

@@ -53,7 +53,7 @@ class EventarcEmulator {
             const key = `${eventTrigger.eventType}-${channel}`;
             return { projectId, triggerName, eventTrigger, key };
         };
-        const removeTriggerRoute = `/emulator/v1/remove/projects/:project_id/triggers/:trigger_name`;
+        const removeTriggerRoute = `/emulator/v1/remove/projects/:project_id/triggers/:trigger_name(*)`;
         const removeTriggerHandler = (req, res) => {
             try {
                 const { projectId, triggerName, eventTrigger, key } = getTriggerIdentifiers(req);

package/lib/emulator/extensionsEmulator.js

@@ -19,10 +19,14 @@ const emulatorLogger_1 = require("./emulatorLogger");
 const validation_1 = require("./extensions/validation");
 const registry_1 = require("./registry");
 const types_1 = require("./types");
+const common_1 = require("../extensions/runtimes/common");
 class ExtensionsEmulator {
     constructor(args) {
         this.want = [];
+        this.wantDynamic = {};
         this.backends = [];
+        this.staticBackends = [];
+        this.dynamicBackends = {};
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.EXTENSIONS);
         this.pendingDownloads = new Map();
         this.args = args;
@@ -128,12 +132,40 @@ class ExtensionsEmulator {
         this.logger.logLabeled("DEBUG", "Extensions", `Finished "npm run gcp-build" for ${sourceCodePath}`);
     }
     async getExtensionBackends() {
+        this.backends = await this.getStaticExtensionBackends();
+        for (const backends of Object.values(this.dynamicBackends)) {
+            this.backends.push(...backends);
+        }
+        return this.backends;
+    }
+    async getStaticExtensionBackends() {
         await this.readManifest();
         await this.checkAndWarnAPIs(this.want);
-        this.backends = await Promise.all(this.want.map((i) => {
+        this.staticBackends = await Promise.all(this.want.map((i) => {
             return this.toEmulatableBackend(i);
         }));
-        return this.backends;
+        return this.staticBackends;
+    }
+    getDynamicExtensionBackends() {
+        const dynamicBackends = [];
+        for (const backends of Object.values(this.dynamicBackends)) {
+            dynamicBackends.push(...backends);
+        }
+        return dynamicBackends;
+    }
+    async addDynamicExtensions(codebase, build) {
+        const extensions = (0, common_1.extractExtensionsFromBuilds)({ build });
+        this.wantDynamic[codebase] = await planner.wantDynamic({
+            projectId: this.args.projectId,
+            projectNumber: this.args.projectNumber,
+            extensions,
+            emulatorMode: true,
+        });
+        await this.checkAndWarnAPIs(this.wantDynamic[codebase]);
+        this.dynamicBackends[codebase] = await Promise.all(this.wantDynamic[codebase].map((i) => {
+            return this.toEmulatableBackend(i);
+        }));
+        await this.getExtensionBackends();
     }
     async toEmulatableBackend(instance) {
         const extensionDir = await this.ensureSourceCode(instance);
@@ -206,10 +238,10 @@ class ExtensionsEmulator {
             }
         }
     }
-    filterUnemulatedTriggers(options, backends) {
+    filterUnemulatedTriggers(backends) {
         let foundUnemulatedTrigger = false;
         const filteredBackends = backends.filter((backend) => {
-            const unemulatedServices = (0, validation_1.checkForUnemulatedTriggerTypes)(backend, options);
+            const unemulatedServices = (0, validation_1.checkForUnemulatedTriggerTypes)(backend, this.args.options);
             if (unemulatedServices.length) {
                 foundUnemulatedTrigger = true;
                 const msg = ` ignored becuase it includes ${unemulatedServices.join(", ")} triggered functions, and the ${unemulatedServices.join(", ")} emulator does not exist or is not running.`;
@@ -231,9 +263,9 @@ class ExtensionsEmulator {
         uiUrl.pathname = `/${types_1.Emulators.EXTENSIONS}/${backend.extensionInstanceId}`;
         return clc.underline(clc.bold(uiUrl.toString()));
     }
-    extensionsInfoTable(options) {
+    extensionsInfoTable() {
         var _a;
-        const filtedBackends = this.filterUnemulatedTriggers(options, this.backends);
+        const filtedBackends = this.filterUnemulatedTriggers(this.backends);
         const uiRunning = registry_1.EmulatorRegistry.isRunning(types_1.Emulators.UI);
         const tableHead = ["Extension Instance Name", "Extension Ref"];
         if (uiRunning) {

package/lib/emulator/functionsEmulator.js

@@ -81,10 +81,13 @@ class FunctionsEmulator {
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS);
         this.multicastTriggers = {};
         this.blockingFunctionsConfig = {};
+        this.staticBackends = [];
+        this.dynamicBackends = [];
         this.debugMode = false;
+        this.staticBackends = args.emulatableBackends;
         emulatorLogger_1.EmulatorLogger.setVerbosity(this.args.verbosity ? emulatorLogger_1.Verbosity[this.args.verbosity] : emulatorLogger_1.Verbosity["DEBUG"]);
         if (this.args.debugPort) {
-            const maybeNodeCodebases = this.args.emulatableBackends.filter((b) => !b.runtime || b.runtime.startsWith("node"));
+            const maybeNodeCodebases = this.staticBackends.filter((b) => !b.runtime || b.runtime.startsWith("node"));
             if (maybeNodeCodebases.length > 1 && typeof this.args.debugPort === "number") {
                 throw new error_1.FirebaseError("Cannot debug on a single port with multiple codebases. " +
                     "Use --inspect-functions=true to assign dynamic ports to each codebase");
@@ -96,12 +99,37 @@ class FunctionsEmulator {
         this.adminSdkConfig = Object.assign(Object.assign({}, this.args.adminSdkConfig), { projectId: this.args.projectId });
         const mode = this.debugMode ? types_1.FunctionsExecutionMode.SEQUENTIAL : types_1.FunctionsExecutionMode.AUTO;
         this.workerPools = {};
-        for (const backend of this.args.emulatableBackends) {
+        for (const backend of this.staticBackends) {
             const pool = new functionsRuntimeWorker_1.RuntimeWorkerPool(mode);
             this.workerPools[backend.codebase] = pool;
         }
         this.workQueue = new workQueue_1.WorkQueue(mode);
     }
+    async loadDynamicExtensionBackends() {
+        if (this.args.extensionsEmulator) {
+            const unfilteredBackends = this.args.extensionsEmulator.getDynamicExtensionBackends();
+            this.dynamicBackends =
+                this.args.extensionsEmulator.filterUnemulatedTriggers(unfilteredBackends);
+            const mode = this.debugMode ? types_1.FunctionsExecutionMode.SEQUENTIAL : types_1.FunctionsExecutionMode.AUTO;
+            const credentialEnv = await this.getCredentialsEnvironment();
+            for (const backend of this.dynamicBackends) {
+                backend.env = Object.assign(Object.assign({}, credentialEnv), backend.env);
+                if (this.workerPools[backend.codebase]) {
+                    if (this.debugMode) {
+                        this.workerPools[backend.codebase].exit();
+                    }
+                    else {
+                        this.workerPools[backend.codebase].refresh();
+                    }
+                }
+                else {
+                    const pool = new functionsRuntimeWorker_1.RuntimeWorkerPool(mode);
+                    this.workerPools[backend.codebase] = pool;
+                }
+                await this.loadTriggers(backend, true);
+            }
+        }
+    }
     async getCredentialsEnvironment() {
         const credentialEnv = {};
         if (process.env.GOOGLE_APPLICATION_CREDENTIALS) {
@@ -228,7 +256,7 @@ class FunctionsEmulator {
     }
     async start() {
         const credentialEnv = await this.getCredentialsEnvironment();
-        for (const e of this.args.emulatableBackends) {
+        for (const e of this.staticBackends) {
             e.env = Object.assign(Object.assign({}, credentialEnv), e.env);
         }
         if (Object.keys(this.adminSdkConfig || {}).length <= 1) {
@@ -249,7 +277,7 @@ class FunctionsEmulator {
     }
     async connect() {
         var _a, _b;
-        for (const backend of this.args.emulatableBackends) {
+        for (const backend of this.staticBackends) {
             this.logger.logLabeled("BULLET", "functions", `Watching "${backend.functionsDir}" for Cloud Functions...`);
             const watcher = chokidar.watch(backend.functionsDir, {
                 ignored: [
@@ -315,6 +343,10 @@ class FunctionsEmulator {
             };
             const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
             const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, environment);
+            if (discoveredBuild.extensions && this.args.extensionsEmulator) {
+                await this.args.extensionsEmulator.addDynamicExtensions(emulatableBackend.codebase, discoveredBuild);
+                await this.loadDynamicExtensionBackends();
+            }
             const resolution = await (0, build_1.resolveBackend)({
                 build: discoveredBuild,
                 firebaseConfig: JSON.parse(firebaseConfig),
@@ -353,6 +385,9 @@ class FunctionsEmulator {
         }
         const toRemove = Object.keys(this.triggers).filter((recordKey) => {
             const record = this.getTriggerRecordByKey(recordKey);
+            if (record.backend.codebase !== emulatableBackend.codebase) {
+                return false;
+            }
             if (force) {
                 return true;
             }
@@ -430,17 +465,17 @@ class FunctionsEmulator {
             }
             const ignored = !added;
             this.addTriggerRecord(definition, { backend: emulatableBackend, ignored, url });
-            const type = definition.httpsTrigger
+            const triggerType = definition.httpsTrigger
                 ? "http"
                 : constants_1.Constants.getServiceName((0, functionsEmulatorShared_1.getFunctionService)(definition));
             if (ignored) {
-                const msg = `function ignored because the ${type} emulator does not exist or is not running.`;
+                const msg = `function ignored because the ${triggerType} emulator does not exist or is not running.`;
                 this.logger.logLabeled("BULLET", `functions[${definition.id}]`, msg);
             }
             else {
                 const msg = url
-                    ? `${clc.bold(type)} function initialized (${url}).`
-                    : `${clc.bold(type)} function initialized.`;
+                    ? `${clc.bold(triggerType)} function initialized (${url}).`
+                    : `${clc.bold(triggerType)} function initialized.`;
                 this.logger.logLabeled("SUCCESS", `functions[${definition.id}]`, msg);
             }
         }
@@ -483,23 +518,24 @@ class FunctionsEmulator {
             }
         }
     }
-    addEventarcTrigger(projectId, key, eventTrigger) {
+    async addEventarcTrigger(projectId, key, eventTrigger) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
-            return Promise.resolve(false);
+            return false;
         }
         const bundle = {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "eventarc.googleapis.com" }),
         };
         logger_1.logger.debug(`addEventarcTrigger`, JSON.stringify(bundle));
-        return registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC)
-            .post(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle)
-            .then(() => true)
-            .catch((err) => {
+        try {
+            await registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC).post(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle);
+            return true;
+        }
+        catch (err) {
             this.logger.log("WARN", "Error adding Eventarc function: " + err);
-            return false;
-        });
+        }
+        return false;
     }
-    removeEventarcTrigger(projectId, key, eventTrigger) {
+    async removeEventarcTrigger(projectId, key, eventTrigger) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
             return Promise.resolve(false);
         }
@@ -507,45 +543,48 @@ class FunctionsEmulator {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "eventarc.googleapis.com" }),
         };
         logger_1.logger.debug(`removeEventarcTrigger`, JSON.stringify(bundle));
-        return registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC)
-            .post(`/emulator/v1/remove/projects/${projectId}/triggers/${key}`, bundle)
-            .then(() => true)
-            .catch((err) => {
+        try {
+            await registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC).post(`/emulator/v1/remove/projects/${projectId}/triggers/${key}`, bundle);
+            return true;
+        }
+        catch (err) {
             this.logger.log("WARN", "Error removing Eventarc function: " + err);
-            return false;
-        });
+        }
+        return false;
     }
-    addFirealertsTrigger(projectId, key, eventTrigger) {
+    async addFirealertsTrigger(projectId, key, eventTrigger) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
-            return Promise.resolve(false);
+            return false;
         }
         const bundle = {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "firebasealerts.googleapis.com" }),
         };
         logger_1.logger.debug(`addFirealertsTrigger`, JSON.stringify(bundle));
-        return registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC)
-            .post(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle)
-            .then(() => true)
-            .catch((err) => {
+        try {
+            await registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC).post(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle);
+            return true;
+        }
+        catch (err) {
             this.logger.log("WARN", "Error adding FireAlerts function: " + err);
-            return false;
-        });
+        }
+        return false;
     }
-    removeFirealertsTrigger(projectId, key, eventTrigger) {
+    async removeFirealertsTrigger(projectId, key, eventTrigger) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.EVENTARC)) {
-            return Promise.resolve(false);
+            return false;
         }
         const bundle = {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "firebasealerts.googleapis.com" }),
         };
         logger_1.logger.debug(`removeFirealertsTrigger`, JSON.stringify(bundle));
-        return registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC)
-            .post(`/emulator/v1/remove/projects/${projectId}/triggers/${key}`, bundle)
-            .then(() => true)
-            .catch((err) => {
+        try {
+            await registry_1.EmulatorRegistry.client(types_1.Emulators.EVENTARC).post(`/emulator/v1/remove/projects/${projectId}/triggers/${key}`, bundle);
+            return true;
+        }
+        catch (err) {
             this.logger.log("WARN", "Error removing FireAlerts function: " + err);
-            return false;
-        });
+        }
+        return false;
     }
     async performPostLoadOperations() {
         if (!this.blockingFunctionsConfig.triggers &&
@@ -809,9 +848,14 @@ class FunctionsEmulator {
     }
     getBackendInfo() {
         const cf3Triggers = this.getCF3Triggers();
-        return this.args.emulatableBackends.map((e) => {
+        const backendInfo = this.staticBackends.map((e) => {
             return (0, functionsEmulatorShared_1.toBackendInfo)(e, cf3Triggers);
         });
+        const dynamicInfo = this.dynamicBackends.map((e) => {
+            return (0, functionsEmulatorShared_1.toBackendInfo)(e, cf3Triggers, { createdBy: "SDK" });
+        });
+        backendInfo.push(...dynamicInfo);
+        return backendInfo;
     }
     getCF3Triggers() {
         return Object.values(this.triggers)
@@ -1049,7 +1093,7 @@ class FunctionsEmulator {
     async reloadTriggers() {
         this.triggerGeneration++;
         this.blockingFunctionsConfig = {};
-        for (const backend of this.args.emulatableBackends) {
+        for (const backend of this.staticBackends.concat(this.dynamicBackends)) {
             await this.loadTriggers(backend);
         }
         await this.performPostLoadOperations();

package/lib/emulator/functionsEmulatorShared.js

@@ -310,7 +310,7 @@ function getSecretLocalPath(backend, projectDir) {
     return path.join(secretDirectory, secretsFile);
 }
 exports.getSecretLocalPath = getSecretLocalPath;
-function toBackendInfo(e, cf3Triggers) {
+function toBackendInfo(e, cf3Triggers, labels) {
     var _a, _b;
     const envWithSecrets = Object.assign({}, e.env);
     for (const s of e.secretEnv) {
@@ -337,6 +337,7 @@ function toBackendInfo(e, cf3Triggers) {
         extension: e.extension,
         extensionVersion: extensionVersion,
         extensionSpec: extensionSpec,
+        labels,
         functionTriggers: (_b = e.predefinedTriggers) !== null && _b !== void 0 ? _b : cf3Triggers.filter((t) => t.codebase === e.codebase),
     }));
 }

package/lib/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBillingError = exports.FirebaseError = void 0;
+exports.isBillingError = exports.getErrStatus = exports.getErrMsg = exports.FirebaseError = void 0;
 const lodash_1 = require("lodash");
 const DEFAULT_CHILDREN = [];
 const DEFAULT_EXIT = 1;
@@ -18,6 +18,29 @@ class FirebaseError extends Error {
     }
 }
 exports.FirebaseError = FirebaseError;
+function getErrMsg(err, defaultMsg) {
+    if (err instanceof Error) {
+        return err.message;
+    }
+    else if (typeof err === "string") {
+        return err;
+    }
+    else if (defaultMsg) {
+        return defaultMsg;
+    }
+    return JSON.stringify(err);
+}
+exports.getErrMsg = getErrMsg;
+function isObject(value) {
+    return typeof value === "object" && value !== null;
+}
+function getErrStatus(err, defaultStatus) {
+    if (isObject(err) && err.status && typeof err.status === "number") {
+        return err.status;
+    }
+    return defaultStatus || DEFAULT_STATUS;
+}
+exports.getErrStatus = getErrStatus;
 function isBillingError(e) {
     var _a, _b, _c, _d;
     return !!((_d = (_c = (_b = (_a = e.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.details) === null || _d === void 0 ? void 0 : _d.find((d) => {

package/lib/extensions/emulator/triggerHelper.js

@@ -58,7 +58,7 @@ function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {})
             };
         }
         else {
-            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name}' is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
         }
         return etd;
     }

package/lib/extensions/extensionsApi.js

@@ -9,6 +9,7 @@ const error_1 = require("../error");
 const logger_1 = require("../logger");
 const operationPoller = require("../operation-poller");
 const refs = require("./refs");
+const types_1 = require("./types");
 const EXTENSIONS_API_VERSION = "v1beta";
 const PAGE_SIZE_MAX = 100;
 const extensionsApiClient = new apiv2_1.Client({
@@ -81,10 +82,12 @@ exports.deleteInstance = deleteInstance;
 async function getInstance(projectId, instanceId) {
     try {
         const res = await extensionsApiClient.get(`/projects/${projectId}/instances/${instanceId}`);
-        return res.body;
+        if ((0, types_1.isExtensionInstance)(res.body)) {
+            return res.body;
+        }
     }
     catch (err) {
-        if (err.status === 404) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
             throw new error_1.FirebaseError(`Extension instance '${clc.bold(instanceId)}' not found in project '${clc.bold(projectId)}'.`, { status: 404 });
         }
         throw err;
@@ -235,7 +238,7 @@ function populateSpec(spec) {
                 }
             }
             catch (err) {
-                logger_1.logger.debug(`[ext] failed to parse resource properties yaml: ${err}`);
+                logger_1.logger.debug(`[ext] failed to parse resource properties yaml: ${(0, error_1.getErrMsg)(err)}`);
             }
         }
         spec.params = (_a = spec.params) !== null && _a !== void 0 ? _a : [];
@@ -281,13 +284,13 @@ async function getExtensionVersion(extensionVersionRef) {
         return res.body;
     }
     catch (err) {
-        if (err.status === 404) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
             throw refNotFoundError(ref);
         }
         else if (err instanceof error_1.FirebaseError) {
             throw err;
         }
-        throw new error_1.FirebaseError(`Failed to query the extension version '${clc.bold(extensionVersionRef)}': ${err}`);
+        throw new error_1.FirebaseError(`Failed to query the extension version '${clc.bold(extensionVersionRef)}': ${(0, error_1.getErrMsg)(err)}`);
     }
 }
 exports.getExtensionVersion = getExtensionVersion;
@@ -341,14 +344,14 @@ async function getExtension(extensionRef) {
         return res.body;
     }
     catch (err) {
-        if (err.status === 404) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
             throw refNotFoundError(ref);
         }
         else if (err instanceof error_1.FirebaseError) {
             throw err;
         }
-        throw new error_1.FirebaseError(`Failed to query the extension '${clc.bold(extensionRef)}': ${err}`, {
-            status: err.status,
+        throw new error_1.FirebaseError(`Failed to query the extension '${clc.bold(extensionRef)}': ${(0, error_1.getErrMsg)(err)}`, {
+            status: (0, error_1.getErrStatus)(err),
         });
     }
 }