firebase-functions 7.2.2 → 7.2.4

package/lib/common/providers/tasks.js

@@ -47,6 +47,7 @@ function onDispatchHandler(handler) {
 					...context,
 					data
 				};
+				Object.defineProperty(arg, "context", { get: () => context });
 				await handler(arg);
 			}
 			res.status(204).end();

package/lib/common/utilities/path-pattern.js

@@ -12,6 +12,14 @@ function trimParam(param) {
 	}
 	return paramNoBraces;
 }
+/** @internal */
+function tryDecodeURIComponent(uri) {
+	try {
+		return decodeURIComponent(uri);
+	} catch (_e) {
+		return uri;
+	}
+}
 /** @hidden */
 var Segment = class {
 	constructor(value) {
@@ -89,9 +97,9 @@ var PathPattern = class {
 			const remainingSegments = this.segments.length - 1 - segmentNdx;
 			const nextPathNdx = pathSegments.length - remainingSegments;
 			if (segment.name === "single-capture") {
-				matches[segment.trimmed] = pathSegments[pathNdx];
+				matches[segment.trimmed] = tryDecodeURIComponent(pathSegments[pathNdx]);
 			} else if (segment.name === "multi-capture") {
-				matches[segment.trimmed] = pathSegments.slice(pathNdx, nextPathNdx).join("/");
+				matches[segment.trimmed] = tryDecodeURIComponent(pathSegments.slice(pathNdx, nextPathNdx).join("/"));
 			}
 			pathNdx = segment.isMultiSegmentWildcard() ? nextPathNdx : pathNdx + 1;
 		}
@@ -114,4 +122,5 @@ var PathPattern = class {
 
 //#endregion
 exports.PathPattern = PathPattern;
-exports.trimParam = trimParam;
+exports.trimParam = trimParam;
+exports.tryDecodeURIComponent = tryDecodeURIComponent;

package/lib/esm/common/providers/tasks.mjs

@@ -47,6 +47,7 @@ function onDispatchHandler(handler) {
 					...context,
 					data
 				};
+				Object.defineProperty(arg, "context", { get: () => context });
 				await handler(arg);
 			}
 			res.status(204).end();

package/lib/esm/common/utilities/path-pattern.mjs

@@ -12,6 +12,14 @@ function trimParam(param) {
 	}
 	return paramNoBraces;
 }
+/** @internal */
+function tryDecodeURIComponent(uri) {
+	try {
+		return decodeURIComponent(uri);
+	} catch (_e) {
+		return uri;
+	}
+}
 /** @hidden */
 var Segment = class {
 	constructor(value) {
@@ -89,9 +97,9 @@ var PathPattern = class {
 			const remainingSegments = this.segments.length - 1 - segmentNdx;
 			const nextPathNdx = pathSegments.length - remainingSegments;
 			if (segment.name === "single-capture") {
-				matches[segment.trimmed] = pathSegments[pathNdx];
+				matches[segment.trimmed] = tryDecodeURIComponent(pathSegments[pathNdx]);
 			} else if (segment.name === "multi-capture") {
-				matches[segment.trimmed] = pathSegments.slice(pathNdx, nextPathNdx).join("/");
+				matches[segment.trimmed] = tryDecodeURIComponent(pathSegments.slice(pathNdx, nextPathNdx).join("/"));
 			}
 			pathNdx = segment.isMultiSegmentWildcard() ? nextPathNdx : pathNdx + 1;
 		}
@@ -113,4 +121,4 @@ var PathPattern = class {
 };
 
 //#endregion
-export { PathPattern, trimParam };
+export { PathPattern, trimParam, tryDecodeURIComponent };

package/lib/esm/v2/compat.mjs

@@ -1,14 +1,13 @@
-import { Message } from "./providers/pubsub.mjs";
-
 //#region src/v2/compat.ts
 const V1_COMPAT_PATCHED = Symbol.for("firebase.functions.v2.compat");
 /**
-* Patches a CloudEvent with V1 compatibility properties (context and message) if it's a supported type (e.g., Pub/Sub).
+* Patches a CloudEvent with V1 compatibility properties via getters.
 * This function ensures idempotency by using a Symbol to mark already patched events.
-* @param event The CloudEvent to potentially patch.
-* @returns The patched CloudEvent with V1 compatibility properties, or the original event if not a supported event type or already patched.
+* @param event The CloudEvent to patch.
+* @param getters A map of getters to attach to the event object.
+* @returns The patched CloudEvent with V1 compatibility properties.
 */
-function patchV1Compat(event) {
+function addV1Compat(event, getters) {
 	if (event[V1_COMPAT_PATCHED]) {
 		return event;
 	}
@@ -18,60 +17,21 @@ function patchV1Compat(event) {
 		writable: false,
 		configurable: false
 	});
-	switch (event.type) {
-		case "google.cloud.pubsub.topic.v1.messagePublished": {
-			const pubsubEvent = event;
-			const pubsubData = pubsubEvent.data;
-			if (!pubsubData || !pubsubData.message) {
-				throw new Error("Malformed Pub/Sub event: missing 'message' property.");
-			}
-			if (!(pubsubData.message instanceof Message)) {
-				pubsubData.message = new Message(pubsubData.message);
-			}
-			const v2Message = pubsubData.message;
-			Object.defineProperty(pubsubEvent, "context", {
-				get: () => {
-					const service = "pubsub.googleapis.com";
-					const sourcePrefix = `//${service}/`;
-					return {
-						eventId: v2Message.messageId,
-						timestamp: v2Message.publishTime,
-						eventType: "google.pubsub.topic.publish",
-						resource: {
-							service,
-							name: event.source?.startsWith(sourcePrefix) ? event.source.substring(sourcePrefix.length) : event.source || ""
-						},
-						params: {}
-					};
-				},
-				configurable: true,
-				enumerable: true
-			});
-			Object.defineProperty(pubsubEvent, "message", {
-				get: () => {
-					const baseV1Message = {
-						data: v2Message.data,
-						messageId: v2Message.messageId,
-						publishTime: v2Message.publishTime,
-						attributes: v2Message.attributes,
-						...v2Message.orderingKey && { orderingKey: v2Message.orderingKey }
-					};
-					return {
-						...baseV1Message,
-						get json() {
-							return v2Message.json;
-						},
-						toJSON: () => baseV1Message
-					};
-				},
-				configurable: true,
-				enumerable: true
-			});
-			return pubsubEvent;
-		}
-		default: return event;
+	const memo = {};
+	for (const [key, getter] of Object.entries(getters)) {
+		Object.defineProperty(event, key, {
+			get: () => {
+				if (!Object.prototype.hasOwnProperty.call(memo, key)) {
+					memo[key] = getter();
+				}
+				return memo[key];
+			},
+			configurable: true,
+			enumerable: true
+		});
 	}
+	return event;
 }
 
 //#endregion
-export { patchV1Compat };
+export { addV1Compat };

package/lib/esm/v2/index.doc.mjs

@@ -5,13 +5,13 @@ import { Change } from "../common/change.mjs";
 import { onInit } from "../common/onInit.mjs";
 import { config } from "../v1/config.mjs";
 import { setGlobalOptions } from "./options.mjs";
-import { pubsub_exports } from "./providers/pubsub.mjs";
 import { dataconnect_doc_exports } from "./dataconnect.doc.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
 import { https_exports } from "./providers/https.mjs";
 import { identity_exports } from "./providers/identity.mjs";
+import { pubsub_exports } from "./providers/pubsub.mjs";
 import { scheduler_exports } from "./providers/scheduler.mjs";
 import { storage_exports } from "./providers/storage.mjs";
 import { tasks_exports } from "./providers/tasks.mjs";

package/lib/esm/v2/index.mjs

@@ -5,15 +5,15 @@ import { setApp } from "../common/app.mjs";
 import { Change } from "../common/change.mjs";
 import { onInit } from "../common/onInit.mjs";
 import { config } from "../v1/config.mjs";
-import { setGlobalOptions } from "./options.mjs";
-import { pubsub_exports } from "./providers/pubsub.mjs";
 import "./core.mjs";
+import { setGlobalOptions } from "./options.mjs";
 import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
 import { https_exports } from "./providers/https.mjs";
 import { identity_exports } from "./providers/identity.mjs";
+import { pubsub_exports } from "./providers/pubsub.mjs";
 import { scheduler_exports } from "./providers/scheduler.mjs";
 import { storage_exports } from "./providers/storage.mjs";
 import { tasks_exports } from "./providers/tasks.mjs";

package/lib/esm/v2/providers/ai/index.mjs

@@ -0,0 +1,187 @@
+import { error } from "../../../logger/index.mjs";
+import { initV2Endpoint } from "../../../runtime/manifest.mjs";
+import { withInit } from "../../../common/onInit.mjs";
+import { HttpsError } from "../../../common/providers/https.mjs";
+import { wrapTraceContext } from "../../trace.mjs";
+import { getGlobalOptions, optionsToEndpoint } from "../../options.mjs";
+import "../https.mjs";
+import { requestTypeName, responseTypeName } from "./types/vertex/v1beta1/index.mjs";
+import { requestTypeName as requestTypeName$1, responseTypeName as responseTypeName$1 } from "./types/gemini/v1beta/index.mjs";
+
+//#region src/v2/providers/ai/index.ts
+const rpcCodeMap = {
+	ok: 0,
+	cancelled: 1,
+	unknown: 2,
+	"invalid-argument": 3,
+	"deadline-exceeded": 4,
+	"not-found": 5,
+	"already-exists": 6,
+	"permission-denied": 7,
+	unauthenticated: 16,
+	"resource-exhausted": 8,
+	"failed-precondition": 9,
+	aborted: 10,
+	"out-of-range": 11,
+	unimplemented: 12,
+	internal: 13,
+	unavailable: 14,
+	"data-loss": 15
+};
+const beforeGenerateEventType = "google.firebase.ailogic.v1.beforeGenerate";
+const afterGenerateEventType = "google.firebase.ailogic.v1.afterGenerate";
+const geminiV1Beta = "google.ai.generativelanguage.v1beta";
+const vertexV1Beta1 = "google.cloud.aiplatform.v1beta1";
+function beforeGenerateContent(optsOrCb, cb) {
+	let opts;
+	let handler;
+	if (arguments.length === 1) {
+		opts = {};
+		handler = optsOrCb;
+	} else {
+		opts = optsOrCb;
+		handler = cb;
+	}
+	let func = async (req, res) => {
+		try {
+			let event = req.body;
+			if (Buffer.isBuffer(event)) {
+				try {
+					event = JSON.parse(event.toString("utf-8"));
+				} catch (e) {
+					error("Invalid JSON body (Buffer):", e);
+					throw new HttpsError("invalid-argument", "Invalid JSON body", e);
+				}
+			} else if (typeof event === "string") {
+				try {
+					event = JSON.parse(event);
+				} catch (e) {
+					error("Invalid JSON body (String):", e);
+					throw new HttpsError("invalid-argument", "Invalid JSON body", e);
+				}
+			}
+			const parsedEvent = event;
+			const result = await handler(parsedEvent);
+			const responseBody = result || {};
+			if (typeof responseBody === "object") {
+				const api = parsedEvent.data?.api;
+				if (api === geminiV1Beta) {
+					responseBody["@type"] = requestTypeName$1;
+				} else if (api === vertexV1Beta1) {
+					responseBody["@type"] = requestTypeName;
+				}
+			}
+			res.status(200).send(responseBody);
+		} catch (err) {
+			error("Unhandled error:", err);
+			if (err instanceof HttpsError) {
+				res.status(500).send({
+					code: rpcCodeMap[err.code] || 13,
+					message: err.message
+				});
+			} else {
+				res.status(500).send({
+					code: 13,
+					message: "Internal error."
+				});
+			}
+		}
+	};
+	func.run = handler;
+	func = wrapTraceContext(withInit(func));
+	const baseOpts = optionsToEndpoint(getGlobalOptions());
+	const specificOpts = optionsToEndpoint(opts);
+	func.__endpoint = {
+		...initV2Endpoint(getGlobalOptions(), opts),
+		platform: "gcfv2",
+		...baseOpts,
+		...specificOpts,
+		labels: {
+			...baseOpts?.labels,
+			...specificOpts?.labels
+		},
+		blockingTrigger: {
+			eventType: beforeGenerateEventType,
+			options: { regionalWebhook: opts.regionalWebhook }
+		}
+	};
+	return func;
+}
+function afterGenerateContent(optsOrCb, cb) {
+	let opts;
+	let handler;
+	if (arguments.length === 1) {
+		opts = {};
+		handler = optsOrCb;
+	} else {
+		opts = optsOrCb;
+		handler = cb;
+	}
+	let func = async (req, res) => {
+		try {
+			let event = req.body;
+			if (Buffer.isBuffer(event)) {
+				try {
+					event = JSON.parse(event.toString("utf-8"));
+				} catch (e) {
+					error("Invalid JSON body (Buffer):", e);
+					throw new HttpsError("invalid-argument", "Invalid JSON body", e);
+				}
+			} else if (typeof event === "string") {
+				try {
+					event = JSON.parse(event);
+				} catch (e) {
+					error("Invalid JSON body (String):", e);
+					throw new HttpsError("invalid-argument", "Invalid JSON body", e);
+				}
+			}
+			const parsedEvent = event;
+			const result = await handler(parsedEvent);
+			const responseBody = result || {};
+			if (typeof responseBody === "object") {
+				const api = parsedEvent.data?.api;
+				if (api === geminiV1Beta) {
+					responseBody["@type"] = responseTypeName$1;
+				} else if (api === vertexV1Beta1) {
+					responseBody["@type"] = responseTypeName;
+				}
+			}
+			res.status(200).send(responseBody);
+		} catch (err) {
+			error("Unhandled error:", err);
+			if (err instanceof HttpsError) {
+				res.status(500).send({
+					code: rpcCodeMap[err.code] || 13,
+					message: err.message
+				});
+			} else {
+				res.status(500).send({
+					code: 13,
+					message: "Internal error."
+				});
+			}
+		}
+	};
+	func.run = handler;
+	func = wrapTraceContext(withInit(func));
+	const baseOpts = optionsToEndpoint(getGlobalOptions());
+	const specificOpts = optionsToEndpoint(opts);
+	func.__endpoint = {
+		...initV2Endpoint(getGlobalOptions(), opts),
+		platform: "gcfv2",
+		...baseOpts,
+		...specificOpts,
+		labels: {
+			...baseOpts?.labels,
+			...specificOpts?.labels
+		},
+		blockingTrigger: {
+			eventType: afterGenerateEventType,
+			options: { regionalWebhook: opts.regionalWebhook }
+		}
+	};
+	return func;
+}
+
+//#endregion
+export { GeminiV1BetaGenerateContentRequest, GeminiV1BetaGenerateContentResponse, HttpsError, VertexV1Beta1GenerateContentRequest, VertexV1Beta1GenerateContentResponse, afterGenerateContent, afterGenerateEventType, beforeGenerateContent, beforeGenerateEventType, geminiV1Beta, rpcCodeMap, vertexV1Beta1 };

package/lib/esm/v2/providers/ai/types/gemini/v1beta/index.mjs

@@ -0,0 +1,6 @@
+//#region src/v2/providers/ai/types/gemini/v1beta/index.ts
+const requestTypeName = "type.googleapis.com/google.ai.generativelanguage.v1beta.GenerateContentRequest";
+const responseTypeName = "type.googleapis.com/google.ai.generativelanguage.v1beta.GenerateContentResponse";
+
+//#endregion
+export { requestTypeName, responseTypeName };

package/lib/esm/v2/providers/ai/types/vertex/v1beta1/index.mjs

@@ -0,0 +1,6 @@
+//#region src/v2/providers/ai/types/vertex/v1beta1/index.ts
+const requestTypeName = "type.googleapis.com/google.cloud.aiplatform.v1beta1.GenerateContentRequest";
+const responseTypeName = "type.googleapis.com/google.cloud.aiplatform.v1beta1.GenerateContentResponse";
+
+//#endregion
+export { requestTypeName, responseTypeName };

package/lib/esm/v2/providers/database.mjs

@@ -6,6 +6,7 @@ import { normalizePath } from "../../common/utilities/path.mjs";
 import { DataSnapshot } from "../../common/providers/database.mjs";
 import { applyChange } from "../../common/utilities/utils.mjs";
 import { wrapTraceContext } from "../trace.mjs";
+import { addV1Compat } from "../compat.mjs";
 import { getGlobalOptions, optionsToEndpoint } from "../options.mjs";
 import { PathPattern } from "../../common/utilities/path-pattern.mjs";
 
@@ -135,6 +136,30 @@ function makeChangedDatabaseEvent(event, instance, params) {
 	delete databaseEvent.authid;
 	return databaseEvent;
 }
+function makeV1Context(eventType, databaseEvent) {
+	return {
+		eventId: databaseEvent.id,
+		timestamp: databaseEvent.time,
+		eventType: {
+			[writtenEventType]: "providers/google.firebase.database/eventTypes/ref.write",
+			[createdEventType]: "providers/google.firebase.database/eventTypes/ref.create",
+			[updatedEventType]: "providers/google.firebase.database/eventTypes/ref.update",
+			[deletedEventType]: "providers/google.firebase.database/eventTypes/ref.delete"
+		}[eventType] || eventType,
+		resource: {
+			service: "firebaseio.com",
+			name: `projects/_/instances/${databaseEvent.instance}/refs/${databaseEvent.ref}`
+		},
+		params: databaseEvent.params,
+		...databaseEvent.authType === "admin" ? { authType: "ADMIN" } : databaseEvent.authType === "unauthenticated" ? { authType: "UNAUTHENTICATED" } : databaseEvent.authType === "app_user" ? {
+			authType: "USER",
+			auth: {
+				uid: databaseEvent.authId || "",
+				token: {}
+			}
+		} : {}
+	};
+}
 /** @internal */
 function makeEndpoint(eventType, opts, path, instance) {
 	const baseOpts = optionsToEndpoint(getGlobalOptions());
@@ -173,7 +198,11 @@ function onChangedOperation(eventType, referenceOrOpts, handler) {
 		const instanceUrl = getInstance(event);
 		const params = makeParams(event, pathPattern, instancePattern);
 		const databaseEvent = makeChangedDatabaseEvent(event, instanceUrl, params);
-		return wrapTraceContext(withInit(handler))(databaseEvent);
+		const compatEvent = addV1Compat(databaseEvent, {
+			context: () => makeV1Context(eventType, databaseEvent),
+			change: () => databaseEvent.data
+		});
+		return wrapTraceContext(withInit(handler))(compatEvent);
 	};
 	func.run = handler;
 	func.__endpoint = makeEndpoint(eventType, opts, pathPattern, instancePattern);
@@ -190,7 +219,11 @@ function onOperation(eventType, referenceOrOpts, handler) {
 		const params = makeParams(event, pathPattern, instancePattern);
 		const data = eventType === deletedEventType ? event.data.data : event.data.delta;
 		const databaseEvent = makeDatabaseEvent(event, data, instanceUrl, params);
-		return wrapTraceContext(withInit(handler))(databaseEvent);
+		const compatEvent = addV1Compat(databaseEvent, {
+			context: () => makeV1Context(eventType, databaseEvent),
+			snapshot: () => databaseEvent.data
+		});
+		return wrapTraceContext(withInit(handler))(compatEvent);
 	};
 	func.run = handler;
 	func.__endpoint = makeEndpoint(eventType, opts, pathPattern, instancePattern);

package/lib/esm/v2/providers/firestore.mjs

@@ -6,8 +6,9 @@ import { withInit } from "../../common/onInit.mjs";
 import { normalizePath } from "../../common/utilities/path.mjs";
 import { createBeforeSnapshotFromJson, createBeforeSnapshotFromProtobuf, createSnapshotFromJson, createSnapshotFromProtobuf } from "../../common/providers/firestore.mjs";
 import { wrapTraceContext } from "../trace.mjs";
-import { getGlobalOptions, optionsToEndpoint } from "../options.mjs";
+import { addV1Compat } from "../compat.mjs";
 import "../core.mjs";
+import { getGlobalOptions, optionsToEndpoint } from "../options.mjs";
 import { PathPattern } from "../../common/utilities/path-pattern.mjs";
 
 //#region src/v2/providers/firestore.ts
@@ -20,6 +21,7 @@ var firestore_exports = /* @__PURE__ */ __export({
 	deletedEventType: () => deletedEventType,
 	deletedEventWithAuthContextType: () => deletedEventWithAuthContextType,
 	getOpts: () => getOpts,
+	getV1Context: () => getV1Context,
 	makeChangedFirestoreEvent: () => makeChangedFirestoreEvent,
 	makeEndpoint: () => makeEndpoint,
 	makeFirestoreEvent: () => makeFirestoreEvent,
@@ -68,7 +70,7 @@ function onDocumentWritten(documentOrOpts, handler) {
 * Event handler that triggers when a document is created, updated, or deleted in Firestore.
 * This trigger also provides the authentication context of the principal who triggered the event.
 *
-* @param opts - Options or a string document path.
+* @param documentOrOpts - Options or a string document path.
 * @param handler - Event handler which is run every time a Firestore create, update, or delete occurs.
 */
 function onDocumentWrittenWithAuthContext(documentOrOpts, handler) {
@@ -262,6 +264,29 @@ function makeEndpoint(eventType, opts, document, database, namespace) {
 	};
 }
 /** @internal */
+function getV1Context(event) {
+	return {
+		eventId: event.id,
+		timestamp: event.time,
+		eventType: {
+			"google.cloud.firestore.document.v1.written": "providers/cloud.firestore/eventTypes/document.write",
+			"google.cloud.firestore.document.v1.created": "providers/cloud.firestore/eventTypes/document.create",
+			"google.cloud.firestore.document.v1.updated": "providers/cloud.firestore/eventTypes/document.update",
+			"google.cloud.firestore.document.v1.deleted": "providers/cloud.firestore/eventTypes/document.delete",
+			"google.cloud.firestore.document.v1.written.withAuthContext": "providers/cloud.firestore/eventTypes/document.write",
+			"google.cloud.firestore.document.v1.created.withAuthContext": "providers/cloud.firestore/eventTypes/document.create",
+			"google.cloud.firestore.document.v1.updated.withAuthContext": "providers/cloud.firestore/eventTypes/document.update",
+			"google.cloud.firestore.document.v1.deleted.withAuthContext": "providers/cloud.firestore/eventTypes/document.delete"
+		}[event.type] || event.type,
+		resource: {
+			service: "firestore.googleapis.com",
+			name: `projects/${event.project}/databases/${event.database}/documents/${event.document}`
+		},
+		params: event.params,
+		authType: event.authType,
+		authId: event.authId
+	};
+}
 function onOperation(eventType, documentOrOpts, handler) {
 	const { document, database, namespace, opts } = getOpts(documentOrOpts);
 	const func = (raw) => {
@@ -269,13 +294,16 @@ function onOperation(eventType, documentOrOpts, handler) {
 		const documentPattern = new PathPattern(typeof document === "string" ? document : document.value());
 		const params = makeParams(event.document, documentPattern);
 		const firestoreEvent = makeFirestoreEvent(eventType, event, params);
-		return wrapTraceContext(withInit(handler))(firestoreEvent);
+		const patchedEvent = addV1Compat(firestoreEvent, {
+			context: () => getV1Context(firestoreEvent),
+			snapshot: () => firestoreEvent.data
+		});
+		return wrapTraceContext(withInit(handler))(patchedEvent);
 	};
 	func.run = handler;
 	func.__endpoint = makeEndpoint(eventType, opts, document, database, namespace);
 	return func;
 }
-/** @internal */
 function onChangedOperation(eventType, documentOrOpts, handler) {
 	const { document, database, namespace, opts } = getOpts(documentOrOpts);
 	const func = (raw) => {
@@ -283,7 +311,11 @@ function onChangedOperation(eventType, documentOrOpts, handler) {
 		const documentPattern = new PathPattern(typeof document === "string" ? document : document.value());
 		const params = makeParams(event.document, documentPattern);
 		const firestoreEvent = makeChangedFirestoreEvent(event, params);
-		return wrapTraceContext(withInit(handler))(firestoreEvent);
+		const patchedEvent = addV1Compat(firestoreEvent, {
+			context: () => getV1Context(firestoreEvent),
+			change: () => firestoreEvent.data
+		});
+		return wrapTraceContext(withInit(handler))(patchedEvent);
 	};
 	func.run = handler;
 	func.__endpoint = makeEndpoint(eventType, opts, document, database, namespace);
@@ -291,4 +323,4 @@ function onChangedOperation(eventType, documentOrOpts, handler) {
 }
 
 //#endregion
-export { Change, createBeforeSnapshot, createSnapshot, createdEventType, createdEventWithAuthContextType, deletedEventType, deletedEventWithAuthContextType, firestore_exports, getOpts, makeChangedFirestoreEvent, makeEndpoint, makeFirestoreEvent, makeParams, onChangedOperation, onDocumentCreated, onDocumentCreatedWithAuthContext, onDocumentDeleted, onDocumentDeletedWithAuthContext, onDocumentUpdated, onDocumentUpdatedWithAuthContext, onDocumentWritten, onDocumentWrittenWithAuthContext, onOperation, updatedEventType, updatedEventWithAuthContextType, writtenEventType, writtenEventWithAuthContextType };
+export { Change, createBeforeSnapshot, createSnapshot, createdEventType, createdEventWithAuthContextType, deletedEventType, deletedEventWithAuthContextType, firestore_exports, getOpts, getV1Context, makeChangedFirestoreEvent, makeEndpoint, makeFirestoreEvent, makeParams, onChangedOperation, onDocumentCreated, onDocumentCreatedWithAuthContext, onDocumentDeleted, onDocumentDeletedWithAuthContext, onDocumentUpdated, onDocumentUpdatedWithAuthContext, onDocumentWritten, onDocumentWrittenWithAuthContext, onOperation, updatedEventType, updatedEventWithAuthContextType, writtenEventType, writtenEventWithAuthContextType };

package/lib/esm/v2/providers/https.mjs

@@ -128,13 +128,21 @@ function onCall(optsOrHandler, handler) {
 		origin = origin[0];
 	}
 	const fixedLen = (req, resp) => handler(req, resp);
+	let enforceAppCheck = opts.enforceAppCheck ?? getGlobalOptions().enforceAppCheck;
+	if (enforceAppCheck instanceof Expression) {
+		enforceAppCheck = enforceAppCheck.value();
+	}
+	let consumeAppCheckToken = opts.consumeAppCheckToken;
+	if (consumeAppCheckToken instanceof Expression) {
+		consumeAppCheckToken = consumeAppCheckToken.value();
+	}
 	let func = onCallHandler({
 		cors: {
 			origin,
 			methods: "POST"
 		},
-		enforceAppCheck: opts.enforceAppCheck ?? getGlobalOptions().enforceAppCheck,
-		consumeAppCheckToken: opts.consumeAppCheckToken,
+		enforceAppCheck,
+		consumeAppCheckToken,
 		heartbeatSeconds: opts.heartbeatSeconds,
 		authPolicy: opts.authPolicy
 	}, fixedLen, "gcfv2");

package/lib/esm/v2/providers/pubsub.mjs

@@ -3,8 +3,8 @@ import { initV2Endpoint } from "../../runtime/manifest.mjs";
 import { copyIfPresent } from "../../common/encoding.mjs";
 import { withInit } from "../../common/onInit.mjs";
 import { wrapTraceContext } from "../trace.mjs";
+import { addV1Compat } from "../compat.mjs";
 import { getGlobalOptions, optionsToEndpoint, optionsToTriggerAnnotations } from "../options.mjs";
-import { patchV1Compat } from "../compat.mjs";
 
 //#region src/v2/providers/pubsub.ts
 var pubsub_exports = /* @__PURE__ */ __export({
@@ -99,7 +99,47 @@ function onMessagePublished(topicOrOptions, handler) {
 		delete opts.topic;
 	}
 	const func = (raw) => {
-		const event = patchV1Compat(raw);
+		const pubsubEvent = raw;
+		const pubsubData = pubsubEvent.data;
+		let v2Message;
+		if (pubsubData && pubsubData.message) {
+			v2Message = pubsubData.message instanceof Message ? pubsubData.message : new Message(pubsubData.message);
+			pubsubData.message = v2Message;
+		} else {
+			throw new Error("Malformed Pub/Sub event: missing 'message' property.");
+		}
+		const event = addV1Compat(pubsubEvent, {
+			context: () => {
+				const service = "pubsub.googleapis.com";
+				const sourcePrefix = `//${service}/`;
+				return {
+					eventId: v2Message.messageId,
+					timestamp: v2Message.publishTime,
+					eventType: "google.pubsub.topic.publish",
+					resource: {
+						service,
+						name: raw.source?.startsWith(sourcePrefix) ? raw.source.substring(sourcePrefix.length) : raw.source || ""
+					},
+					params: {}
+				};
+			},
+			message: () => {
+				const baseV1Message = {
+					data: v2Message.data,
+					messageId: v2Message.messageId,
+					publishTime: v2Message.publishTime,
+					attributes: v2Message.attributes,
+					...v2Message.orderingKey && { orderingKey: v2Message.orderingKey }
+				};
+				return {
+					...baseV1Message,
+					get json() {
+						return v2Message.json;
+					},
+					toJSON: () => baseV1Message
+				};
+			}
+		});
 		return wrapTraceContext(withInit(handler))(event);
 	};
 	func.run = handler;