firebase-functions 3.19.0 → 3.21.0

package/lib/handler-builder.js

@@ -31,6 +31,7 @@ const https = require("./providers/https");
 const pubsub = require("./providers/pubsub");
 const remoteConfig = require("./providers/remoteConfig");
 const storage = require("./providers/storage");
+const tasks = require("./providers/tasks");
 const testLab = require("./providers/testLab");
 /**
  * The `HandlerBuilder` class facilitates the writing of functions by developers
@@ -76,11 +77,23 @@ class HandlerBuilder {
                 func.__requiredAPIs = undefined;
                 return func;
             },
-            /** @hidden */
+        };
+    }
+    /**
+     * Create a handler for tasks functions.
+     *
+     * @example
+     * ```javascript
+     * exports.myFunction = functions.handler.tasks.onDispatch((data, context) => { ... })
+     * ```
+     */
+    /** @hidden */
+    get tasks() {
+        return {
             get taskQueue() {
                 return {
-                    onEnqueue(handler) {
-                        const builder = new https.TaskQueueBuilder();
+                    onDispatch: (handler) => {
+                        const builder = new tasks.TaskQueueBuilder();
                         const func = builder.onDispatch(handler);
                         func.__trigger = {};
                         func.__endpoint = undefined;
@@ -310,7 +323,7 @@ class HandlerBuilder {
     get auth() {
         return {
             get user() {
-                return new auth.UserBuilder(() => null, {});
+                return new auth.UserBuilder(() => null, {}, {});
             },
         };
     }

package/lib/index.d.ts

@@ -6,12 +6,13 @@ import * as https from './providers/https';
 import * as pubsub from './providers/pubsub';
 import * as remoteConfig from './providers/remoteConfig';
 import * as storage from './providers/storage';
+import * as tasks from './providers/tasks';
 import * as testLab from './providers/testLab';
 import * as apps from './apps';
 import { handler } from './handler-builder';
 import * as logger from './logger';
 declare const app: apps.apps.Apps;
-export { analytics, app, auth, database, firestore, handler, https, pubsub, remoteConfig, storage, testLab, logger, };
+export { analytics, app, auth, database, firestore, handler, https, pubsub, remoteConfig, storage, tasks, testLab, logger, };
 export * from './cloud-functions';
 export * from './config';
 export * from './function-builder';

package/lib/index.js

@@ -35,7 +35,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.testLab = exports.storage = exports.remoteConfig = exports.pubsub = exports.https = exports.handler = exports.firestore = exports.database = exports.auth = exports.app = exports.analytics = void 0;
+exports.logger = exports.testLab = exports.tasks = exports.storage = exports.remoteConfig = exports.pubsub = exports.https = exports.handler = exports.firestore = exports.database = exports.auth = exports.app = exports.analytics = void 0;
 // Providers:
 const analytics = require("./providers/analytics");
 exports.analytics = analytics;
@@ -53,6 +53,8 @@ const remoteConfig = require("./providers/remoteConfig");
 exports.remoteConfig = remoteConfig;
 const storage = require("./providers/storage");
 exports.storage = storage;
+const tasks = require("./providers/tasks");
+exports.tasks = tasks;
 const testLab = require("./providers/testLab");
 exports.testLab = testLab;
 const apps = require("./apps");

package/lib/providers/auth.d.ts

@@ -1,27 +1,40 @@
-import { UserRecord, UserInfo, UserRecordMetadata, userRecordConstructor } from '../common/providers/identity';
-import { CloudFunction, EventContext } from '../cloud-functions';
+import { BlockingFunction, CloudFunction, EventContext } from '../cloud-functions';
+import { AuthEventContext, AuthUserRecord, BeforeCreateResponse, BeforeSignInResponse, HttpsError, UserInfo, UserRecord, userRecordConstructor, UserRecordMetadata } from '../common/providers/identity';
 import { DeploymentOptions } from '../function-configuration';
 export { UserRecord, UserInfo, UserRecordMetadata, userRecordConstructor };
+export { HttpsError };
 /** @hidden */
 export declare const provider = "google.firebase.auth";
 /** @hidden */
 export declare const service = "firebaseauth.googleapis.com";
+/** Resource level options */
+export interface UserOptions {
+    blockingOptions?: {
+        idToken?: boolean;
+        accessToken?: boolean;
+        refreshToken?: boolean;
+    };
+}
 /**
  * Handle events related to Firebase authentication users.
  */
-export declare function user(): UserBuilder;
+export declare function user(userOptions?: UserOptions): UserBuilder;
 /** @hidden */
-export declare function _userWithOptions(options: DeploymentOptions): UserBuilder;
+export declare function _userWithOptions(options: DeploymentOptions, userOptions: UserOptions): UserBuilder;
 /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */
 export declare class UserBuilder {
     private triggerResource;
-    private options?;
+    private options;
+    private userOptions?;
     private static dataConstructor;
     /** @hidden */
-    constructor(triggerResource: () => string, options?: DeploymentOptions);
+    constructor(triggerResource: () => string, options: DeploymentOptions, userOptions?: UserOptions);
     /** Respond to the creation of a Firebase Auth user. */
     onCreate(handler: (user: UserRecord, context: EventContext) => PromiseLike<any> | any): CloudFunction<UserRecord>;
     /** Respond to the deletion of a Firebase Auth user. */
     onDelete(handler: (user: UserRecord, context: EventContext) => PromiseLike<any> | any): CloudFunction<UserRecord>;
+    beforeCreate(handler: (user: AuthUserRecord, context: AuthEventContext) => BeforeCreateResponse | void | Promise<BeforeCreateResponse> | Promise<void>): BlockingFunction;
+    beforeSignIn(handler: (user: AuthUserRecord, context: AuthEventContext) => BeforeSignInResponse | void | Promise<BeforeSignInResponse> | Promise<void>): BlockingFunction;
     private onOperation;
+    private beforeOperation;
 }

package/lib/providers/auth.js

@@ -21,11 +21,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserBuilder = exports._userWithOptions = exports.user = exports.service = exports.provider = exports.userRecordConstructor = exports.UserRecordMetadata = void 0;
+exports.UserBuilder = exports._userWithOptions = exports.user = exports.service = exports.provider = exports.HttpsError = exports.userRecordConstructor = exports.UserRecordMetadata = void 0;
+const cloud_functions_1 = require("../cloud-functions");
 const identity_1 = require("../common/providers/identity");
-Object.defineProperty(exports, "UserRecordMetadata", { enumerable: true, get: function () { return identity_1.UserRecordMetadata; } });
+Object.defineProperty(exports, "HttpsError", { enumerable: true, get: function () { return identity_1.HttpsError; } });
 Object.defineProperty(exports, "userRecordConstructor", { enumerable: true, get: function () { return identity_1.userRecordConstructor; } });
-const cloud_functions_1 = require("../cloud-functions");
+Object.defineProperty(exports, "UserRecordMetadata", { enumerable: true, get: function () { return identity_1.UserRecordMetadata; } });
 /** @hidden */
 exports.provider = 'google.firebase.auth';
 /** @hidden */
@@ -33,26 +34,27 @@ exports.service = 'firebaseauth.googleapis.com';
 /**
  * Handle events related to Firebase authentication users.
  */
-function user() {
-    return _userWithOptions({});
+function user(userOptions) {
+    return _userWithOptions({}, userOptions || {});
 }
 exports.user = user;
 /** @hidden */
-function _userWithOptions(options) {
+function _userWithOptions(options, userOptions) {
     return new UserBuilder(() => {
         if (!process.env.GCLOUD_PROJECT) {
             throw new Error('process.env.GCLOUD_PROJECT is not set.');
         }
         return 'projects/' + process.env.GCLOUD_PROJECT;
-    }, options);
+    }, options, userOptions);
 }
 exports._userWithOptions = _userWithOptions;
 /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */
 class UserBuilder {
     /** @hidden */
-    constructor(triggerResource, options) {
+    constructor(triggerResource, options, userOptions) {
         this.triggerResource = triggerResource;
         this.options = options;
+        this.userOptions = userOptions;
     }
     static dataConstructor(raw) {
         return (0, identity_1.userRecordConstructor)(raw.data);
@@ -65,6 +67,12 @@ class UserBuilder {
     onDelete(handler) {
         return this.onOperation(handler, 'user.delete');
     }
+    beforeCreate(handler) {
+        return this.beforeOperation(handler, 'beforeCreate');
+    }
+    beforeSignIn(handler) {
+        return this.beforeOperation(handler, 'beforeSignIn');
+    }
     onOperation(handler, eventType) {
         return (0, cloud_functions_1.makeCloudFunction)({
             handler,
@@ -77,5 +85,49 @@ class UserBuilder {
             options: this.options,
         });
     }
+    beforeOperation(handler, eventType) {
+        var _a, _b, _c, _d, _e, _f;
+        const accessToken = ((_b = (_a = this.userOptions) === null || _a === void 0 ? void 0 : _a.blockingOptions) === null || _b === void 0 ? void 0 : _b.accessToken) || false;
+        const idToken = ((_d = (_c = this.userOptions) === null || _c === void 0 ? void 0 : _c.blockingOptions) === null || _d === void 0 ? void 0 : _d.idToken) || false;
+        const refreshToken = ((_f = (_e = this.userOptions) === null || _e === void 0 ? void 0 : _e.blockingOptions) === null || _f === void 0 ? void 0 : _f.refreshToken) || false;
+        // Create our own function that just calls the provided function so we know for sure that
+        // handler takes two arguments. This is something common/providers/identity depends on.
+        const wrappedHandler = (user, context) => handler(user, context);
+        const func = (0, identity_1.wrapHandler)(eventType, wrappedHandler);
+        const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`;
+        func.__trigger = {
+            labels: {},
+            ...(0, cloud_functions_1.optionsToTrigger)(this.options),
+            blockingTrigger: {
+                eventType: legacyEventType,
+                options: {
+                    accessToken,
+                    idToken,
+                    refreshToken,
+                },
+            },
+        };
+        func.__endpoint = {
+            platform: 'gcfv1',
+            labels: {},
+            ...(0, cloud_functions_1.optionsToEndpoint)(this.options),
+            blockingTrigger: {
+                eventType: legacyEventType,
+                options: {
+                    accessToken,
+                    idToken,
+                    refreshToken,
+                },
+            },
+        };
+        func.__requiredAPIs = [
+            {
+                api: 'identitytoolkit.googleapis.com',
+                reason: 'Needed for auth blocking functions',
+            },
+        ];
+        func.run = handler;
+        return func;
+    }
 }
 exports.UserBuilder = UserBuilder;

package/lib/providers/https.d.ts

@@ -1,15 +1,8 @@
 import * as express from 'express';
 import { HttpsFunction, Runnable } from '../cloud-functions';
-import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest';
-import { CallableContext, FunctionsErrorCode, HttpsError, Request, TaskContext, TaskRateLimits, TaskRetryConfig } from '../common/providers/https';
+import { CallableContext, FunctionsErrorCode, HttpsError, Request } from '../common/providers/https';
 import { DeploymentOptions } from '../function-configuration';
-export { Request, CallableContext, FunctionsErrorCode, HttpsError, 
-/** @hidden */
-TaskRetryConfig as TaskRetryPolicy, 
-/** @hidden */
-TaskRateLimits, 
-/** @hidden */
-TaskContext, };
+export { Request, CallableContext, FunctionsErrorCode, HttpsError };
 /**
  * Handle HTTP requests.
  * @param handler A function that takes a request and response object,
@@ -21,41 +14,6 @@ export declare function onRequest(handler: (req: Request, resp: express.Response
  * @param handler A method that takes a data and context and returns a value.
  */
 export declare function onCall(handler: (data: any, context: CallableContext) => any | Promise<any>): HttpsFunction & Runnable<any>;
-/**
- * Configurations for Task Queue Functions.
- * @hidden
- */
-export interface TaskQueueOptions {
-    retryConfig?: TaskRetryConfig;
-    rateLimits?: TaskRateLimits;
-    /**
-     * Who can enqueue tasks for this function.
-     * If left unspecified, only service accounts which have
-     * roles/cloudtasks.enqueuer and roles/cloudfunctions.invoker
-     * will have permissions.
-     */
-    invoker?: 'private' | string | string[];
-}
-/** @hidden */
-export interface TaskQueueFunction {
-    (req: Request, res: express.Response): Promise<void>;
-    __trigger: unknown;
-    __endpoint: ManifestEndpoint;
-    __requiredAPIs?: ManifestRequiredAPI[];
-    run(data: any, context: TaskContext): void | Promise<void>;
-}
-/** @hidden */
-export declare class TaskQueueBuilder {
-    private readonly tqOpts?;
-    private readonly depOpts?;
-    onDispatch(handler: (data: any, context: TaskContext) => void | Promise<void>): TaskQueueFunction;
-}
-/**
- * Declares a function that can handle tasks enqueued using the Firebase Admin SDK.
- * @param options Configuration for the Task Queue that feeds into this function.
- * @hidden
- */
-export declare function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder;
 /** @hidden */
 export declare function _onRequestWithOptions(handler: (req: Request, resp: express.Response) => void | Promise<void>, options: DeploymentOptions): HttpsFunction;
 /** @hidden */

package/lib/providers/https.js

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._onCallWithOptions = exports._onRequestWithOptions = exports.taskQueue = exports.TaskQueueBuilder = exports.onCall = exports.onRequest = exports.HttpsError = void 0;
+exports._onCallWithOptions = exports._onRequestWithOptions = exports.onCall = exports.onRequest = exports.HttpsError = void 0;
 const cloud_functions_1 = require("../cloud-functions");
 const encoding_1 = require("../common/encoding");
 const https_1 = require("../common/providers/https");
@@ -44,54 +44,6 @@ function onCall(handler) {
 }
 exports.onCall = onCall;
 /** @hidden */
-class TaskQueueBuilder {
-    /** @internal */
-    constructor(tqOpts, depOpts) {
-        this.tqOpts = tqOpts;
-        this.depOpts = depOpts;
-    }
-    onDispatch(handler) {
-        // onEnqueueHandler 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
-        const fixedLen = (data, context) => handler(data, context);
-        const func = (0, https_1.onDispatchHandler)(fixedLen);
-        func.__trigger = {
-            ...(0, cloud_functions_1.optionsToTrigger)(this.depOpts || {}),
-            taskQueueTrigger: {},
-        };
-        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig');
-        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits');
-        (0, encoding_1.convertIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'invoker', 'invoker', encoding_1.convertInvoker);
-        func.__endpoint = {
-            platform: 'gcfv1',
-            ...(0, cloud_functions_1.optionsToEndpoint)(this.depOpts),
-            taskQueueTrigger: {},
-        };
-        (0, encoding_1.copyIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig');
-        (0, encoding_1.copyIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits');
-        (0, encoding_1.convertIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'invoker', 'invoker', encoding_1.convertInvoker);
-        func.__requiredAPIs = [
-            {
-                api: 'cloudtasks.googleapis.com',
-                reason: 'Needed for task queue functions',
-            },
-        ];
-        func.run = handler;
-        return func;
-    }
-}
-exports.TaskQueueBuilder = TaskQueueBuilder;
-/**
- * Declares a function that can handle tasks enqueued using the Firebase Admin SDK.
- * @param options Configuration for the Task Queue that feeds into this function.
- * @hidden
- */
-function taskQueue(options) {
-    return new TaskQueueBuilder(options);
-}
-exports.taskQueue = taskQueue;
-/** @hidden */
 function _onRequestWithOptions(handler, options) {
     // lets us add __trigger without altering handler:
     const cloudFunction = (req, res) => {

package/lib/providers/tasks.d.ts

@@ -0,0 +1,46 @@
+import * as express from 'express';
+import { Request } from '../common/providers/https';
+import { RateLimits, RetryConfig, TaskContext } from '../common/providers/tasks';
+import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest';
+export { 
+/** @hidden */
+RetryConfig as RetryPolicy, 
+/** @hidden */
+RateLimits, 
+/** @hidden */
+TaskContext, };
+/**
+ * Configurations for Task Queue Functions.
+ * @hidden
+ */
+export interface TaskQueueOptions {
+    retryConfig?: RetryConfig;
+    rateLimits?: RateLimits;
+    /**
+     * Who can enqueue tasks for this function.
+     * If left unspecified, only service accounts which have
+     * roles/cloudtasks.enqueuer and roles/cloudfunctions.invoker
+     * will have permissions.
+     */
+    invoker?: 'private' | string | string[];
+}
+/** @hidden */
+export interface TaskQueueFunction {
+    (req: Request, res: express.Response): Promise<void>;
+    __trigger: unknown;
+    __endpoint: ManifestEndpoint;
+    __requiredAPIs?: ManifestRequiredAPI[];
+    run(data: any, context: TaskContext): void | Promise<void>;
+}
+/** @hidden */
+export declare class TaskQueueBuilder {
+    private readonly tqOpts?;
+    private readonly depOpts?;
+    onDispatch(handler: (data: any, context: TaskContext) => void | Promise<void>): TaskQueueFunction;
+}
+/**
+ * Declares a function that can handle tasks enqueued using the Firebase Admin SDK.
+ * @param options Configuration for the Task Queue that feeds into this function.
+ * @hidden
+ */
+export declare function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder;

package/lib/providers/tasks.js

@@ -0,0 +1,75 @@
+"use strict";
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskQueue = exports.TaskQueueBuilder = void 0;
+const cloud_functions_1 = require("../cloud-functions");
+const encoding_1 = require("../common/encoding");
+const tasks_1 = require("../common/providers/tasks");
+/** @hidden */
+class TaskQueueBuilder {
+    /** @internal */
+    constructor(tqOpts, depOpts) {
+        this.tqOpts = tqOpts;
+        this.depOpts = depOpts;
+    }
+    onDispatch(handler) {
+        // onEnqueueHandler 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
+        const fixedLen = (data, context) => handler(data, context);
+        const func = (0, tasks_1.onDispatchHandler)(fixedLen);
+        func.__trigger = {
+            ...(0, cloud_functions_1.optionsToTrigger)(this.depOpts || {}),
+            taskQueueTrigger: {},
+        };
+        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig');
+        (0, encoding_1.copyIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits');
+        (0, encoding_1.convertIfPresent)(func.__trigger.taskQueueTrigger, this.tqOpts, 'invoker', 'invoker', encoding_1.convertInvoker);
+        func.__endpoint = {
+            platform: 'gcfv1',
+            ...(0, cloud_functions_1.optionsToEndpoint)(this.depOpts),
+            taskQueueTrigger: {},
+        };
+        (0, encoding_1.copyIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig');
+        (0, encoding_1.copyIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits');
+        (0, encoding_1.convertIfPresent)(func.__endpoint.taskQueueTrigger, this.tqOpts, 'invoker', 'invoker', encoding_1.convertInvoker);
+        func.__requiredAPIs = [
+            {
+                api: 'cloudtasks.googleapis.com',
+                reason: 'Needed for task queue functions',
+            },
+        ];
+        func.run = handler;
+        return func;
+    }
+}
+exports.TaskQueueBuilder = TaskQueueBuilder;
+/**
+ * Declares a function that can handle tasks enqueued using the Firebase Admin SDK.
+ * @param options Configuration for the Task Queue that feeds into this function.
+ * @hidden
+ */
+function taskQueue(options) {
+    return new TaskQueueBuilder(options);
+}
+exports.taskQueue = taskQueue;

package/lib/runtime/loader.js

@@ -22,8 +22,8 @@ exports.loadStack = exports.mergeRequiredAPIs = exports.extractStack = void 0;
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-const url = require("url");
 const path = require("path");
+const url = require("url");
 /**
  * Dynamically load import function to prevent TypeScript from
  * transpiling into a require.
@@ -51,17 +51,19 @@ async function loadModule(functionsDir) {
 }
 /* @internal */
 function extractStack(module, endpoints, requiredAPIs, prefix = '') {
-    for (const [name, val] of Object.entries(module)) {
+    for (const [name, valAsUnknown] of Object.entries(module)) {
+        // We're introspecting untrusted code here. Any is appropraite
+        const val = valAsUnknown;
         if (typeof val === 'function' &&
-            val['__endpoint'] &&
-            typeof val['__endpoint'] === 'object') {
+            val.__endpoint &&
+            typeof val.__endpoint === 'object') {
             const funcName = prefix + name;
             endpoints[funcName] = {
-                ...val['__endpoint'],
+                ...val.__endpoint,
                 entryPoint: funcName.replace(/-/g, '.'),
             };
-            if (val['__requiredAPIs'] && Array.isArray(val['__requiredAPIs'])) {
-                requiredAPIs.push(...val['__requiredAPIs']);
+            if (val.__requiredAPIs && Array.isArray(val.__requiredAPIs)) {
+                requiredAPIs.push(...val.__requiredAPIs);
             }
         }
         else if (typeof val === 'object' && val !== null) {

package/lib/runtime/manifest.d.ts

@@ -1,11 +1,3 @@
-/**
- * One or more event filters restrict the set of events delivered to an EventTrigger.
- */
-interface EventFilter {
-    attribute: string;
-    value: string;
-    operator?: string;
-}
 /**
  * An definition of a function as appears in the Manifest.
  */
@@ -19,6 +11,7 @@ export interface ManifestEndpoint {
     concurrency?: number;
     serviceAccountEmail?: string;
     timeoutSeconds?: number;
+    cpu?: number | 'gcf_gen1';
     vpc?: {
         connector: string;
         egressSettings?: string;
@@ -35,7 +28,9 @@ export interface ManifestEndpoint {
     };
     callableTrigger?: {};
     eventTrigger?: {
-        eventFilters: EventFilter[];
+        eventFilters: Record<string, string>;
+        eventFilterPathPatterns?: Record<string, string>;
+        channel?: string;
         eventType: string;
         retry: boolean;
         region?: string;
@@ -52,6 +47,10 @@ export interface ManifestEndpoint {
             maxDoublings?: number;
         };
     };
+    blockingTrigger?: {
+        eventType: string;
+        options?: Record<string, unknown>;
+    };
 }
 export interface ManifestRequiredAPI {
     api: string;
@@ -65,4 +64,3 @@ export interface ManifestStack {
     requiredAPIs: ManifestRequiredAPI[];
     endpoints: Record<string, ManifestEndpoint>;
 }
-export {};

package/lib/runtime/manifest.js

@@ -1,2 +1,23 @@
 "use strict";
+// The MIT License (MIT)
+//
+// Copyright (c) 2021 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });

package/lib/v2/core.d.ts

@@ -3,7 +3,7 @@ import { ManifestEndpoint } from '../runtime/manifest';
  * A CloudEventBase is the base of a cross-platform format for encoding a serverless event.
  * More information can be found in https://github.com/cloudevents/spec
  */
-interface CloudEventBase<T> {
+export interface CloudEvent<T> {
     /** Version of the CloudEvents spec for this event. */
     readonly specversion: '1.0';
     /** A globally unique ID for this event. */
@@ -18,29 +18,11 @@ interface CloudEventBase<T> {
     time: string;
     /** Information about this specific event. */
     data: T;
-    /**
-     * A map of template parameter name to value for subject strings.
-     *
-     * This map is only available on some event types that allow templates
-     * in the subject string, such as Firestore. When listening to a document
-     * template "/users/{uid}", an event with subject "/documents/users/1234"
-     * would have a params of {"uid": "1234"}.
-     *
-     * Params are generated inside the firebase-functions SDK and are not
-     * part of the CloudEvents spec nor the payload that a Cloud Function
-     * actually receives.
-     */
-    params?: Record<string, string>;
 }
-/**
- * A CloudEvent with custom extension attributes
- */
-export declare type CloudEvent<T = any, Ext = {}> = CloudEventBase<T> & Ext;
 /** A handler for CloudEvents. */
-export interface CloudFunction<T> {
+export interface CloudFunction<EventType extends CloudEvent<unknown>> {
     (raw: CloudEvent<unknown>): any | Promise<any>;
     __trigger?: unknown;
     __endpoint: ManifestEndpoint;
-    run(event: CloudEvent<T>): any | Promise<any>;
+    run(event: EventType): any | Promise<any>;
 }
-export {};

package/lib/v2/index.d.ts

@@ -1,9 +1,12 @@
 import * as logger from '../logger';
 import * as params from './params';
 import * as alerts from './providers/alerts';
+import * as eventarc from './providers/eventarc';
 import * as https from './providers/https';
+import * as identity from './providers/identity';
 import * as pubsub from './providers/pubsub';
 import * as storage from './providers/storage';
-export { https, pubsub, storage, logger, params, alerts };
+import * as tasks from './providers/tasks';
+export { alerts, https, identity, pubsub, storage, logger, params, tasks, eventarc, };
 export { setGlobalOptions, GlobalOptions } from './options';
 export { CloudFunction, CloudEvent } from './core';