firebase-functions 3.24.1 → 4.0.0-rc.0

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

@@ -1,14 +1,16 @@
-import * as express from 'express';
-import { CallableRequest, FunctionsErrorCode, HttpsError, Request } from '../../common/providers/https';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import * as options from '../options';
-import { GlobalOptions, SupportedRegion } from '../options';
-import { Expression } from '../params';
+import * as express from "express";
+import { ResetValue } from "../../common/options";
+import { CallableRequest, FunctionsErrorCode, HttpsError, Request } from "../../common/providers/https";
+import { ManifestEndpoint } from "../../runtime/manifest";
+import { GlobalOptions, SupportedRegion } from "../options";
+import { Expression } from "../../params";
+import { SecretParam } from "../../params/types";
+import * as options from "../options";
 export { Request, CallableRequest, FunctionsErrorCode, HttpsError };
 /**
- * Options that can be set on an individual HTTPS function.
+ * Options that can be set on an onRequest HTTPS function.
  */
-export interface HttpsOptions extends Omit<GlobalOptions, 'region'> {
+export interface HttpsOptions extends Omit<GlobalOptions, "region"> {
     /** HTTP functions can override global options and can specify multiple regions to deploy to. */
     region?: SupportedRegion | string | Array<SupportedRegion | string>;
     /** If true, allows CORS on requests to this function.
@@ -19,80 +21,90 @@ export interface HttpsOptions extends Omit<GlobalOptions, 'region'> {
     cors?: string | boolean | RegExp | Array<string | RegExp>;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @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
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    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.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    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).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    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
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
+    secrets?: (string | SecretParam)[];
     /**
      * Invoker to set access control on https functions.
      */
-    invoker?: 'public' | 'private' | string | string[];
-    secrets?: string[];
-    /** Whether failed executions should be delivered again. */
-    retry?: boolean;
+    invoker?: "public" | "private" | string | string[];
+}
+/**
+ * Options that can be set on a callable HTTPS function.
+ */
+export interface CallableOptions extends HttpsOptions {
+    /**
+     * Determines whether Firebase AppCheck is enforced.
+     * When true, requests with invalid tokens autorespond with a 401
+     * (Unauthorized) error.
+     * When false, requests with invalid tokens set event.app to undefiend.
+     */
+    enforceAppCheck?: boolean;
 }
 /**
  * Handles HTTPS requests.
@@ -102,8 +114,6 @@ export declare type HttpsFunction = ((
 req: Request, 
 /** An Express response object, for this function to respond to callers. */
 res: express.Response) => void | Promise<void>) & {
-    /** @alpha */
-    __trigger?: unknown;
     /** @alpha */
     __endpoint: ManifestEndpoint;
 };
@@ -136,7 +146,7 @@ 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: HttpsOptions, handler: (request: CallableRequest<T>) => Return): CallableFunction<T, Return>;
+export declare function onCall<T = any, Return = any | Promise<any>>(opts: CallableOptions, handler: (request: CallableRequest<T>) => Return): CallableFunction<T, Return>;
 /**
  * Declares a callable method for clients to call using a Firebase SDK.
  * @param handler - A function that takes a {@link https.CallableRequest}.

package/lib/v2/providers/https.js

@@ -28,9 +28,11 @@ exports.onCall = exports.onRequest = exports.HttpsError = void 0;
  */
 const cors = require("cors");
 const encoding_1 = require("../../common/encoding");
+const trace_1 = require("../trace");
 const debug_1 = require("../../common/debug");
 const https_1 = require("../../common/providers/https");
 Object.defineProperty(exports, "HttpsError", { enumerable: true, get: function () { return https_1.HttpsError; } });
+const manifest_1 = require("../../runtime/manifest");
 const options = require("../options");
 function onRequest(optsOrHandler, handler) {
     let opts;
@@ -41,46 +43,26 @@ function onRequest(optsOrHandler, handler) {
     else {
         opts = optsOrHandler;
     }
-    if ((0, debug_1.isDebugFeatureEnabled)('enableCors') || 'cors' in opts) {
-        const origin = (0, debug_1.isDebugFeatureEnabled)('enableCors') ? true : opts.cors;
+    if ((0, debug_1.isDebugFeatureEnabled)("enableCors") || "cors" in opts) {
+        const origin = (0, debug_1.isDebugFeatureEnabled)("enableCors") ? true : opts.cors;
         const userProvidedHandler = handler;
         handler = (req, res) => {
             return new Promise((resolve) => {
-                res.on('finish', resolve);
+                res.on("finish", resolve);
                 cors({ origin })(req, res, () => {
                     resolve(userProvidedHandler(req, res));
                 });
             });
         };
     }
-    Object.defineProperty(handler, '__trigger', {
-        get: () => {
-            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
-            // global options calls region a scalar and https allows it to be an array,
-            // but optionsToTriggerAnnotations handles both cases.
-            const specificOpts = options.optionsToTriggerAnnotations(opts);
-            const trigger = {
-                platform: 'gcfv2',
-                ...baseOpts,
-                ...specificOpts,
-                labels: {
-                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
-                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
-                },
-                httpsTrigger: {
-                    allowInsecure: false,
-                },
-            };
-            (0, encoding_1.convertIfPresent)(trigger.httpsTrigger, opts, 'invoker', 'invoker', encoding_1.convertInvoker);
-            return trigger;
-        },
-    });
+    handler = (0, trace_1.wrapTraceContext)(handler);
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     // global options calls region a scalar and https allows it to be an array,
     // but optionsToTriggerAnnotations handles both cases.
     const specificOpts = options.optionsToEndpoint(opts);
     const endpoint = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOpts,
         ...specificOpts,
         labels: {
@@ -89,56 +71,36 @@ function onRequest(optsOrHandler, handler) {
         },
         httpsTrigger: {},
     };
-    (0, encoding_1.convertIfPresent)(endpoint.httpsTrigger, opts, 'invoker', 'invoker', encoding_1.convertInvoker);
+    (0, encoding_1.convertIfPresent)(endpoint.httpsTrigger, opts, "invoker", "invoker", encoding_1.convertInvoker);
     handler.__endpoint = endpoint;
     return handler;
 }
 exports.onRequest = onRequest;
 function onCall(optsOrHandler, handler) {
+    var _a;
     let opts;
-    if (arguments.length == 1) {
+    if (arguments.length === 1) {
         opts = {};
         handler = optsOrHandler;
     }
     else {
         opts = optsOrHandler;
     }
-    const origin = (0, debug_1.isDebugFeatureEnabled)('enableCors')
-        ? true
-        : 'cors' in opts
-            ? opts.cors
-            : true;
+    const origin = (0, debug_1.isDebugFeatureEnabled)("enableCors") ? true : "cors" in opts ? opts.cors : true;
     // onCallHandler sniffs the function length to determine which API to present.
     // fix the length to prevent api versions from being mismatched.
     const fixedLen = (req) => handler(req);
-    const func = (0, https_1.onCallHandler)({ cors: { origin, methods: 'POST' } }, fixedLen);
-    Object.defineProperty(func, '__trigger', {
-        get: () => {
-            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
-            // global options calls region a scalar and https allows it to be an array,
-            // but optionsToTriggerAnnotations handles both cases.
-            const specificOpts = options.optionsToTriggerAnnotations(opts);
-            return {
-                platform: 'gcfv2',
-                ...baseOpts,
-                ...specificOpts,
-                labels: {
-                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
-                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
-                    'deployment-callable': 'true',
-                },
-                httpsTrigger: {
-                    allowInsecure: false,
-                },
-            };
-        },
-    });
+    const func = (0, https_1.onCallHandler)({
+        cors: { origin, methods: "POST" },
+        enforceAppCheck: (_a = opts.enforceAppCheck) !== null && _a !== void 0 ? _a : options.getGlobalOptions().enforceAppCheck,
+    }, fixedLen);
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     // global options calls region a scalar and https allows it to be an array,
     // but optionsToEndpoint handles both cases.
     const specificOpts = options.optionsToEndpoint(opts);
     func.__endpoint = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOpts,
         ...specificOpts,
         labels: {

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

@@ -2,10 +2,12 @@
  * Cloud functions to handle events from Google Cloud Identity Platform.
  * @packageDocumentation
  */
-import { BlockingFunction } from '../../cloud-functions';
-import { AuthBlockingEvent, AuthBlockingEventType, AuthUserRecord, BeforeCreateResponse, BeforeSignInResponse, HttpsError } from '../../common/providers/identity';
-import * as options from '../options';
-import { Expression } from '../params';
+import { ResetValue } from "../../common/options";
+import { AuthBlockingEvent, AuthBlockingEventType, AuthUserRecord, BeforeCreateResponse, BeforeSignInResponse, HttpsError } from "../../common/providers/identity";
+import { BlockingFunction } from "../../v1/cloud-functions";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 export { AuthUserRecord, AuthBlockingEvent, HttpsError };
 /** @hidden Internally used when parsing the options. */
 interface InternalOptions {
@@ -30,74 +32,74 @@ export interface BlockingOptions {
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @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
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    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.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    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).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    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
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
 }
 /**
  * Handles an event that is triggered before a user is created.

package/lib/v2/providers/identity.js

@@ -24,6 +24,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOpts = exports.beforeOperation = exports.beforeUserSignedIn = exports.beforeUserCreated = exports.HttpsError = void 0;
 const identity_1 = require("../../common/providers/identity");
 Object.defineProperty(exports, "HttpsError", { enumerable: true, get: function () { return identity_1.HttpsError; } });
+const trace_1 = require("../trace");
+const manifest_1 = require("../../runtime/manifest");
 const options = require("../options");
 /**
  * Handles an event that is triggered before a user is created
@@ -31,7 +33,7 @@ const options = require("../options");
  * @param handler? - If defined, an event handler which is run every time before a user is created
  */
 function beforeUserCreated(optsOrHandler, handler) {
-    return beforeOperation('beforeCreate', optsOrHandler, handler);
+    return beforeOperation("beforeCreate", optsOrHandler, handler);
 }
 exports.beforeUserCreated = beforeUserCreated;
 /**
@@ -40,12 +42,12 @@ exports.beforeUserCreated = beforeUserCreated;
  * @param handler - Event handler which is run every time before a user is signed in
  */
 function beforeUserSignedIn(optsOrHandler, handler) {
-    return beforeOperation('beforeSignIn', optsOrHandler, handler);
+    return beforeOperation("beforeSignIn", optsOrHandler, handler);
 }
 exports.beforeUserSignedIn = beforeUserSignedIn;
 /** @hidden */
 function beforeOperation(eventType, optsOrHandler, handler) {
-    if (!handler || typeof optsOrHandler === 'function') {
+    if (!handler || typeof optsOrHandler === "function") {
         handler = optsOrHandler;
         optsOrHandler = {};
     }
@@ -53,13 +55,14 @@ function beforeOperation(eventType, optsOrHandler, handler) {
     // Create our own function that just calls the provided function so we know for sure that
     // handler takes one argument. This is something common/providers/identity depends on.
     const wrappedHandler = (event) => handler(event);
-    const func = (0, identity_1.wrapHandler)(eventType, wrappedHandler);
+    const func = (0, trace_1.wrapTraceContext)((0, identity_1.wrapHandler)(eventType, wrappedHandler));
     const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`;
     /** Endpoint */
     const baseOptsEndpoint = options.optionsToEndpoint(options.getGlobalOptions());
     const specificOptsEndpoint = options.optionsToEndpoint(opts);
     func.__endpoint = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOptsEndpoint,
         ...specificOptsEndpoint,
         labels: {
@@ -77,8 +80,8 @@ function beforeOperation(eventType, optsOrHandler, handler) {
     };
     func.__requiredAPIs = [
         {
-            api: 'identitytoolkit.googleapis.com',
-            reason: 'Needed for auth blocking functions',
+            api: "identitytoolkit.googleapis.com",
+            reason: "Needed for auth blocking functions",
         },
     ];
     func.run = handler;

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

@@ -1,6 +1,8 @@
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { ResetValue } from "../../common/options";
+import { CloudEvent, CloudFunction } from "../core";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 /**
  * 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.
@@ -88,76 +90,76 @@ export interface PubSubOptions extends options.EventHandlerOptions {
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @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
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    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.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    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).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    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
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
     /** Whether failed executions should be delivered again. */
-    retry?: boolean;
+    retry?: boolean | Expression<boolean> | ResetValue;
 }
 /**
  * Handle a message being published to a Pub/Sub topic.

package/lib/v2/providers/pubsub.js

@@ -27,6 +27,8 @@ exports.onMessagePublished = exports.Message = void 0;
  * @packageDocumentation
  */
 const encoding_1 = require("../../common/encoding");
+const manifest_1 = require("../../runtime/manifest");
+const trace_1 = require("../trace");
 const options = require("../options");
 /**
  * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
@@ -63,7 +65,7 @@ class Message {
         this.messageId = data.messageId;
         this.data = data.data;
         this.attributes = data.attributes || {};
-        this.orderingKey = data.orderingKey || '';
+        this.orderingKey = data.orderingKey || "";
         this.publishTime = data.publishTime || new Date().toISOString();
         this._json = data.json;
     }
@@ -71,9 +73,9 @@ class Message {
      * The JSON data payload of this message object, if any.
      */
     get json() {
-        if (typeof this._json === 'undefined') {
+        if (typeof this._json === "undefined") {
             try {
-                this._json = JSON.parse(Buffer.from(this.data, 'base64').toString('utf8'));
+                this._json = JSON.parse(Buffer.from(this.data, "base64").toString("utf8"));
             }
             catch (err) {
                 throw new Error(`Unable to parse Pub/Sub message data as JSON: ${err.message}`);
@@ -111,7 +113,7 @@ exports.Message = Message;
 function onMessagePublished(topicOrOptions, handler) {
     let topic;
     let opts;
-    if (typeof topicOrOptions === 'string') {
+    if (typeof topicOrOptions === "string") {
         topic = topicOrOptions;
         opts = {};
     }
@@ -123,32 +125,14 @@ function onMessagePublished(topicOrOptions, handler) {
     const func = (raw) => {
         const messagePublishedData = raw.data;
         messagePublishedData.message = new Message(messagePublishedData.message);
-        return handler(raw);
+        return (0, trace_1.wrapTraceContext)(handler)(raw);
     };
     func.run = handler;
-    Object.defineProperty(func, '__trigger', {
-        get: () => {
-            const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());
-            const specificOpts = options.optionsToTriggerAnnotations(opts);
-            return {
-                platform: 'gcfv2',
-                ...baseOpts,
-                ...specificOpts,
-                labels: {
-                    ...baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.labels,
-                    ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
-                },
-                eventTrigger: {
-                    eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
-                    resource: `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`,
-                },
-            };
-        },
-    });
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     const specificOpts = options.optionsToEndpoint(opts);
     const endpoint = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOpts,
         ...specificOpts,
         labels: {
@@ -156,12 +140,12 @@ function onMessagePublished(topicOrOptions, handler) {
             ...specificOpts === null || specificOpts === void 0 ? void 0 : specificOpts.labels,
         },
         eventTrigger: {
-            eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
+            eventType: "google.cloud.pubsub.topic.v1.messagePublished",
             eventFilters: { topic },
             retry: false,
         },
     };
-    (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, 'retry', 'retry');
+    (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, "retry", "retry");
     func.__endpoint = endpoint;
     return func;
 }