firebase-tools 11.8.0 → 11.8.1

package/lib/emulator/extensionsEmulator.js

@@ -142,6 +142,7 @@ class ExtensionsEmulator {
         const emulatableBackend = {
             functionsDir,
             env: nonSecretEnv,
+            codebase: "",
             secretEnv: secretEnvVariables,
             predefinedTriggers: extensionTriggers,
             nodeMajorVersion: nodeMajorVersion,

package/lib/emulator/functionsEmulator.js

@@ -54,7 +54,11 @@ class FunctionsEmulator {
         const mode = this.args.debugPort
             ? types_1.FunctionsExecutionMode.SEQUENTIAL
             : types_1.FunctionsExecutionMode.AUTO;
-        this.workerPool = new functionsRuntimeWorker_1.RuntimeWorkerPool(mode);
+        this.workerPools = {};
+        for (const backend of this.args.emulatableBackends) {
+            const pool = new functionsRuntimeWorker_1.RuntimeWorkerPool(mode);
+            this.workerPools[backend.codebase] = pool;
+        }
         this.workQueue = new workQueue_1.WorkQueue(mode);
     }
     static getHttpFunctionUrl(host, port, projectId, name, region) {
@@ -241,7 +245,9 @@ class FunctionsEmulator {
             this.logger.logLabeled("WARN", "functions", "Functions emulator work queue did not empty before stopping");
         }
         this.workQueue.stop();
-        this.workerPool.exit();
+        for (const pool of Object.values(this.workerPools)) {
+            pool.exit();
+        }
         if (this.destroyServer) {
             await this.destroyServer();
         }
@@ -273,7 +279,8 @@ class FunctionsEmulator {
                 projectAlias: this.args.projectAlias,
             };
             const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, environment);
-            const discoveredBackend = await (0, build_1.resolveBackend)(discoveredBuild, userEnvOpt, environment);
+            const resolution = await (0, build_1.resolveBackend)(discoveredBuild, userEnvOpt, environment);
+            const discoveredBackend = resolution.backend;
             const endpoints = backend.allEndpoints(discoveredBackend);
             (0, functionsEmulatorShared_1.prepareEndpoints)(endpoints);
             for (const e of endpoints) {
@@ -297,7 +304,7 @@ class FunctionsEmulator {
             this.logger.logLabeled("ERROR", "functions", `Failed to load function definition from source: ${e}`);
             return;
         }
-        this.workerPool.refresh();
+        this.workerPools[emulatableBackend.codebase].refresh();
         this.blockingFunctionsConfig = {};
         const toSetup = triggerDefinitions.filter((definition) => {
             if (force) {
@@ -380,7 +387,7 @@ class FunctionsEmulator {
             }
         }
         if (this.args.debugPort) {
-            this.startRuntime(emulatableBackend, { nodeBinary: emulatableBackend.nodeBinary });
+            await this.startRuntime(emulatableBackend, { nodeBinary: emulatableBackend.nodeBinary });
         }
     }
     addEventarcTrigger(projectId, key, eventTrigger) {
@@ -802,10 +809,11 @@ class FunctionsEmulator {
         return secretEnvs;
     }
     async invokeRuntime(backend, trigger, frb, opts) {
-        if (!this.workerPool.readyForWork(trigger.id)) {
+        const pool = this.workerPools[backend.codebase];
+        if (!pool.readyForWork(trigger.id)) {
             await this.startRuntime(backend, opts, trigger);
         }
-        return this.workerPool.submitWork(trigger.id, frb, opts);
+        return pool.submitWork(trigger.id, frb, opts);
     }
     async startRuntime(backend, opts, trigger) {
         var _a;
@@ -838,52 +846,18 @@ class FunctionsEmulator {
             env: Object.assign(Object.assign(Object.assign(Object.assign({ node: opts.nodeBinary }, process.env), runtimeEnv), secretEnvs), { PORT: socketPath }),
             stdio: ["pipe", "pipe", "pipe", "ipc"],
         });
-        if (!childProcess.stderr) {
-            throw new error_1.FirebaseError(`childProcess.stderr is undefined.`);
-        }
-        if (!childProcess.stdout) {
-            throw new error_1.FirebaseError(`childProcess.stdout is undefined.`);
-        }
-        const buffers = {
-            stderr: { pipe: childProcess.stderr, value: "" },
-            stdout: { pipe: childProcess.stdout, value: "" },
-        };
-        const ipcBuffer = { value: "" };
-        childProcess.on("message", (message) => {
-            this.onData(childProcess, emitter, ipcBuffer, message);
-        });
-        for (const id in buffers) {
-            if (buffers.hasOwnProperty(id)) {
-                const buffer = buffers[id];
-                buffer.pipe.on("data", (buf) => {
-                    this.onData(childProcess, emitter, buffer, buf);
-                });
-            }
-        }
         const runtime = {
-            pid: childProcess.pid,
-            exit: new Promise((resolve) => {
-                childProcess.on("exit", resolve);
-            }),
+            process: childProcess,
             events: emitter,
             cwd: backend.functionsDir,
             socketPath,
-            shutdown: () => {
-                childProcess.kill();
-            },
-            kill: (signal) => {
-                childProcess.kill(signal);
-                emitter.emit("log", new types_1.EmulatorLog("SYSTEM", "runtime-status", "killed"));
-            },
-            send: (args) => {
-                return childProcess.send(JSON.stringify(args));
-            },
         };
         const extensionLogInfo = {
             instanceId: backend.extensionInstanceId,
             ref: (_a = backend.extensionVersion) === null || _a === void 0 ? void 0 : _a.ref,
         };
-        this.workerPool.addWorker(trigger === null || trigger === void 0 ? void 0 : trigger.id, runtime, extensionLogInfo);
+        const pool = this.workerPools[backend.codebase];
+        pool.addWorker(trigger === null || trigger === void 0 ? void 0 : trigger.id, runtime, extensionLogInfo);
         return;
     }
     async disableBackgroundTriggers() {
@@ -1057,20 +1031,5 @@ class FunctionsEmulator {
         });
         await worker.waitForDone();
     }
-    onData(runtime, emitter, buffer, buf) {
-        buffer.value += buf.toString();
-        const lines = buffer.value.split("\n");
-        if (lines.length > 1) {
-            lines.slice(0, -1).forEach((line) => {
-                const log = types_1.EmulatorLog.fromJSON(line);
-                emitter.emit("log", log);
-                if (log.level === "FATAL") {
-                    emitter.emit("log", new types_1.EmulatorLog("SYSTEM", "runtime-status", "killed"));
-                    runtime.kill();
-                }
-            });
-        }
-        buffer.value = lines[lines.length - 1];
-    }
 }
 exports.FunctionsEmulator = FunctionsEmulator;

package/lib/emulator/functionsRuntimeWorker.js

@@ -30,21 +30,52 @@ class RuntimeWorker {
                     }
                     else if (this.state === RuntimeWorkerState.FINISHING) {
                         this.log(`IDLE --> FINISHING`);
-                        this.runtime.shutdown();
+                        this.runtime.process.kill();
                     }
                 }
             }
         });
-        this.runtime.exit.then(() => {
+        const childProc = this.runtime.process;
+        let msgBuffer = "";
+        childProc.on("message", (msg) => {
+            msgBuffer = this.processStream(msg, msgBuffer);
+        });
+        let stdBuffer = "";
+        if (childProc.stdout) {
+            childProc.stdout.on("data", (data) => {
+                stdBuffer = this.processStream(data, stdBuffer);
+            });
+        }
+        if (childProc.stderr) {
+            childProc.stderr.on("data", (data) => {
+                stdBuffer = this.processStream(data, stdBuffer);
+            });
+        }
+        childProc.on("exit", () => {
             this.log("exited");
             this.state = RuntimeWorkerState.FINISHED;
         });
     }
+    processStream(s, buf) {
+        buf += s.toString();
+        const lines = buf.split("\n");
+        if (lines.length > 1) {
+            lines.slice(0, -1).forEach((line) => {
+                const log = types_1.EmulatorLog.fromJSON(line);
+                this.runtime.events.emit("log", log);
+                if (log.level === "FATAL") {
+                    this.runtime.events.emit("log", new types_1.EmulatorLog("SYSTEM", "runtime-status", "killed"));
+                    this.runtime.process.kill();
+                }
+            });
+        }
+        return lines[lines.length - 1];
+    }
     execute(frb, opts) {
         const execFrb = Object.assign({}, frb);
         const args = { frb: execFrb, opts };
         this.state = RuntimeWorkerState.BUSY;
-        this.runtime.send(args);
+        this.runtime.process.send(JSON.stringify(args));
     }
     get state() {
         return this._state;
@@ -102,7 +133,7 @@ class RuntimeWorker {
         const timeout = new Promise((resolve, reject) => {
             setTimeout(() => {
                 reject(new error_1.FirebaseError("Failed to load function."));
-            }, 7000);
+            }, 30000);
         });
         while (true) {
             try {
@@ -142,7 +173,7 @@ class RuntimeWorkerPool {
                 if (w.state === RuntimeWorkerState.IDLE) {
                     this.log(`Shutting down IDLE worker (${w.key})`);
                     w.state = RuntimeWorkerState.FINISHING;
-                    w.runtime.shutdown();
+                    w.runtime.process.kill();
                 }
                 else if (w.state === RuntimeWorkerState.BUSY) {
                     this.log(`Marking BUSY worker to finish (${w.key})`);
@@ -155,10 +186,10 @@ class RuntimeWorkerPool {
         for (const arr of this.workers.values()) {
             arr.forEach((w) => {
                 if (w.state === RuntimeWorkerState.IDLE) {
-                    w.runtime.shutdown();
+                    w.runtime.process.kill();
                 }
                 else {
-                    w.runtime.kill();
+                    w.runtime.process.kill();
                 }
             });
         }

package/lib/emulator/storage/metadata.js

@@ -20,7 +20,6 @@ class StoredFileMetadata {
         this.contentLanguage = opts.contentLanguage;
         this.customTime = opts.customTime;
         this.contentEncoding = opts.contentEncoding;
-        this.customMetadata = opts.customMetadata;
         this.downloadTokens = opts.downloadTokens || [];
         if (opts.etag) {
             this.etag = opts.etag;
@@ -28,6 +27,16 @@ class StoredFileMetadata {
         else {
             this.etag = generateETag(this.generation, this.metageneration);
         }
+        if (opts.customMetadata) {
+            this.customMetadata = {};
+            for (const [k, v] of Object.entries(opts.customMetadata)) {
+                let stringVal = v;
+                if (typeof stringVal !== "string") {
+                    stringVal = JSON.stringify(v);
+                }
+                this.customMetadata[k] = stringVal || "";
+            }
+        }
         this.timeCreated = opts.timeCreated ? new Date(opts.timeCreated) : new Date();
         this.updated = opts.updated ? new Date(opts.updated) : this.timeCreated;
         if (bytes) {

package/lib/extensions/extensionsHelper.js

@@ -350,7 +350,7 @@ async function publishExtensionVersionFromLocalSource(args) {
     if (extension &&
         extension.latestVersion &&
         semver.lt(extensionSpec.version, extension.latestVersion)) {
-        throw new error_1.FirebaseError(`The version you are trying to publish (${clc.bold(extensionSpec.version)}) is lower than the current version (${clc.bold(extension.latestVersion)}) for the extension '${clc.bold(`${args.publisherId}/${args.extensionId}`)}'. Please make sure this version is greater than the current version (${clc.bold(extension.latestVersion)}) inside of extension.yaml.\n`);
+        throw new error_1.FirebaseError(`The version you are trying to publish (${clc.bold(extensionSpec.version)}) is lower than the current version (${clc.bold(extension.latestVersion)}) for the extension '${clc.bold(`${args.publisherId}/${args.extensionId}`)}'. Please make sure this version is greater than the current version (${clc.bold(extension.latestVersion)}) inside of extension.yaml.\n`, { exit: 104 });
     }
     else if (extension &&
         extension.latestVersion &&

package/lib/functions/secrets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.inUse = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.labels = exports.isFirebaseManaged = void 0;
+exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.labels = exports.isFirebaseManaged = void 0;
 const utils = require("../utils");
 const poller = require("../operation-poller");
 const gcf = require("../gcp/cloudfunctions");
@@ -85,6 +85,13 @@ function of(endpoints) {
     return endpoints.reduce((envs, endpoint) => [...envs, ...(endpoint.secretEnvironmentVariables || [])], []);
 }
 exports.of = of;
+function getSecretVersions(endpoint) {
+    return (endpoint.secretEnvironmentVariables || []).reduce((memo, { secret, version }) => {
+        memo[secret] = version || "";
+        return memo;
+    }, {});
+}
+exports.getSecretVersions = getSecretVersions;
 function inUse(projectInfo, secret, endpoint) {
     const { projectId, projectNumber } = projectInfo;
     for (const sev of of([endpoint])) {

package/lib/gcp/secretManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
+exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
@@ -44,6 +44,20 @@ async function listSecrets(projectId, filter) {
     return secrets;
 }
 exports.listSecrets = listSecrets;
+async function getSecretMetadata(projectId, secretName, version) {
+    const secretInfo = {};
+    try {
+        secretInfo.secret = await getSecret(projectId, secretName);
+        secretInfo.secretVersion = getSecretVersion(projectId, secretName, version);
+    }
+    catch (err) {
+        if (err.status !== 404) {
+            throw err;
+        }
+    }
+    return secretInfo;
+}
+exports.getSecretMetadata = getSecretMetadata;
 async function listSecretVersions(projectId, name, filter) {
     const secrets = [];
     const path = `projects/${projectId}/secrets/${name}/versions`;

package/lib/gcp/storage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceAccount = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
+exports.getServiceAccount = exports.listBuckets = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
 const path = require("path");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
@@ -80,6 +80,20 @@ async function getBucket(bucketName) {
     }
 }
 exports.getBucket = getBucket;
+async function listBuckets(projectId) {
+    try {
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
+        const result = await localAPIClient.get(`/storage/v1/b?project=${projectId}`);
+        return result.body.items.map((bucket) => bucket.name);
+    }
+    catch (err) {
+        logger_1.logger.debug(err);
+        throw new error_1.FirebaseError("Failed to read the storage buckets", {
+            original: err,
+        });
+    }
+}
+exports.listBuckets = listBuckets;
 async function getServiceAccount(projectId) {
     try {
         const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, crossservicerules: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, crossservicerules: false, skipdeployingnoopfunctions: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.8.0",
+  "version": "11.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.8.0",
+      "version": "11.8.1",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",
@@ -49,7 +49,7 @@
         "node-fetch": "^2.6.7",
         "open": "^6.3.0",
         "ora": "^5.4.1",
-        "portfinder": "^1.0.23",
+        "portfinder": "^1.0.32",
         "progress": "^2.0.3",
         "proxy-agent": "^5.0.0",
         "request": "^2.87.0",
@@ -9568,11 +9568,11 @@
       }
     },
     "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -10909,13 +10909,13 @@
       }
     },
     "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
       "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
+        "async": "^2.6.4",
+        "debug": "^3.2.7",
+        "mkdirp": "^0.5.6"
       },
       "engines": {
         "node": ">= 0.12.0"
@@ -21853,11 +21853,11 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "requires": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       }
     },
     "mkdirp-classic": {
@@ -22876,13 +22876,13 @@
       }
     },
     "portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
       "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
+        "async": "^2.6.4",
+        "debug": "^3.2.7",
+        "mkdirp": "^0.5.6"
       },
       "dependencies": {
         "debug": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "11.8.0",
+  "version": "11.8.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -33,6 +33,7 @@
     "test:hosting-rewrites": "bash ./scripts/hosting-tests/rewrites-tests/run.sh",
     "test:import-export": "bash ./scripts/emulator-import-export-tests/run.sh",
     "test:triggers-end-to-end": "bash ./scripts/triggers-end-to-end-tests/run.sh",
+    "test:triggers-end-to-end:inspect": "bash ./scripts/triggers-end-to-end-tests/run.sh inspect",
     "test:storage-deploy": "bash ./scripts/storage-deploy-tests/run.sh",
     "test:storage-emulator-integration": "bash ./scripts/storage-emulator-integration/run.sh"
   },
@@ -128,7 +129,7 @@
     "node-fetch": "^2.6.7",
     "open": "^6.3.0",
     "ora": "^5.4.1",
-    "portfinder": "^1.0.23",
+    "portfinder": "^1.0.32",
     "progress": "^2.0.3",
     "proxy-agent": "^5.0.0",
     "request": "^2.87.0",

package/templates/init/storage/storage.rules

@@ -2,7 +2,7 @@ rules_version = '2';
 service firebase.storage {
   match /b/{bucket}/o {
     match /{allPaths=**} {
-      allow read, write: if request.auth!=null;
+      allow read, write: if false;
     }
   }
 }