firebase-functions 6.1.0 → 6.1.1

package/lib/common/providers/https.d.ts

@@ -85,6 +85,14 @@ export interface CallableRequest<T = any> {
      */
     rawRequest: Request;
 }
+/**
+ * CallableProxyResponse exposes subset of express.Response object
+ * to allow writing partial, streaming responses back to the client.
+ */
+export interface CallableProxyResponse {
+    write: express.Response["write"];
+    acceptsStreaming: boolean;
+}
 /**
  * The set of Firebase Functions status codes. The codes are the same at the
  * ones exposed by {@link https://github.com/grpc/grpc/blob/master/doc/statuscodes.md | gRPC}.

package/lib/common/providers/https.js

@@ -385,8 +385,8 @@ async function checkAppCheckToken(req, ctx, options) {
     }
 }
 /** @internal */
-function onCallHandler(options, handler) {
-    const wrapped = wrapOnCallHandler(options, handler);
+function onCallHandler(options, handler, version) {
+    const wrapped = wrapOnCallHandler(options, handler, version);
     return (req, res) => {
         return new Promise((resolve) => {
             res.on("finish", resolve);
@@ -397,8 +397,11 @@ function onCallHandler(options, handler) {
     };
 }
 exports.onCallHandler = onCallHandler;
+function encodeSSE(data) {
+    return `data: ${JSON.stringify(data)}\n`;
+}
 /** @internal */
-function wrapOnCallHandler(options, handler) {
+function wrapOnCallHandler(options, handler, version) {
     return async (req, res) => {
         try {
             if (!isValidRequest(req)) {
@@ -413,7 +416,7 @@ function wrapOnCallHandler(options, handler) {
             // The original monkey-patched code lived in the functionsEmulatorRuntime
             // (link: https://github.com/firebase/firebase-tools/blob/accea7abda3cc9fa6bb91368e4895faf95281c60/src/emulator/functionsEmulatorRuntime.ts#L480)
             // and was not compatible with how monorepos separate out packages (see https://github.com/firebase/firebase-tools/issues/5210).
-            if ((0, debug_1.isDebugFeatureEnabled)("skipTokenVerification") && handler.length === 2) {
+            if ((0, debug_1.isDebugFeatureEnabled)("skipTokenVerification") && version === "gcfv1") {
                 const authContext = context.rawRequest.header(exports.CALLABLE_AUTH_HEADER);
                 if (authContext) {
                     logger.debug("Callable functions auth override", {
@@ -452,9 +455,14 @@ function wrapOnCallHandler(options, handler) {
                 // pushes with FCM. In that case, the FCM APIs will validate the token.
                 context.instanceIdToken = req.header("Firebase-Instance-ID-Token");
             }
+            const acceptsStreaming = req.header("accept") === "text/event-stream";
+            if (acceptsStreaming && version === "gcfv1") {
+                // streaming responses are not supported in v1 callable
+                throw new HttpsError("invalid-argument", "Unsupported Accept header 'text/event-stream'");
+            }
             const data = decode(req.body.data);
             let result;
-            if (handler.length === 2) {
+            if (version === "gcfv1") {
                 result = await handler(data, context);
             }
             else {
@@ -462,15 +470,36 @@ function wrapOnCallHandler(options, handler) {
                     ...context,
                     data,
                 };
+                // TODO: set up optional heartbeat
+                const responseProxy = {
+                    write(chunk) {
+                        if (acceptsStreaming) {
+                            const formattedData = encodeSSE({ message: chunk });
+                            return res.write(formattedData);
+                        }
+                        // if client doesn't accept sse-protocol, response.write() is no-op.
+                    },
+                    acceptsStreaming,
+                };
+                if (acceptsStreaming) {
+                    // SSE always responds with 200
+                    res.status(200);
+                }
                 // For some reason the type system isn't picking up that the handler
                 // is a one argument function.
-                result = await handler(arg);
+                result = await handler(arg, responseProxy);
             }
             // Encode the result as JSON to preserve types like Dates.
             result = encode(result);
             // If there was some result, encode it in the body.
             const responseBody = { result };
-            res.status(200).send(responseBody);
+            if (acceptsStreaming) {
+                res.write(encodeSSE(responseBody));
+                res.end();
+            }
+            else {
+                res.status(200).send(responseBody);
+            }
         }
         catch (err) {
             let httpErr = err;
@@ -481,7 +510,12 @@ function wrapOnCallHandler(options, handler) {
             }
             const { status } = httpErr.httpErrorCode;
             const body = { error: httpErr.toJSON() };
-            res.status(status).send(body);
+            if (version === "gcfv2" && req.header("accept") === "text/event-stream") {
+                res.send(encodeSSE(body));
+            }
+            else {
+                res.status(status).send(body);
+            }
         }
     };
 }

package/lib/v1/providers/https.js

@@ -70,9 +70,8 @@ function _onRequestWithOptions(handler, options) {
 exports._onRequestWithOptions = _onRequestWithOptions;
 /** @internal */
 function _onCallWithOptions(handler, options) {
-    // onCallHandler sniffs the function length of the passed-in callback
-    // and the user could have only tried to listen to data. Wrap their handler
-    // in another handler to avoid accidentally triggering the v2 API
+    // fix the length of handler to make the call to handler consistent
+    // in the onCallHandler
     const fixedLen = (data, context) => {
         return (0, onInit_1.withInit)(handler)(data, context);
     };
@@ -80,7 +79,7 @@ function _onCallWithOptions(handler, options) {
         enforceAppCheck: options.enforceAppCheck,
         consumeAppCheckToken: options.consumeAppCheckToken,
         cors: { origin: true, methods: "POST" },
-    }, fixedLen));
+    }, fixedLen, "gcfv1"));
     func.__trigger = {
         labels: {},
         ...(0, cloud_functions_1.optionsToTrigger)(options),

package/lib/v2/providers/https.d.ts

@@ -1,6 +1,6 @@
 import * as express from "express";
 import { ResetValue } from "../../common/options";
-import { CallableRequest, FunctionsErrorCode, HttpsError, Request } from "../../common/providers/https";
+import { CallableRequest, CallableProxyResponse, FunctionsErrorCode, HttpsError, Request } from "../../common/providers/https";
 import { ManifestEndpoint } from "../../runtime/manifest";
 import { GlobalOptions, SupportedRegion } from "../options";
 import { Expression } from "../../params";
@@ -175,10 +175,10 @@ export declare function onRequest(handler: (request: Request, response: express.
  * @param handler - A function that takes a {@link https.CallableRequest}.
  * @returns A function that you can export and deploy.
  */
-export declare function onCall<T = any, Return = any | Promise<any>>(opts: CallableOptions, handler: (request: CallableRequest<T>) => Return): CallableFunction<T, Return extends Promise<unknown> ? Return : Promise<Return>>;
+export declare function onCall<T = any, Return = any | Promise<any>>(opts: CallableOptions, handler: (request: CallableRequest<T>, response?: CallableProxyResponse) => Return): CallableFunction<T, Return extends Promise<unknown> ? Return : Promise<Return>>;
 /**
  * Declares a callable method for clients to call using a Firebase SDK.
  * @param handler - A function that takes a {@link https.CallableRequest}.
  * @returns A function that you can export and deploy.
  */
-export declare function onCall<T = any, Return = any | Promise<any>>(handler: (request: CallableRequest<T>) => Return): CallableFunction<T, Return extends Promise<unknown> ? Return : Promise<Return>>;
+export declare function onCall<T = any, Return = any | Promise<any>>(handler: (request: CallableRequest<T>, response?: CallableProxyResponse) => Return): CallableFunction<T, Return extends Promise<unknown> ? Return : Promise<Return>>;

package/lib/v2/providers/https.js

@@ -130,15 +130,14 @@ function onCall(optsOrHandler, handler) {
     if (Array.isArray(origin) && origin.length === 1) {
         origin = origin[0];
     }
-    // onCallHandler sniffs the function length to determine which API to present.
-    // fix the length to prevent api versions from being mismatched.
-    const fixedLen = (req) => (0, onInit_1.withInit)(handler)(req);
+    // fix the length of handler to make the call to handler consistent
+    const fixedLen = (req, resp) => (0, onInit_1.withInit)(handler)(req, resp);
     let func = (0, https_1.onCallHandler)({
         cors: { origin, methods: "POST" },
         enforceAppCheck: (_a = opts.enforceAppCheck) !== null && _a !== void 0 ? _a : options.getGlobalOptions().enforceAppCheck,
         consumeAppCheckToken: opts.consumeAppCheckToken,
-    }, fixedLen);
-    func = (0, trace_1.wrapTraceContext)(func);
+    }, fixedLen, "gcfv2");
+    func = (0, trace_1.wrapTraceContext)((0, onInit_1.withInit)(func));
     Object.defineProperty(func, "__trigger", {
         get: () => {
             const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",
@@ -299,7 +299,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-jsdoc": "^39.2.9",
     "eslint-plugin-prettier": "^4.0.0",
-    "firebase-admin": "^12.1.0",
+    "firebase-admin": "^13.0.0",
     "js-yaml": "^3.13.1",
     "jsdom": "^16.2.1",
     "jsonwebtoken": "^9.0.0",
@@ -319,7 +319,7 @@
     "yargs": "^15.3.1"
   },
   "peerDependencies": {
-    "firebase-admin": "^11.10.0 || ^12.0.0"
+    "firebase-admin": "^11.10.0 || ^12.0.0 || ^13.0.0"
   },
   "engines": {
     "node": ">=14.10.0"