firebase-tools 11.2.0 → 11.2.1

package/lib/checkValidTargetFilters.js

@@ -20,7 +20,7 @@ function targetsHaveNoFilters(...targets) {
     return targets.some((t) => !t.includes(":"));
 }
 async function checkValidTargetFilters(options) {
-    const only = (options.only || "").split(",");
+    const only = !options.only ? [] : options.only.split(",");
     return new Promise((resolve, reject) => {
         if (!only.length) {
             return resolve();

package/lib/deploy/functions/prepare.js

@@ -39,7 +39,7 @@ async function prepare(context, options, payload) {
         ensureApiEnabled.ensure(projectId, "cloudfunctions.googleapis.com", "functions"),
         ensureApiEnabled.check(projectId, "runtimeconfig.googleapis.com", "runtimeconfig", true),
         ensure.cloudBuildEnabled(projectId),
-        ensureApiEnabled.check(projectId, "artifactregistry.googleapis.com", "artifactregistry"),
+        ensureApiEnabled.ensure(projectId, "artifactregistry.googleapis.com", "artifactregistry"),
     ]);
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -179,7 +179,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
         };
     }
     const endpointId = annotation.name;
-    const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", region: regions, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime, serviceAccount: annotation.serviceAccountEmail || "default" }, triggered);
+    const endpoint = Object.assign({ platform: annotation.platform || "gcfv1", region: regions, project: projectId, entryPoint: annotation.entryPoint, runtime: runtime, serviceAccount: annotation.serviceAccountEmail || null }, triggered);
     if (annotation.vpcConnector != null) {
         let maybeId = annotation.vpcConnector;
         if (maybeId && !maybeId.includes("/")) {

package/lib/emulator/downloadableEmulators.js

@@ -29,13 +29,13 @@ exports.DownloadDetails = {
         },
     },
     firestore: {
-        downloadPath: path.join(CACHE_DIR, "cloud-firestore-emulator-v1.14.3.jar"),
-        version: "1.14.3",
+        downloadPath: path.join(CACHE_DIR, "cloud-firestore-emulator-v1.14.4.jar"),
+        version: "1.14.4",
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.14.3.jar",
-            expectedSize: 60442855,
-            expectedChecksum: "63517534875818689639ee5dee57dd52",
+            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.14.4.jar",
+            expectedSize: 61017177,
+            expectedChecksum: "953d10e73798484aa0b84c45005faadb",
             namePrefix: "cloud-firestore-emulator",
         },
     },

package/lib/emulator/functionsEmulator.js

@@ -778,9 +778,10 @@ class FunctionsEmulator {
         }
         const runtimeEnv = this.getRuntimeEnvs(backend, trigger);
         const secretEnvs = await this.resolveSecretEnvs(backend, trigger);
+        const socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)();
         const childProcess = spawn(opts.nodeBinary, args, {
             cwd: backend.functionsDir,
-            env: Object.assign(Object.assign(Object.assign({ node: opts.nodeBinary }, process.env), runtimeEnv), secretEnvs),
+            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) {
@@ -812,6 +813,7 @@ class FunctionsEmulator {
             }),
             events: emitter,
             cwd: backend.functionsDir,
+            socketPath,
             shutdown: () => {
                 childProcess.kill();
             },
@@ -950,12 +952,6 @@ class FunctionsEmulator {
         await worker.waitForSocketReady();
         void (0, track_1.track)(EVENT_INVOKE, "https");
         this.logger.log("DEBUG", `[functions] Runtime ready! Sending request!`);
-        if (!worker.lastArgs) {
-            throw new error_1.FirebaseError("Cannot execute on a worker with no arguments");
-        }
-        if (!worker.lastArgs.frb.socketPath) {
-            throw new error_1.FirebaseError(`Cannot execute on a worker without a socketPath: ${JSON.stringify(worker.lastArgs)}`);
-        }
         const url = new url_1.URL(`${req.protocol}://${req.hostname}${req.url}`);
         const path = `${url.pathname}${url.search}`.replace(new RegExp(`\/${this.args.projectId}\/[^\/]*\/${triggerName}\/?`), "/");
         this.logger.log("DEBUG", `[functions] Got req.url=${req.url}, mapping to path=${path}`);
@@ -963,7 +959,7 @@ class FunctionsEmulator {
             method,
             path,
             headers: req.headers,
-            socketPath: worker.lastArgs.frb.socketPath,
+            socketPath: worker.runtime.socketPath,
         }, (runtimeRes) => {
             function forwardStatusAndHeaders() {
                 res.status(runtimeRes.statusCode || 200);

package/lib/emulator/functionsEmulatorRuntime.js

@@ -485,14 +485,9 @@ async function initializeFunctionsConfigHelper(frb) {
 function rawBodySaver(req, res, buf) {
     req.rawBody = buf;
 }
-async function processHTTPS(trigger, frb) {
+async function processHTTPS(trigger) {
     const ephemeralServer = express();
     const functionRouter = express.Router();
-    const socketPath = frb.socketPath;
-    if (!socketPath) {
-        new types_1.EmulatorLog("FATAL", "runtime-error", "Called processHTTPS with no socketPath").log();
-        return;
-    }
     await new Promise((resolveEphemeralServer, rejectEphemeralServer) => {
         const handler = async (req, res) => {
             try {
@@ -534,8 +529,9 @@ async function processHTTPS(trigger, frb) {
         }));
         functionRouter.all("*", handler);
         ephemeralServer.use([`/`, `/*`], functionRouter);
-        logDebug(`Attempting to listen to socketPath: ${socketPath}`);
-        const instance = ephemeralServer.listen(socketPath, () => {
+        logDebug(`Attempting to listen to port: ${process.env.PORT}`);
+        const instance = ephemeralServer.listen(process.env.PORT, () => {
+            logDebug(`Listening to port: ${process.env.PORT}`);
             new types_1.EmulatorLog("SYSTEM", "runtime-status", "ready", { state: "ready" }).log();
         });
         instance.on("error", rejectEphemeralServer);
@@ -640,7 +636,7 @@ async function invokeTrigger(trigger, frb) {
             await processBackground(trigger, frb, FUNCTION_SIGNATURE);
             break;
         case "http":
-            await processHTTPS(trigger, frb);
+            await processHTTPS(trigger);
             break;
     }
     if (timeoutId) {

package/lib/emulator/functionsEmulatorShared.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBackendInfo = exports.getSecretLocalPath = exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.emulatedFunctionsFromEndpoints = exports.prepareEndpoints = exports.EmulatedTrigger = exports.HttpConstants = void 0;
-const _ = require("lodash");
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
+const crypto_1 = require("crypto");
+const _ = require("lodash");
 const backend = require("../deploy/functions/backend");
 const constants_1 = require("./constants");
 const proto_1 = require("../gcp/proto");
@@ -142,12 +143,13 @@ function getEmulatedTriggersFromDefinitions(definitions, module) {
     }, {});
 }
 exports.getEmulatedTriggersFromDefinitions = getEmulatedTriggersFromDefinitions;
-function getTemporarySocketPath(pid, cwd) {
+function getTemporarySocketPath() {
+    const rand = (0, crypto_1.randomBytes)(8).toString("hex");
     if (process.platform === "win32") {
-        return path.join("\\\\?\\pipe", cwd, pid.toString());
+        return path.join("\\\\?\\pipe", `fire_emu_${rand}`);
     }
     else {
-        return path.join(os.tmpdir(), `fire_emu_${pid.toString()}.sock`);
+        return path.join(os.tmpdir(), `fire_emu_${rand}.sock`);
     }
 }
 exports.getTemporarySocketPath = getTemporarySocketPath;
@@ -239,7 +241,7 @@ function formatHost(info) {
 }
 exports.formatHost = formatHost;
 function getSignatureType(def) {
-    if (def.httpsTrigger) {
+    if (def.httpsTrigger || def.blockingTrigger) {
         return "http";
     }
     return def.platform === "gcfv2" ? "cloudevent" : "event";

package/lib/emulator/functionsRuntimeWorker.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeWorkerPool = exports.RuntimeWorker = exports.RuntimeWorkerState = void 0;
 const uuid = require("uuid");
 const types_1 = require("./types");
-const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const events_1 = require("events");
 const emulatorLogger_1 = require("./emulatorLogger");
 const error_1 = require("../error");
@@ -42,13 +41,8 @@ class RuntimeWorker {
     }
     execute(frb, opts) {
         const execFrb = Object.assign({}, frb);
-        if (!execFrb.socketPath) {
-            execFrb.socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)(this.runtime.pid, this.runtime.cwd);
-            this.log(`Assigning socketPath: ${execFrb.socketPath}`);
-        }
         const args = { frb: execFrb, opts };
         this.state = RuntimeWorkerState.BUSY;
-        this.lastArgs = args;
         this.runtime.send(args);
     }
     get state() {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.2.0",
+  "version": "11.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.2.0",
+      "version": "11.2.1",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",

package/package.json

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