firebase-functions 7.0.5 → 7.1.0

package/lib/esm/v2/compat.mjs

@@ -0,0 +1,77 @@
+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).
+* 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.
+*/
+function patchV1Compat(event) {
+	if (event[V1_COMPAT_PATCHED]) {
+		return event;
+	}
+	Object.defineProperty(event, V1_COMPAT_PATCHED, {
+		value: true,
+		enumerable: false,
+		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;
+	}
+}
+
+//#endregion
+export { patchV1Compat };

package/lib/esm/v2/index.mjs

@@ -5,14 +5,14 @@ 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 "./core.mjs";
 import { setGlobalOptions } from "./options.mjs";
+import { pubsub_exports } from "./providers/pubsub.mjs";
+import "./core.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/dataconnect/graphql.mjs

@@ -11,6 +11,15 @@ import { expressMiddleware } from "@as-integrations/express4";
 
 //#region src/v2/providers/dataconnect/graphql.ts
 const FIREBASE_AUTH_HEADER = "X-Firebase-Auth-Token";
+const PRELUDE_GQL = [
+	"scalar UUID",
+	"scalar Int64",
+	"scalar Any",
+	"scalar Void",
+	"scalar True",
+	"scalar Date",
+	"scalar Timestamp"
+].join("\n");
 /** @hidden */
 async function initGraphqlServer(opts) {
 	if (!opts.schema && !opts.schemaFilePath || opts.schema && opts.schemaFilePath) {
@@ -19,6 +28,7 @@ async function initGraphqlServer(opts) {
 	if (opts.schemaFilePath) {
 		opts.schema = fs.readFileSync(opts.schemaFilePath, "utf-8");
 	}
+	const schemaWithPrelude = PRELUDE_GQL + "\n" + opts.schema;
 	if (!opts.resolvers.query && !opts.resolvers.mutation) {
 		throw new Error("At least one query or mutation resolver must be provided.");
 	}
@@ -33,7 +43,7 @@ async function initGraphqlServer(opts) {
 		const serverPromise = (async () => {
 			const app = express();
 			const server = new ApolloServer({
-				typeDefs: opts.schema,
+				typeDefs: schemaWithPrelude,
 				resolvers: apolloResolvers
 			});
 			await server.start();
@@ -50,7 +60,6 @@ async function initGraphqlServer(opts) {
 	}
 }
 /**
-* @hidden
 * Handles HTTPS GraphQL requests.
 * @param {GraphqlServerOptions} opts - Options for configuring the GraphQL server.
 * @returns {HttpsFunction} A function you can export and deploy.

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

@@ -6,8 +6,8 @@ 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 "../core.mjs";
 import { getGlobalOptions, optionsToEndpoint } from "../options.mjs";
+import "../core.mjs";
 import { PathPattern } from "../../common/utilities/path-pattern.mjs";
 
 //#region src/v2/providers/firestore.ts

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

@@ -4,14 +4,13 @@ import { copyIfPresent } from "../../common/encoding.mjs";
 import { withInit } from "../../common/onInit.mjs";
 import { wrapTraceContext } from "../trace.mjs";
 import { getGlobalOptions, optionsToEndpoint, optionsToTriggerAnnotations } from "../options.mjs";
+import { patchV1Compat } from "../compat.mjs";
 
 //#region src/v2/providers/pubsub.ts
 var pubsub_exports = /* @__PURE__ */ __export({
 	Message: () => Message,
 	onMessagePublished: () => onMessagePublished
 });
-const V1_CONTEXT = Symbol("v1Context");
-const V1_MESSAGE = Symbol("v1Message");
 /**
 * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
 * You can create a function ({@link onMessagePublished}) that handles pub/sub events by using functions.pubsub.
@@ -34,7 +33,6 @@ const V1_MESSAGE = Symbol("v1Message");
 */
 /**
 * Interface representing a Google Cloud Pub/Sub message.
-*
 * @param data - Payload of a Pub/Sub message.
 * @typeParam T - Type representing `Message.data`'s JSON format
 */
@@ -66,7 +64,6 @@ var Message = class {
 	}
 	/**
 	* Returns a JSON-serializable representation of this object.
-	*
 	* @returns A JSON-serializable representation of this object.
 	*/
 	toJSON() {
@@ -102,69 +99,8 @@ function onMessagePublished(topicOrOptions, handler) {
 		delete opts.topic;
 	}
 	const func = (raw) => {
-		const messagePublishedData = raw.data;
-		if (!(messagePublishedData.message instanceof Message)) {
-			messagePublishedData.message = new Message(messagePublishedData.message);
-		}
-		/**
-		* Get the v1-compatible EventContext object.
-		* This is a compatibility layer to ease migration from v1 to v2.
-		* @returns A v1 EventContext-like object.
-		*/
-		Object.defineProperty(raw, "context", { get: function() {
-			if (this[V1_CONTEXT]) {
-				return this[V1_CONTEXT];
-			}
-			const data = this.data;
-			if (!data?.message) {
-				throw new Error("Malformed Pub/Sub event: 'data.message' is missing.");
-			}
-			const v1Context = {
-				eventId: data.message.messageId,
-				timestamp: data.message.publishTime,
-				eventType: "google.pubsub.topic.publish",
-				resource: {
-					service: "pubsub.googleapis.com",
-					name: this.source.replace("//pubsub.googleapis.com/", "")
-				},
-				params: {}
-			};
-			this[V1_CONTEXT] = v1Context;
-			return this[V1_CONTEXT];
-		} });
-		/**
-		* Get the v1-compatible Message object.
-		* This is a compatibility layer to ease migration from v1 to v2.
-		* @returns A plain object mimicking the v1 Message structure.
-		*/
-		Object.defineProperty(raw, "message", { get: function() {
-			if (this[V1_MESSAGE]) {
-				return this[V1_MESSAGE];
-			}
-			const data = this.data;
-			if (!data || !data.message) {
-				throw new Error("Malformed Pub/Sub event: 'data.message' is missing.");
-			}
-			const v2Message = data.message;
-			const baseMessage = {
-				data: v2Message.data,
-				messageId: v2Message.messageId,
-				publishTime: v2Message.publishTime,
-				attributes: v2Message.attributes || {}
-			};
-			if (v2Message.orderingKey) {
-				baseMessage.orderingKey = v2Message.orderingKey;
-			}
-			this[V1_MESSAGE] = {
-				...baseMessage,
-				get json() {
-					return v2Message.json;
-				},
-				toJSON: () => baseMessage
-			};
-			return this[V1_MESSAGE];
-		} });
-		return wrapTraceContext(withInit(handler))(raw);
+		const event = patchV1Compat(raw);
+		return wrapTraceContext(withInit(handler))(event);
 	};
 	func.run = handler;
 	Object.defineProperty(func, "__trigger", { get: () => {

package/lib/v2/compat.d.ts

@@ -0,0 +1,15 @@
+import { CloudEvent } from "./core";
+import { MessagePublishedData, V1PubSubMessage } from "./providers/pubsub";
+import { EventContext as V1EventContext } from "../v1";
+export interface V1Context extends Omit<V1EventContext, "resource"> {
+    resource: {
+        service: string;
+        name: string;
+    };
+}
+export type PubSubCloudEvent<T> = CloudEvent<MessagePublishedData<T>> & {
+    context: V1Context;
+    message: V1PubSubMessage<T>;
+};
+export declare function patchV1Compat<T>(event: CloudEvent<MessagePublishedData<T>>): PubSubCloudEvent<T>;
+export declare function patchV1Compat<T>(event: CloudEvent<T>): CloudEvent<T>;

package/lib/v2/compat.js

@@ -0,0 +1,77 @@
+const require_v2_providers_pubsub = require('./providers/pubsub.js');
+
+//#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).
+* 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.
+*/
+function patchV1Compat(event) {
+	if (event[V1_COMPAT_PATCHED]) {
+		return event;
+	}
+	Object.defineProperty(event, V1_COMPAT_PATCHED, {
+		value: true,
+		enumerable: false,
+		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 require_v2_providers_pubsub.Message)) {
+				pubsubData.message = new require_v2_providers_pubsub.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;
+	}
+}
+
+//#endregion
+exports.patchV1Compat = patchV1Compat;

package/lib/v2/index.d.ts

@@ -26,6 +26,7 @@ export { onInit } from "./core";
 export type { CloudFunction, CloudEvent, ParamsOf } from "./core";
 export { Change } from "../common/change";
 export { traceContext } from "../common/trace";
+export type { PubSubCloudEvent } from "./compat";
 import * as params from "../params";
 export { params };
 export { config } from "../v1/config";

package/lib/v2/index.js

@@ -5,14 +5,14 @@ const require_common_app = require('../common/app.js');
 const require_common_change = require('../common/change.js');
 const require_common_onInit = require('../common/onInit.js');
 const require_v1_config = require('../v1/config.js');
-require('./core.js');
 const require_v2_options = require('./options.js');
+const require_v2_providers_pubsub = require('./providers/pubsub.js');
+require('./core.js');
 const require_v2_providers_alerts_index = require('./providers/alerts/index.js');
 const require_v2_providers_database = require('./providers/database.js');
 const require_v2_providers_eventarc = require('./providers/eventarc.js');
 const require_v2_providers_https = require('./providers/https.js');
 const require_v2_providers_identity = require('./providers/identity.js');
-const require_v2_providers_pubsub = require('./providers/pubsub.js');
 const require_v2_providers_scheduler = require('./providers/scheduler.js');
 const require_v2_providers_storage = require('./providers/storage.js');
 const require_v2_providers_tasks = require('./providers/tasks.js');

package/lib/v2/providers/dataconnect/graphql.d.ts

@@ -4,14 +4,12 @@ import { HttpsFunction, HttpsOptions } from "../https";
 /** @hidden */
 export declare function initGraphqlServer(opts: GraphqlServerOptions): Promise<express.Express>;
 /**
- * @hidden
  * Handles HTTPS GraphQL requests.
  * @param {GraphqlServerOptions} opts - Options for configuring the GraphQL server.
  * @returns {HttpsFunction} A function you can export and deploy.
  */
 export declare function onGraphRequest(opts: GraphqlServerOptions): HttpsFunction;
 /**
- * @hidden
  * Options for configuring the GraphQL server.
  */
 export interface GraphqlServerOptions extends Omit<HttpsOptions, "cors"> {
@@ -35,7 +33,6 @@ export interface GraphqlServerOptions extends Omit<HttpsOptions, "cors"> {
     resolvers: GraphqlResolvers;
 }
 /**
- * @hidden
  * Per-request context state shared by all resolvers in a particular query.
  */
 export interface FirebaseContext {
@@ -45,7 +42,6 @@ export interface FirebaseContext {
     };
 }
 /**
- * @hidden
  * Resolver functions that populate data for individual GraphQL schema fields.
  */
 export interface GraphqlResolvers {

package/lib/v2/providers/dataconnect/graphql.js

@@ -16,6 +16,15 @@ __as_integrations_express4 = require_rolldown_runtime.__toESM(__as_integrations_
 
 //#region src/v2/providers/dataconnect/graphql.ts
 const FIREBASE_AUTH_HEADER = "X-Firebase-Auth-Token";
+const PRELUDE_GQL = [
+	"scalar UUID",
+	"scalar Int64",
+	"scalar Any",
+	"scalar Void",
+	"scalar True",
+	"scalar Date",
+	"scalar Timestamp"
+].join("\n");
 /** @hidden */
 async function initGraphqlServer(opts) {
 	if (!opts.schema && !opts.schemaFilePath || opts.schema && opts.schemaFilePath) {
@@ -24,6 +33,7 @@ async function initGraphqlServer(opts) {
 	if (opts.schemaFilePath) {
 		opts.schema = fs.default.readFileSync(opts.schemaFilePath, "utf-8");
 	}
+	const schemaWithPrelude = PRELUDE_GQL + "\n" + opts.schema;
 	if (!opts.resolvers.query && !opts.resolvers.mutation) {
 		throw new Error("At least one query or mutation resolver must be provided.");
 	}
@@ -38,7 +48,7 @@ async function initGraphqlServer(opts) {
 		const serverPromise = (async () => {
 			const app = (0, express.default)();
 			const server = new __apollo_server.ApolloServer({
-				typeDefs: opts.schema,
+				typeDefs: schemaWithPrelude,
 				resolvers: apolloResolvers
 			});
 			await server.start();
@@ -55,7 +65,6 @@ async function initGraphqlServer(opts) {
 	}
 }
 /**
-* @hidden
 * Handles HTTPS GraphQL requests.
 * @param {GraphqlServerOptions} opts - Options for configuring the GraphQL server.
 * @returns {HttpsFunction} A function you can export and deploy.

package/lib/v2/providers/firestore.js

@@ -6,8 +6,8 @@ const require_common_onInit = require('../../common/onInit.js');
 const require_common_utilities_path = require('../../common/utilities/path.js');
 const require_common_providers_firestore = require('../../common/providers/firestore.js');
 const require_v2_trace = require('../trace.js');
-require('../core.js');
 const require_v2_options = require('../options.js');
+require('../core.js');
 const require_common_utilities_path_pattern = require('../../common/utilities/path-pattern.js');
 
 //#region src/v2/providers/firestore.ts

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

@@ -1,9 +1,9 @@
 import { ResetValue } from "../../common/options";
-import { CloudEvent, CloudFunction } from "../core";
-import type { EventContext } from "../../v1/index";
+import { CloudFunction } from "../core";
 import { Expression } from "../../params";
 import * as options from "../options";
 import { SupportedSecretParam } from "../../params/types";
+import { PubSubCloudEvent } from "../compat";
 /**
  * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
  * You can create a function ({@link onMessagePublished}) that handles pub/sub events by using functions.pubsub.
@@ -26,7 +26,6 @@ import { SupportedSecretParam } from "../../params/types";
  */
 /**
  * Interface representing a Google Cloud Pub/Sub message.
- *
  * @param data - Payload of a Pub/Sub message.
  * @typeParam T - Type representing `Message.data`'s JSON format
  */
@@ -66,7 +65,6 @@ export declare class Message<T> {
     get json(): T;
     /**
      * Returns a JSON-serializable representation of this object.
-     *
      * @returns A JSON-serializable representation of this object.
      */
     toJSON(): any;
@@ -97,17 +95,6 @@ export interface V1PubSubMessage<T = any> {
     readonly json: T;
     toJSON(): any;
 }
-export interface MessagePublishedEvent<T = any> extends CloudEvent<MessagePublishedData<T>> {
-    /**
-     * v1-compatible EventContext.
-     */
-    readonly context: EventContext;
-    /**
-     * v1-compatible Pub/Sub Message.
-     * Note: This is a plain object mimicking the v1 Message structure, not an instance of the v1 Message class.
-     */
-    readonly message: V1PubSubMessage<T>;
-}
 /** PubSubOptions extend EventHandlerOptions but must include a topic. */
 export interface PubSubOptions extends options.EventHandlerOptions {
     /** The Pub/Sub topic to watch for message events */
@@ -127,7 +114,6 @@ export interface PubSubOptions extends options.EventHandlerOptions {
     /**
      * Timeout for the function in seconds, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     *
      * @remarks
      * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
      * function depends on the type of function: Event handling functions have a
@@ -138,7 +124,6 @@ export interface PubSubOptions extends options.EventHandlerOptions {
     timeoutSeconds?: number | Expression<number> | ResetValue;
     /**
      * Min number of actual instances to be running at a given time.
-     *
      * @remarks
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
@@ -150,7 +135,6 @@ export interface PubSubOptions extends options.EventHandlerOptions {
     maxInstances?: number | Expression<number> | ResetValue;
     /**
      * Number of requests a function can serve at once.
-     *
      * @remarks
      * Can only be applied to functions running on Cloud Functions v2.
      * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
@@ -160,7 +144,6 @@ export interface PubSubOptions extends options.EventHandlerOptions {
     concurrency?: number | Expression<number> | ResetValue;
     /**
      * Fractional number of CPUs to allocate to a function.
-     *
      * @remarks
      * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
      * This is different from the defaults when using the gcloud utility and is different from
@@ -199,11 +182,11 @@ export interface PubSubOptions extends options.EventHandlerOptions {
  * @param handler - runs every time a Cloud Pub/Sub message is published
  * @typeParam T - Type representing `Message.data`'s JSON format
  */
-export declare function onMessagePublished<T = any>(topic: string, handler: (event: MessagePublishedEvent<T>) => any | Promise<any>): CloudFunction<MessagePublishedEvent<T>>;
+export declare function onMessagePublished<T = any>(topic: string, handler: (event: PubSubCloudEvent<T>) => any | Promise<any>): CloudFunction<PubSubCloudEvent<T>>;
 /**
  * Handle a message being published to a Pub/Sub topic.
  * @param options - Option containing information (topic) for event
  * @param handler - runs every time a Cloud Pub/Sub message is published
  * @typeParam T - Type representing `Message.data`'s JSON format
  */
-export declare function onMessagePublished<T = any>(options: PubSubOptions, handler: (event: MessagePublishedEvent<T>) => any | Promise<any>): CloudFunction<MessagePublishedEvent<T>>;
+export declare function onMessagePublished<T = any>(options: PubSubOptions, handler: (event: PubSubCloudEvent<T>) => any | Promise<any>): CloudFunction<PubSubCloudEvent<T>>;

package/lib/v2/providers/pubsub.js

@@ -4,14 +4,13 @@ const require_common_encoding = require('../../common/encoding.js');
 const require_common_onInit = require('../../common/onInit.js');
 const require_v2_trace = require('../trace.js');
 const require_v2_options = require('../options.js');
+const require_v2_compat = require('../compat.js');
 
 //#region src/v2/providers/pubsub.ts
 var pubsub_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
 	Message: () => Message,
 	onMessagePublished: () => onMessagePublished
 });
-const V1_CONTEXT = Symbol("v1Context");
-const V1_MESSAGE = Symbol("v1Message");
 /**
 * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
 * You can create a function ({@link onMessagePublished}) that handles pub/sub events by using functions.pubsub.
@@ -34,7 +33,6 @@ const V1_MESSAGE = Symbol("v1Message");
 */
 /**
 * Interface representing a Google Cloud Pub/Sub message.
-*
 * @param data - Payload of a Pub/Sub message.
 * @typeParam T - Type representing `Message.data`'s JSON format
 */
@@ -66,7 +64,6 @@ var Message = class {
 	}
 	/**
 	* Returns a JSON-serializable representation of this object.
-	*
 	* @returns A JSON-serializable representation of this object.
 	*/
 	toJSON() {
@@ -102,69 +99,8 @@ function onMessagePublished(topicOrOptions, handler) {
 		delete opts.topic;
 	}
 	const func = (raw) => {
-		const messagePublishedData = raw.data;
-		if (!(messagePublishedData.message instanceof Message)) {
-			messagePublishedData.message = new Message(messagePublishedData.message);
-		}
-		/**
-		* Get the v1-compatible EventContext object.
-		* This is a compatibility layer to ease migration from v1 to v2.
-		* @returns A v1 EventContext-like object.
-		*/
-		Object.defineProperty(raw, "context", { get: function() {
-			if (this[V1_CONTEXT]) {
-				return this[V1_CONTEXT];
-			}
-			const data = this.data;
-			if (!data?.message) {
-				throw new Error("Malformed Pub/Sub event: 'data.message' is missing.");
-			}
-			const v1Context = {
-				eventId: data.message.messageId,
-				timestamp: data.message.publishTime,
-				eventType: "google.pubsub.topic.publish",
-				resource: {
-					service: "pubsub.googleapis.com",
-					name: this.source.replace("//pubsub.googleapis.com/", "")
-				},
-				params: {}
-			};
-			this[V1_CONTEXT] = v1Context;
-			return this[V1_CONTEXT];
-		} });
-		/**
-		* Get the v1-compatible Message object.
-		* This is a compatibility layer to ease migration from v1 to v2.
-		* @returns A plain object mimicking the v1 Message structure.
-		*/
-		Object.defineProperty(raw, "message", { get: function() {
-			if (this[V1_MESSAGE]) {
-				return this[V1_MESSAGE];
-			}
-			const data = this.data;
-			if (!data || !data.message) {
-				throw new Error("Malformed Pub/Sub event: 'data.message' is missing.");
-			}
-			const v2Message = data.message;
-			const baseMessage = {
-				data: v2Message.data,
-				messageId: v2Message.messageId,
-				publishTime: v2Message.publishTime,
-				attributes: v2Message.attributes || {}
-			};
-			if (v2Message.orderingKey) {
-				baseMessage.orderingKey = v2Message.orderingKey;
-			}
-			this[V1_MESSAGE] = {
-				...baseMessage,
-				get json() {
-					return v2Message.json;
-				},
-				toJSON: () => baseMessage
-			};
-			return this[V1_MESSAGE];
-		} });
-		return require_v2_trace.wrapTraceContext(require_common_onInit.withInit(handler))(raw);
+		const event = require_v2_compat.patchV1Compat(raw);
+		return require_v2_trace.wrapTraceContext(require_common_onInit.withInit(handler))(event);
 	};
 	func.run = handler;
 	Object.defineProperty(func, "__trigger", { get: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "7.0.5",
+  "version": "7.1.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",