From 986bc14d79f0a004859e00a6f5b8b690f1dfbd8b Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 20 Mar 2018 16:36:21 +0000 Subject: [PATCH 001/705] [firebase-release] Removed change log and reset repo after 0.9.0 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 30a28a74e..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -feature - Adds HTTPS Callable Functions, a kind of HTTPS trigger that can be called from a Firebase client SDK. From b6c395f713ba93e31361333779e1c7c60be08884 Mon Sep 17 00:00:00 2001 From: Jaewon Seo Date: Wed, 21 Mar 2018 14:29:45 -0700 Subject: [PATCH 002/705] Correct the type signature of DeltaDocumentSnapshot (#162) --- src/providers/firestore.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 767c3ff2b..e534c0b4a 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -73,12 +73,12 @@ export class NamespaceBuilder { export interface DeltaDocumentSnapshot { exists: Boolean; - ref: any; + ref: firebase.firestore.DocumentReference; id: string; - createTime: string; - updateTime: string; - readTime: string; - previous: any; + createTime?: string; + updateTime?: string; + readTime?: string; + previous: DeltaDocumentSnapshot; data: () => any; get: (key: string) => any; }; From 3c6a7e3006a354595484cfcaa043ceecb50d5019 Mon Sep 17 00:00:00 2001 From: Bryan Klimt Date: Wed, 21 Mar 2018 16:16:21 -0700 Subject: [PATCH 003/705] Change https callables to use apps.admin.auth instead of firebase.auth. (#206) * Change https callables to use apps.admin.auth instead of firebase.auth. * explicitly mock the credential in the admin app * Use the projectId from admin app instead of a constant --- spec/providers/https.spec.ts | 26 ++++++++++++++++++++------ src/providers/https.ts | 3 ++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index 03279ad57..b9c523007 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -27,9 +27,8 @@ import * as jwt from 'jsonwebtoken'; import * as mocks from '../fixtures/credential/key.json'; import * as nock from 'nock'; import * as _ from 'lodash'; -import { config } from '../../src/index'; +import { apps } from '../../src/apps'; import { expect } from 'chai'; -import { fakeConfig } from '../support/helpers'; describe('CloudHttpsBuilder', () => { describe('#onRequest', () => { @@ -202,13 +201,28 @@ export function generateIdToken(projectId: string): string { } describe('callable.FunctionBuilder', () => { + let oldCredential: firebase.credential.Credential = undefined; + before(() => { - config.singleton = fakeConfig(); - firebase.initializeApp(config.singleton.firebase); + let credential = { + getAccessToken: () => { + return Promise.resolve({ + expires_in: 1000, + access_token: 'fake', + }); + }, + getCertificate: () => { + return { + projectId: 'aProjectId', + }; + }, + }; + oldCredential = apps().admin.options.credential; + apps().admin.options.credential = credential; }); after(() => { - delete config.singleton; + apps().admin.options.credential = oldCredential; }); describe('#onCall', () => { @@ -361,7 +375,7 @@ describe('callable.FunctionBuilder', () => { it('should handle auth', async () => { const mock = mockFetchPublicKeys(); - const projectId = config.singleton.firebase['projectId']; + const projectId = apps().admin.options.projectId; const idToken = generateIdToken(projectId); await runTest({ httpRequest: request(null, 'application/json', { diff --git a/src/providers/https.ts b/src/providers/https.ts index 340ecb67b..2930910a5 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -23,6 +23,7 @@ import { HttpsFunction } from '../cloud-functions'; import * as express from 'express'; import * as firebase from 'firebase-admin'; +import { apps } from '../apps'; import * as _ from 'lodash'; import * as cors from 'cors'; @@ -382,7 +383,7 @@ export function onCall( } const idToken = match[1]; try { - const authToken = await firebase.auth().verifyIdToken(idToken); + const authToken = await apps().admin.auth().verifyIdToken(idToken); context.auth = { uid: authToken.uid, token: authToken, From 46c6ffe3a12b65f1ceab09bf29d44d7399fd2f27 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 21 Mar 2018 17:16:14 -0700 Subject: [PATCH 004/705] Changelog for v0.9.1 (#207) --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..e5579e23a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1,2 @@ +fixed - Fixed bug where HTTPS callable function will reject all requests with an auth token if the function has not called firebase.initializeApp. +fixed - Corrected type signature for firestore.DeltaDocumentSnapshot. From db8a48ce14caef06282730a19d4733eea91112de Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 22 Mar 2018 00:17:42 +0000 Subject: [PATCH 005/705] [firebase-release] Updated SDK for Cloud Functions to 0.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 205386a80..0d8e2a078 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "0.9.0", + "version": "0.9.1", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 8f2d0ab15ca2ad2a423b9fa31819697f25cac1cf Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 22 Mar 2018 00:17:54 +0000 Subject: [PATCH 006/705] [firebase-release] Removed change log and reset repo after 0.9.1 release --- changelog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index e5579e23a..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,2 +0,0 @@ -fixed - Fixed bug where HTTPS callable function will reject all requests with an auth token if the function has not called firebase.initializeApp. -fixed - Corrected type signature for firestore.DeltaDocumentSnapshot. From 914843b02e1259416f794acfb6755281857b0539 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 2 Apr 2018 15:22:50 -0700 Subject: [PATCH 007/705] Add changes for v1.0.0 (#192) --- .npmignore | 1 + .travis.yml | 2 +- README.md | 19 +- integration_test/functions/package.json | 4 +- integration_test/functions/src/auth-tests.ts | 56 +- .../functions/src/database-tests.ts | 48 +- .../functions/src/firestore-tests.ts | 32 +- integration_test/functions/src/https-tests.ts | 7 +- integration_test/functions/src/index.ts | 7 +- .../functions/src/pubsub-tests.ts | 37 +- integration_test/functions/src/testing.ts | 17 +- integration_test/run_tests.sh | 1 + package.json | 17 +- spec/apps.spec.ts | 100 +-- spec/cloud-functions.spec.ts | 258 +++++-- spec/config.spec.ts | 61 +- spec/providers/analytics.spec.input.ts | 116 ++- spec/providers/analytics.spec.ts | 340 ++++----- spec/providers/auth.spec.ts | 221 +++--- spec/providers/crashlytics.spec.ts | 92 ++- spec/providers/database.spec.ts | 663 ++++++++---------- spec/providers/firestore.spec.ts | 134 ++-- spec/providers/https.spec.ts | 16 +- spec/providers/pubsub.spec.ts | 146 ++-- spec/providers/storage.spec.ts | 281 ++++++-- spec/support/helpers.ts | 51 -- spec/utils.spec.ts | 6 +- src/apps.ts | 68 +- src/cloud-functions.ts | 269 +++++-- src/config.ts | 72 +- src/index.ts | 21 + src/providers/analytics.ts | 30 +- src/providers/auth.ts | 121 ++-- src/providers/crashlytics.ts | 59 +- src/providers/database.ts | 213 +++--- src/providers/firestore.ts | 158 +++-- src/providers/pubsub.ts | 25 +- src/providers/storage.ts | 131 +++- tsconfig.json | 2 +- tsconfig.release.json | 2 +- upgrade-warning | 15 + 41 files changed, 2295 insertions(+), 1624 deletions(-) delete mode 100644 spec/support/helpers.ts create mode 100644 upgrade-warning diff --git a/.npmignore b/.npmignore index a39630c8e..4472a5eff 100644 --- a/.npmignore +++ b/.npmignore @@ -5,6 +5,7 @@ coverage tsconfig.* tslint.* .travis.yml +.github # Don't include the raw typescript src diff --git a/.travis.yml b/.travis.yml index 0ada5f174..fe5ba40c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js node_js: -- '6.11.1' +- '6.11.5' - stable sudo: false diff --git a/README.md b/README.md index 331eac6bc..df3ad35af 100644 --- a/README.md +++ b/README.md @@ -4,27 +4,26 @@ The `firebase-functions` package provides an SDK for defining Cloud Functions fo Cloud Functions is a hosted, private, and scalable Node.js environment where you can run JavaScript code. The Firebase SDK for Cloud Functions integrates the Firebase platform by letting you write code that responds to events and invokes functionality exposed by other Firebase features. -_This is a Beta release of Google Cloud Functions. This API might be changed in backward-incompatible ways and is not subject to any SLA or deprecation policy._ - - ## Learn more Learn more about the Firebase SDK for Cloud Functions in the [Firebase documentation](https://firebase.google.com/docs/functions/) or [check out our samples](https://github.com/firebase/functions-samples). +## Migrating to v1 + +To migrate from a beta version of firebase-functions to v1, please refer to the [migration guide](https://firebase.google.com/docs/functions/beta-v1-diff). + ## Usage ```js // functions/index.js -var functions = require('firebase-functions'); -var notifyUsers = require('./notify-users'); +const functions = require('firebase-functions'); +const notifyUsers = require('./notify-users'); exports.newPost = functions.database .ref('/posts/{postId}') - .onWrite(function(event) { - // only execute function on creation - if (!event.data.previous.exists()) { - notifyUsers(event.data.val()); - } + .onCreate((snapshot, context) => { + console.log('Received new post with ID:', context.params.postId); + return notifyUsers(snapshot.val()); }); ``` diff --git a/integration_test/functions/package.json b/integration_test/functions/package.json index 5475252d9..5e021fc7c 100644 --- a/integration_test/functions/package.json +++ b/integration_test/functions/package.json @@ -7,8 +7,8 @@ "dependencies": { "@google-cloud/pubsub": "^0.6.0", "@types/lodash": "^4.14.41", - "firebase": ">3.6.9", - "firebase-admin": ">=5.4.2", + "firebase": "^4.9.1", + "firebase-admin": "~5.10.0", "firebase-functions": "./firebase-functions.tgz", "lodash": "^4.17.2" }, diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/auth-tests.ts index 20f1bb948..367f6fe87 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/auth-tests.ts @@ -1,52 +1,52 @@ import * as functions from 'firebase-functions'; import { TestSuite, expectEq } from './testing'; +import * as admin from 'firebase-admin'; +import UserMetadata = admin.auth.UserRecord; -export const createUserTests: any = functions.auth.user().onCreate(receivedEvent => { - let user = receivedEvent.data; - let testId: string = user.displayName; +export const createUserTests: any = functions.auth.user().onCreate((u, c) => { + let testId: string = u.displayName; console.log(`testId is ${testId}`); - return new TestSuite('auth user onCreate') - .it('should have a project as resource', event => expectEq( - event.resource, `projects/${process.env.GCLOUD_PROJECT}`)) + return new TestSuite('auth user onCreate') + .it('should have a project as resource', (user, context) => expectEq( + context.resource, `projects/${process.env.GCLOUD_PROJECT}`)) - .it('should not have a path', event => expectEq(event.path, undefined)) + .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) - .it('should have the correct eventType', event => expectEq( - event.eventType, 'providers/firebase.auth/eventTypes/user.create')) + .it('should have the correct eventType', (user, context) => expectEq( + context.eventType, 'providers/firebase.auth/eventTypes/user.create')) - .it('should have an eventId', event => event.eventId) + .it('should have an eventId', (user, context)=> context.eventId) - .it('should have a timestamp', event => event.timestamp) + .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have auth', event => expectEq(event.auth, undefined)) + .it('should not have auth', (user, context) => expectEq((context as any).auth, undefined)) - .it('should not have action', event => expectEq(event.action, undefined)) + .it('should not have action', (user, context) => expectEq((context as any).action, undefined)) - .run(testId, receivedEvent); + .run(testId, u, c); }); -export const deleteUserTests: any = functions.auth.user().onDelete(receivedEvent => { - let user = receivedEvent.data; - let testId: string = user.displayName; +export const deleteUserTests: any = functions.auth.user().onDelete((u, c) => { + let testId: string = u.displayName; console.log(`testId is ${testId}`); - return new TestSuite('auth user onDelete') - .it('should have a project as resource', event => expectEq( - event.resource, `projects/${process.env.GCLOUD_PROJECT}`)) + return new TestSuite('auth user onDelete') + .it('should have a project as resource', (user, context) => expectEq( + context.resource, `projects/${process.env.GCLOUD_PROJECT}`)) - .it('should not have a path', event => expectEq(event.path, undefined)) + .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) - .it('should have the correct eventType', event => expectEq( - event.eventType, 'providers/firebase.auth/eventTypes/user.delete')) + .it('should have the correct eventType', (user, context) => expectEq( + context.eventType, 'providers/firebase.auth/eventTypes/user.delete')) - .it('should have an eventId', event => event.eventId) + .it('should have an eventId', (user, context) => context.eventId) - .it('should have a timestamp', event => event.timestamp) + .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have auth', event => expectEq(event.auth, undefined)) + .it('should not have auth', (user, context) => expectEq((context as any).auth, undefined)) - .it('should not have action', event => expectEq(event.action, undefined)) + .it('should not have action', (user, context) => expectEq((context as any).action, undefined)) - .run(testId, receivedEvent); + .run(testId, u, c); }); diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index ea0400368..e7ca21a8f 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -1,28 +1,28 @@ import * as functions from 'firebase-functions'; -import { TestSuite, expectReject, expectEq, expectMatches } from './testing'; +import { TestSuite, expectEq, expectMatches } from './testing'; +import * as admin from 'firebase-admin'; +import DataSnapshot = admin.database.DataSnapshot; +import { Change } from '../../../src/cloud-functions'; const testIdFieldName = 'testId'; -export const databaseTests: any = functions.database.ref('dbTests/{testId}/start').onWrite(receivedEvent => { - if (receivedEvent.data.val() === null) { +export const databaseTests: any = functions.database.ref('dbTests/{testId}/start').onWrite((ch, ctx) => { + if (ch.after.val() === null) { console.log( - 'Event for ' + receivedEvent.params[testIdFieldName] + 'Event for ' + ctx.params[testIdFieldName] + ' is null; presuming data cleanup, so skipping.'); return; } - return new TestSuite('database ref onWrite') + return new TestSuite>('database ref onWrite') - .it('should not have event.app', event => !event.app) + .it('should not have event.app', (change, context) => !(context as any).app) - .it('should not give user refs access to admin data', expectReject(event => - event.data.ref.parent.child('adminOnly').update({ disallowed: 0 }))) + .it('should give refs access to admin data', (change) => + change.after.ref.parent.child('adminOnly').update({ allowed: 1 }).then(() => true)) - .it('should give admin refs access to admin data', event => - event.data.adminRef.parent.child('adminOnly').update({ allowed: 1 }).then(() => true)) - - .it('should have a correct ref url', event => { - const url = event.data.ref.toString(); + .it('should have a correct ref url', (change) => { + const url = change.after.ref.toString(); return Promise.resolve().then(() => { return expectMatches(url, new RegExp(`^https://${process.env.GCLOUD_PROJECT}.firebaseio.com/dbTests`)); }).then(() => { @@ -30,22 +30,20 @@ export const databaseTests: any = functions.database.ref('dbTests/{testId}/start }); }) - .it('should have refs resources', event => expectEq( - event.resource, - `projects/_/instances/${process.env.GCLOUD_PROJECT}/refs/dbTests/${event.params.testId}/start`)) - - .it('should not include path', event => expectEq(event.path, undefined)) + .it('should have refs resources', (change, context) => expectEq( + context.resource.name, + `projects/_/instances/${process.env.GCLOUD_PROJECT}/refs/dbTests/${context.params.testId}/start`)) - .it('should have the right eventType', event => expectEq( - event.eventType, 'providers/google.firebase.database/eventTypes/ref.write')) + .it('should not include path', (change, context) => expectEq((context as any).path, undefined)) - .it('should have eventId', event => event.eventId) + .it('should have the right eventType', (change, context) => expectEq( + context.eventType, 'google.firebase.database.ref.write')) - .it('should have timestamp', event => event.timestamp) + .it('should have eventId', (change, context) => context.eventId) - .it('should not be admin-authenticated', event => expectEq(event.auth.admin, false)) + .it('should have timestamp', (change, context) => context.timestamp) - .it('should not have action', event => expectEq(event.action, undefined)) + .it('should not have action', (change, context) => expectEq((context as any).action, undefined)) - .run(receivedEvent.params[testIdFieldName], receivedEvent); + .run(ctx.params[testIdFieldName], ch, ctx); }); diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index bd1bb4897..4e7cfd912 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -1,31 +1,31 @@ import * as functions from 'firebase-functions'; import { TestSuite, expectEq, expectDeepEq } from './testing'; +import * as admin from 'firebase-admin'; +import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; -export const firestoreTests: any = functions.firestore.document('tests/{documentId}').onCreate(receivedEvent => { - return new TestSuite('firestore document onWrite') +export const firestoreTests: any = functions.firestore.document('tests/{documentId}').onCreate((s, c) => { + return new TestSuite('firestore document onWrite') - .it('should not have event.app', event => !event.app) + .it('should not have event.app', (snap, context) => !(context as any).app) - .it('should give refs write access', event => - event.data.ref.set({ allowed: 1 }, {merge: true}).then(() => true)) + .it('should give refs write access', (snap) => + snap.ref.set({ allowed: 1 }, {merge: true}).then(() => true)) - .it('should have well-formatted resource', event => expectEq( - event.resource, - `projects/${process.env.GCLOUD_PROJECT}/databases/(default)/documents/tests/${event.params.documentId}`) + .it('should have well-formatted resource', (snap, context) => expectEq( + context.resource.name, + `projects/${process.env.GCLOUD_PROJECT}/databases/(default)/documents/tests/${context.params.documentId}`) ) - .it('should have the right eventType', event => expectEq( - event.eventType, 'providers/cloud.firestore/eventTypes/document.create')) + .it('should have the right eventType', (snap, context) => expectEq( + context.eventType, 'providers/cloud.firestore/eventTypes/document.create')) - .it('should have eventId', event => event.eventId) + .it('should have eventId', (snap, context) => context.eventId) - .it('should have timestamp', event => event.timestamp) + .it('should have timestamp', (snap, context) => context.timestamp) - .it('should have the correct data', event => expectDeepEq(event.data.data(), {test: event.params.documentId})) + .it('should have the correct data', (snap, context) => expectDeepEq(snap.data(), {test: context.params.documentId})) - .it('previous.exists should be false', event => expectEq(event.data.previous.exists, false)) - - .run(receivedEvent.params[testIdFieldName], receivedEvent); + .run(c.params[testIdFieldName], s, c); }); diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/https-tests.ts index cc06de82c..4595214e8 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/https-tests.ts @@ -1,8 +1,9 @@ import * as functions from 'firebase-functions'; +import * as _ from 'lodash'; import { TestSuite, expectEq } from './testing'; -export const callableTests: any = functions.https.onCall((data, context) => { +export const callableTests: any = functions.https.onCall(d => { return new TestSuite('https onCall') - .it('should have the correct data', event => expectEq(event.data.foo, 'bar')) - .run(data.testId, { data: data, context: context }); + .it('should have the correct data', data => expectEq(_.get(data, 'foo'), 'bar')) + .run(d.testId, d); }); diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 905401c3b..9979e372b 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -2,7 +2,6 @@ import * as functions from 'firebase-functions'; import * as firebase from 'firebase'; import * as https from 'https'; import * as admin from 'firebase-admin'; -import * as _ from 'lodash'; import { Request, Response } from 'express'; export * from './pubsub-tests'; @@ -12,8 +11,10 @@ export * from './firestore-tests'; export * from './https-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. -firebase.initializeApp(_.omit(functions.config().firebase, 'credential')); // Explicitly decline admin privileges. -admin.initializeApp(functions.config().firebase); +// Client SDK doesn't support auto initialization: +firebase.initializeApp(JSON.parse(process.env.FIREBASE_CONFIG)); +console.log('initializing admin'); +admin.initializeApp(); // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. function callHttpsTrigger(name: string, data: any) { diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index 9eec7938b..044dd2382 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -1,41 +1,42 @@ import * as functions from 'firebase-functions'; import { TestSuite, expectEq, evaluate } from './testing'; +import PubsubMessage = functions.pubsub.Message; // TODO(inlined) use multiple queues to run inline. // Expected message data: {"hello": "world"} -export const pubsubTests: any = functions.pubsub.topic('pubsubTests').onPublish(receivedEvent => { +export const pubsubTests: any = functions.pubsub.topic('pubsubTests').onPublish((m, c) => { let testId: string; try { - testId = receivedEvent.data.json.testId; + testId = m.json.testId; } catch (e) { /* Ignored. Covered in another test case that `event.data.json` works. */ } - return new TestSuite('pubsub onPublish') - .it('should have a topic as resource', event => expectEq( - event.resource, `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests`)) + return new TestSuite('pubsub onPublish') + .it('should have a topic as resource', (message, context) => expectEq( + context.resource.name, `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests`)) - .it('should not have a path', event => expectEq(event.path, undefined)) + .it('should not have a path', (message, context) => expectEq((context as any).path, undefined)) - .it('should have the correct eventType', event => expectEq( - event.eventType, 'providers/cloud.pubsub/eventTypes/topic.publish')) + .it('should have the correct eventType', (message, context) => expectEq( + context.eventType, 'providers/cloud.pubsub/eventTypes/topic.publish')) - .it('should have an eventId', event => event.eventId) + .it('should have an eventId', (message, context) => context.eventId) - .it('should have a timestamp', event => event.timestamp) + .it('should have a timestamp', (message, context) => context.timestamp) - .it('should not have auth', event => expectEq(event.auth, undefined)) + .it('should not have auth', (message, context) => expectEq((context as any).auth, undefined)) - .it('should not have action', event => expectEq(event.action, undefined)) + .it('should not have action', (message, context) => expectEq((context as any).action, undefined)) - .it('should have pubsub data', event => { - const decoded = (new Buffer(event.data.data, 'base64')).toString(); + .it('should have pubsub data', (message) => { + const decoded = (new Buffer(message.data, 'base64')).toString(); const parsed = JSON.parse(decoded); - return evaluate(parsed.hasOwnProperty('testId'), 'Raw data was: ' + event.data.data); + return evaluate(parsed.hasOwnProperty('testId'), 'Raw data was: ' + message.data); }) - .it('should decode JSON payloads with the json helper', event => - evaluate(event.data.json.hasOwnProperty('testId'), event.data.json)) + .it('should decode JSON payloads with the json helper', (message) => + evaluate(message.json.hasOwnProperty('testId'), message.json)) - .run(testId, receivedEvent); + .run(testId, m, c); }); diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 59bd203fb..765dfacf0 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -1,29 +1,30 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; +import { EventContext } from 'firebase-functions'; -export type TestCase = (event) => any -export type TestCaseMap = { [key: string]: TestCase }; +export type TestCase = (data: T, context?: EventContext) => any +export type TestCaseMap = { [key: string]: TestCase }; -export class TestSuite { +export class TestSuite { private name: string; - private tests: TestCaseMap; + private tests: TestCaseMap; - constructor(name: string, tests: TestCaseMap = {}) { + constructor(name: string, tests: TestCaseMap = {}) { this.name = name; this.tests = tests; } - it(name: string, testCase: TestCase): TestSuite { + it(name: string, testCase: TestCase): TestSuite { this.tests[name] = testCase; return this; } - run(testId: string, event): Promise { + run(testId: string, data: T, context?: EventContext): Promise { let running: Array> = []; for (let testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { continue; } const run = Promise.resolve() - .then(() => this.tests[testName](event)) + .then(() => this.tests[testName](data, context)) .then( (result) => { console.log(`${result ? 'Passed' : 'Failed with successful op'}: ${testName}`); diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 11329d81c..d37bb49b8 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -73,6 +73,7 @@ function cleanup { delete_all_functions rm $DIR/functions/firebase-functions.tgz rm -f $DIR/functions/firebase-debug.log + rm -rf $DIR/functions/node_modules/firebase-functions } build_sdk diff --git a/package.json b/package.json index 0d8e2a078..ff884b2a7 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,13 @@ "main": "lib/index.js", "scripts": { "build": "node_modules/.bin/tsc -p tsconfig.release.json", - "build:pack": "npm prune --production && rm -rf lib && npm install && node_modules/.bin/tsc -p tsconfig.release.json && npm pack && npm install", + "build:pack": "rm -rf lib && npm install && node_modules/.bin/tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install typescript firebase-admin && node_modules/.bin/tsc -p tsconfig.release.json", "lint": "node_modules/.bin/tslint src/{**/*,*}.ts spec/{**/*,*}.ts integration_test/functions/src/{**/*,*}.ts", "pretest": "node_modules/.bin/tsc && cp -r spec/fixtures .tmp/spec", "test": "mocha .tmp/spec/index.spec.js", - "posttest": "npm run lint && rm -rf .tmp" + "posttest": "npm run lint && rm -rf .tmp", + "postinstall": "node ./upgrade-warning" }, "repository": { "type": "git", @@ -48,22 +49,20 @@ "typescript": "^2.0.3" }, "peerDependencies": { - "firebase-admin": "~5.10.0" + "firebase-admin": "~5.11.0" }, "dependencies": { "@types/cors": "^2.8.1", - "@types/express": "^4.0.33", + "@types/express": "^4.11.1", "@types/jsonwebtoken": "^7.1.32", "@types/lodash": "^4.14.34", - "@types/sha1": "^1.1.0", "cors": "^2.8.4", - "express": "^4.0.33", + "express": "^4.16.2", "jsonwebtoken": "^7.1.9", - "lodash": "^4.6.1", - "sha1": "^1.1.1" + "lodash": "^4.6.1" }, "engines": { - "node": ">=4.0.0" + "node": ">=6.0.0" }, "typings": "lib/index.d.ts" } diff --git a/spec/apps.spec.ts b/spec/apps.spec.ts index 0626b5b67..6b3d3e822 100644 --- a/spec/apps.spec.ts +++ b/spec/apps.spec.ts @@ -21,7 +21,6 @@ // SOFTWARE. import { expect } from 'chai'; -import { fakeConfig } from './support/helpers'; import { apps as appsNamespace } from '../src/apps'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; @@ -31,7 +30,7 @@ describe('apps', () => { let apps: appsNamespace.Apps; let claims; beforeEach(() => { - apps = new appsNamespace.Apps(fakeConfig()); + apps = new appsNamespace.Apps(); // mock claims intentionally contains dots, square brackets, and nested paths claims = {'token': {'firebase': {'identities':{'google.com':['111']}}}}; }); @@ -42,28 +41,6 @@ describe('apps', () => { }); }); - it('should load the admin app for admin impersonation', function () { - expect(apps.forMode({ admin: true })).to.equal(apps.admin); - }); - - it('should load the anonymous app for anonymous impersonation', function () { - expect(apps.forMode({ admin: false })).to.equal(apps.noauth); - }); - - it('should create a user app for user impersonation', function () { - const auth = { admin: false, variable: claims }; - const key = apps._appName(auth); - expect(function () { - return firebase.app(key); - }).to.throw(Error); - - const userApp = apps.forMode(auth); - expect(firebase.app(key)).to.equal(userApp); - - const userAppAgain = apps.forMode(auth); - expect(userApp).to.equal(userAppAgain); - }); - describe('retain/release', () => { let clock; @@ -75,75 +52,39 @@ describe('apps', () => { clock.restore(); }); - it('should retain/release ref counters appropriately without auth', function() { - apps.retain({}); - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 1, - __noauth__: 1, - }); - apps.release({}); - clock.tick(appsNamespace.garbageCollectionInterval); - return Promise.resolve().then(() => { - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 0, - __noauth__: 0, - }); - }); - }); - - it('should retain/release ref counters appropriately with admin auth', function() { - apps.retain({auth: {admin: true}}); - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 2, - }); - apps.release({auth: {admin: true}}); - clock.tick(appsNamespace.garbageCollectionInterval); - return Promise.resolve().then(() => { - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 0, - }); - }); - }); - - it('should retain/release ref counters appropriately with user auth', function() { - const payload = {auth: {admin: false, variable: claims}}; - const userAppName = apps._appName(payload.auth); - apps.retain(payload); + it('should retain/release ref counters appropriately', function() { + apps.retain(); expect(apps['_refCounter']).to.deep.equal({ __admin__: 1, - [userAppName]: 1, }); - apps.release(payload); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval); return Promise.resolve().then(() => { expect(apps['_refCounter']).to.deep.equal({ __admin__: 0, - [userAppName]: 0, }); }); }); it('should only decrement counter after garbageCollectionInterval is up', function() { - apps.retain({}); - apps.release({}); + apps.retain(); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval / 2); expect(apps['_refCounter']).to.deep.equal({ __admin__: 1, - __noauth__: 1, }); clock.tick(appsNamespace.garbageCollectionInterval / 2); return Promise.resolve().then(() => { expect(apps['_refCounter']).to.deep.equal({ __admin__: 0, - __noauth__: 0, }); }); }); it('should call _destroyApp if app no longer used', function() { let spy = sinon.spy(apps, '_destroyApp'); - apps.retain({}); - apps.release({}); + apps.retain(); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval); return Promise.resolve().then(() => { expect(spy.called).to.be.true; @@ -152,10 +93,10 @@ describe('apps', () => { it('should not call _destroyApp if app used again while waiting for release', function() { let spy = sinon.spy(apps, '_destroyApp'); - apps.retain({}); - apps.release({}); + apps.retain(); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval / 2); - apps.retain({}); + apps.retain(); clock.tick(appsNamespace.garbageCollectionInterval / 2); return Promise.resolve().then(() => { expect(spy.called).to.be.false; @@ -163,42 +104,37 @@ describe('apps', () => { }); it('should increment ref counter for each subsequent retain', function() { - apps.retain({}); + apps.retain(); expect(apps['_refCounter']).to.deep.equal({ __admin__: 1, - __noauth__: 1, }); - apps.retain({}); + apps.retain(); expect(apps['_refCounter']).to.deep.equal({ __admin__: 2, - __noauth__: 2, }); - apps.retain({}); + apps.retain(); expect(apps['_refCounter']).to.deep.equal({ __admin__: 3, - __noauth__: 3, }); }); it('should work with staggering sets of retain/release', function() { - apps.retain({}); - apps.release({}); + apps.retain(); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval / 2); - apps.retain({}); - apps.release({}); + apps.retain(); + apps.release(); clock.tick(appsNamespace.garbageCollectionInterval / 2); return Promise.resolve().then(() => { // Counters are still 1 due second set of retain/release expect(apps['_refCounter']).to.deep.equal({ __admin__: 1, - __noauth__: 1, }); clock.tick(appsNamespace.garbageCollectionInterval / 2); }).then(() => { // It's now been a full interval since the second set of retain/release expect(apps['_refCounter']).to.deep.equal({ __admin__: 0, - __noauth__: 0, }); }); }); diff --git a/spec/cloud-functions.spec.ts b/spec/cloud-functions.spec.ts index ca16e5782..9f0e9a30b 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/cloud-functions.spec.ts @@ -22,13 +22,14 @@ import * as _ from 'lodash'; import { expect } from 'chai'; -import { Event, makeCloudFunction, MakeCloudFunctionArgs } from '../src/cloud-functions'; +import { Event, LegacyEvent, makeCloudFunction, MakeCloudFunctionArgs, Change } from '../src/cloud-functions'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { provider: 'mock.provider', eventType: 'mock.event', - resource: 'resource', + service: 'service', + triggerResource: () => 'resource', handler: () => null, }; @@ -36,21 +37,19 @@ describe('makeCloudFunction', () => { let cf = makeCloudFunction(cloudFunctionArgs); expect(cf.__trigger).to.deep.equal({ eventTrigger: { - eventType: 'providers/mock.provider/eventTypes/mock.event', + eventType: 'mock.provider.mock.event', resource: 'resource', + service: 'service', }, }); }); - it('should preserve payload metadata', () => { - let args: any = _.assign({}, cloudFunctionArgs, {handler: (e) => e}); + it('should construct the right context for legacy event format', () => { + let args: any = _.assign({}, cloudFunctionArgs, {handler: (data, context) => context}); let cf = makeCloudFunction(args); - let test: Event = { + let test: LegacyEvent = { eventId: '00000', timestamp: '2016-11-04T21:29:03.496Z', - auth: { - admin: true, - }, eventType: 'providers/provider/eventTypes/event', resource: 'resource', data: 'data', @@ -59,63 +58,244 @@ describe('makeCloudFunction', () => { return expect(cf(test)).to.eventually.deep.equal({ eventId: '00000', timestamp: '2016-11-04T21:29:03.496Z', - auth: { - admin: true, + eventType: 'mock.provider.mock.event', + resource: { + service: 'service', + name: 'resource', + }, + params: {}, + }); + }); + + it('should construct the right context for new event format', () => { + let args: any = _.assign({}, cloudFunctionArgs, { handler: (data, context) => context }); + let cf = makeCloudFunction(args); + let test: Event = { + context: { + eventId: '00000', + timestamp: '2016-11-04T21:29:03.496Z', + eventType: 'provider.event', + resource: { + service: 'provider', + name: 'resource', + }, }, - eventType: 'providers/provider/eventTypes/event', - resource: 'resource', data: 'data', + }; + + return expect(cf(test)).to.eventually.deep.equal({ + eventId: '00000', + timestamp: '2016-11-04T21:29:03.496Z', + eventType: 'provider.event', + resource: { + service: 'provider', + name: 'resource', + }, params: {}, }); }); }); describe('makeParams', () => { - - const cloudFunctionArgs: MakeCloudFunctionArgs = { - provider: 'mock.provider', - eventType: 'mock.event', - resource: 'projects/_/instances/pid/ref/{foo}/nested/{bar}', - handler: () => null, + const args: MakeCloudFunctionArgs = { + provider: 'provider', + eventType: 'event', + service: 'service', + triggerResource: () => 'projects/_/instances/pid/ref/{foo}/nested/{bar}', + handler: (data, context) => context.params, }; + const cf = makeCloudFunction(args); - it('should construct params from the event resource', () => { - let args: any = _.assign({}, cloudFunctionArgs, {handler: (e) => e}); - let cf = makeCloudFunction(args); - - const testEvent: Event = { + it('should construct params from the event resource of legacy events', () => { + const testEvent: LegacyEvent = { resource: 'projects/_/instances/pid/ref/a/nested/b', + eventType: 'event', data: 'data', }; return expect(cf(testEvent)).to.eventually.deep.equal({ - resource: 'projects/_/instances/pid/ref/a/nested/b', - data: 'data', - params: { - foo: 'a', - bar: 'b', + foo: 'a', + bar: 'b', + }); + }); + + it('should construct params from the event resource of new format events', () => { + const testEvent: Event = { + context: { + eventId: '111', + timestamp: '2016-11-04T21:29:03.496Z', + resource: { + service: 'service', + name: 'projects/_/instances/pid/ref/a/nested/b', + }, + eventType: 'event', }, + data: 'data', + }; + + return expect(cf(testEvent)).to.eventually.deep.equal({ + foo: 'a', + bar: 'b', }); }); +}); - it('should construct params from the event params', () => { - let args: any = _.assign({}, cloudFunctionArgs, {handler: (e) => e}); - let cf = makeCloudFunction(args); +describe('makeAuth and makeAuthType', () => { + const args: MakeCloudFunctionArgs = { + provider: 'google.firebase.database', + eventType: 'event', + service: 'service', + triggerResource: () => 'projects/_/instances/pid/ref/{foo}/nested/{bar}', + handler: (data, context) => { + return { + auth: context.auth, + authMode: context.authType, + }; + }, + }; + let cf = makeCloudFunction(args); - const testEvent: Event = { + it('should construct correct auth and authType for admin user', () => { + const testEvent: LegacyEvent = { data: 'data', - params: { - foo: 'a', - bar: 'b', + auth: { + admin: true, }, }; return expect(cf(testEvent)).to.eventually.deep.equal({ + auth: undefined, + authMode: 'ADMIN', + }); + }); + + it('should construct correct auth and authType for unauthenticated user', () => { + const testEvent: LegacyEvent = { data: 'data', - params: { - foo: 'a', - bar: 'b', + auth: { + admin: false, }, + }; + + return expect(cf(testEvent)).to.eventually.deep.equal({ + auth: null, + authMode: 'UNAUTHENTICATED', + }); + }); + + it('should construct correct auth and authType for a user', () => { + const testEvent: LegacyEvent = { + data: 'data', + auth: { + admin: false, + variable: { + uid: 'user', + provider: 'google', + token: { + sub: 'user', + }, + }, + }, + }; + + return expect(cf(testEvent)).to.eventually.deep.equal({ + auth: { + uid: 'user', + token: { + sub: 'user', + }, + }, + authMode: 'USER', + }); + }); +}); + +describe('Change', () => { + describe('applyFieldMask', () => { + const after = { + foo: 'bar', + num: 2, + obj: { + a: 1, + b: 2, + }, + }; + + it('should handle deleted values', () => { + const sparseBefore = { baz: 'qux' }; + const fieldMask = 'baz'; + expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal( { + foo: 'bar', + num: 2, + obj: { + a: 1, + b: 2, + }, + baz: 'qux', + }); + }); + + it('should handle created values', () => { + const sparseBefore = {}; + const fieldMask = 'num,obj.a'; + expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({ + foo: 'bar', + obj: { + b: 2, + }, + }); + }); + + it('should handle mutated values', () => { + const sparseBefore = { + num: 3, + obj: { + a: 3, + }, + }; + const fieldMask = 'num,obj.a'; + expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({ + foo: 'bar', + num: 3, + obj: { + a: 3, + b: 2, + }, + }); + }); + }); + + describe('fromJSON', () => { + it('should create a Change object with a `before` and `after`', () => { + let created = Change.fromJSON({ + before: { foo: 'bar' }, + after: { foo: 'faz' }, + }); + expect(created instanceof Change).to.equal(true); + expect(created.before).to.deep.equal({ foo: 'bar' }); + expect(created.after).to.deep.equal({ foo: 'faz' }); + }); + + it('should apply the customizer function to `before` and `after`', () => { + function customizer(input) { + _.set(input, 'another', 'value'); + return input; + } + let created = Change.fromJSON( + { + before: { foo: 'bar' }, + after: { foo: 'faz' }, + }, + customizer, + ); + expect(created.before).to.deep.equal({ + foo: 'bar', + another: 'value', + }); + expect(created.after).to.deep.equal({ + foo: 'faz', + another: 'value', + }); }); }); }); diff --git a/spec/config.spec.ts b/spec/config.spec.ts index bba51392b..aae3ea94d 100644 --- a/spec/config.spec.ts +++ b/spec/config.spec.ts @@ -22,14 +22,14 @@ import * as mockRequire from 'mock-require'; import { expect } from 'chai'; -import { config } from '../src/config'; -import { unsetSingleton } from './support/helpers'; +import { config, firebaseConfig } from '../src/config'; describe('config()', () => { afterEach(() => { mockRequire.stopAll(); - unsetSingleton(); + delete config.singleton; + delete process.env.FIREBASE_CONFIG; delete process.env.FIREBASE_PROJECT; delete process.env.CLOUD_RUNTIME_CONFIG; }); @@ -37,31 +37,42 @@ describe('config()', () => { it('loads config values from .runtimeconfig.json', () => { mockRequire('../../../.runtimeconfig.json', { foo: 'bar', firebase: {} }); let loaded = config(); - expect(loaded).to.have.property('firebase'); + expect(loaded).to.not.have.property('firebase'); expect(loaded).to.have.property('foo','bar'); }); - it('injects a Firebase credential', () => { - mockRequire('../../../.runtimeconfig.json', { firebase: {} }); - expect(config()).to.deep.property('firebase.credential'); - }); - - it('throws an error if .runtimeconfig.json not present', () => { + it('does not provide firebase config if .runtimeconfig.json not invalid', () => { mockRequire('../../../.runtimeconfig.json', 'does-not-exist'); - expect(config).to.throw('not available'); + expect(firebaseConfig()).to.be.null; }); - it('throws an error if Firebase configs not present', () => { + it('does not provide firebase config if .ruuntimeconfig.json has no firebase property', () => { mockRequire('../../../.runtimeconfig.json', {}); - expect(config).to.throw('Firebase config variables are not available.'); + expect(firebaseConfig()).to.be.null; }); it('loads Firebase configs from FIREBASE_PROJECT env variable', () => { process.env.FIREBASE_PROJECT = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - let firebaseConfig = config().firebase; - expect(firebaseConfig).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + }); + + it('loads Firebase configs from FIREBASE_CONFIG env variable', () => { + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: 'foo@firebaseio.com', + }); + expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + }); + + it('prefers FIREBASE_CONFIG over FIREBASE_PROJECT', () => { + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: 'firebase_config', + }); + process.env.FIREBASE_PROJECT = JSON.stringify({ + databaseURL: 'firebase_project', + }); + expect(firebaseConfig()).to.have.property('databaseURL', 'firebase_config'); }); it('behaves well when both FIREBASE_PROJECT and .runtimeconfig.json present', () => { @@ -74,24 +85,21 @@ describe('config()', () => { }, foo: 'bar', }); - let loaded = config(); - expect(loaded.firebase).to.have.property('databaseURL', 'foo@firebaseio.com'); - expect(loaded).to.have.property('foo', 'bar'); + expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(config()).to.have.property('foo', 'bar'); }); it('accepts alternative locations for config file', () => { process.env.CLOUD_RUNTIME_CONFIG = 'another.json'; mockRequire('another.json', { foo: 'bar', firebase: {} }); - let loaded = config(); - expect(loaded).to.have.property('firebase'); - expect(loaded).to.have.property('foo','bar'); + expect(firebaseConfig()).to.not.be.null; + expect(config()).to.have.property('foo','bar'); }); it('accepts full JSON in env.CLOUD_RUNTIME_CONFIG', () => { process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({foo: 'bar', firebase:{} }); - let loaded = config(); - expect(loaded).to.have.property('firebase'); - expect(loaded).to.have.property('foo', 'bar'); + expect(firebaseConfig()).to.not.be.null; + expect(config()).to.have.property('foo', 'bar'); }); it('behaves well when both env.CLOUD_RUNTIME_CONFIG and env.FIREBASE_PROJECT are set', () => { @@ -99,8 +107,7 @@ describe('config()', () => { process.env.FIREBASE_PROJECT = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - let loaded = config(); - expect(loaded.firebase).to.have.property('databaseURL', 'foo@firebaseio.com'); - expect(loaded).to.have.property('foo', 'bar'); + expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(config()).to.have.property('foo', 'bar'); }); }); diff --git a/spec/providers/analytics.spec.input.ts b/spec/providers/analytics.spec.input.ts index b46d672d0..84ac4c3ce 100644 --- a/spec/providers/analytics.spec.input.ts +++ b/spec/providers/analytics.spec.input.ts @@ -22,7 +22,6 @@ /* tslint:disable:max-line-length */ import { AnalyticsEvent } from '../../src/providers/analytics'; -import { Event } from '../../src/cloud-functions'; // A payload, as it might arrive over the wire. Every possible field is filled out at least once. export const fullPayload = JSON.parse(`{ @@ -125,70 +124,63 @@ export const fullPayload = JSON.parse(`{ }`); // The event data that we expect would be constructed if the payload above were to arrive. -export const fullEvent: Event = { - eventId: '1486080145623867projects/analytics-integration-fd82a/events/i_made_this_upproviders/google.firebase.analytics/eventTypes/event.sendprojects/f949d1bb9ef782579-tp/topics/cloud-functions-u54ejabpzs4prfjh7433eklhae', - eventType: 'providers/google.firebase.analytics/eventTypes/event.send', - resource: 'projects/analytics-integration-fd82a/events/i_made_this_up', - timestamp: '2017-03-29T23:59:59.986371388Z', - params: {}, - data: { - reportingDate: '20170202', - name: 'Loaded_In_Background', - params: { - build: '1350', - calls_remaining: 10, - fraction_calls_dropped: 0.0123456, - average_call_rating: 4.5, +export const data: AnalyticsEvent = { + reportingDate: '20170202', + name: 'Loaded_In_Background', + params: { + build: '1350', + calls_remaining: 10, + fraction_calls_dropped: 0.0123456, + average_call_rating: 4.5, + }, + logTime: '2017-02-02T23:06:26.124Z', + previousLogTime: '2017-02-02T23:01:19.797Z', + valueInUSD: 1234.5, + user: { + userId: 'abcdefghijklmnop!', + appInfo: { + appId: 'com.mobileday.MobileDay', + appInstanceId: 'E3C9939401814B9B954725A740B8C7BC', + appPlatform: 'IOS', + appStore: 'iTunes', + appVersion: '5.2.0', }, - logTime: '2017-02-02T23:06:26.124Z', - previousLogTime: '2017-02-02T23:01:19.797Z', - valueInUSD: 1234.5, - user: { - userId: 'abcdefghijklmnop!', - appInfo: { - appId: 'com.mobileday.MobileDay', - appInstanceId: 'E3C9939401814B9B954725A740B8C7BC', - appPlatform: 'IOS', - appStore: 'iTunes', - appVersion: '5.2.0', - }, - bundleInfo: { - bundleSequenceId: 6034, - serverTimestampOffset: 371, - }, - deviceInfo: { - deviceCategory: 'mobile', - deviceModel: 'iPhone7,2', - deviceTimeZoneOffsetSeconds: -21600, - mobileBrandName: 'Apple', - mobileMarketingName: 'iPhone 6', - mobileModelName: 'iPhone 6', - platformVersion: '10.2.1', - userDefaultLanguage: 'en-us', - deviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370', - resettableDeviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370', - limitedAdTracking: true, + bundleInfo: { + bundleSequenceId: 6034, + serverTimestampOffset: 371, + }, + deviceInfo: { + deviceCategory: 'mobile', + deviceModel: 'iPhone7,2', + deviceTimeZoneOffsetSeconds: -21600, + mobileBrandName: 'Apple', + mobileMarketingName: 'iPhone 6', + mobileModelName: 'iPhone 6', + platformVersion: '10.2.1', + userDefaultLanguage: 'en-us', + deviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370', + resettableDeviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370', + limitedAdTracking: true, + }, + firstOpenTime: '2016-04-28T15:00:35.819Z', + geoInfo: { + city: 'Plano', + continent: '021', + country: 'United States', + region: 'Texas', + }, + userProperties: { + build: { + setTime: '2017-02-02T23:06:26.090Z', + value: '1350', }, - firstOpenTime: '2016-04-28T15:00:35.819Z', - geoInfo: { - city: 'Plano', - continent: '021', - country: 'United States', - region: 'Texas', + calls_remaining: { + setTime: '2017-02-02T23:06:26.094Z', + value: '10', }, - userProperties: { - build: { - setTime: '2017-02-02T23:06:26.090Z', - value: '1350', - }, - calls_remaining: { - setTime: '2017-02-02T23:06:26.094Z', - value: '10', - }, - version: { - setTime: '2017-02-02T23:06:26.085Z', - value: '5.2.0', - }, + version: { + setTime: '2017-02-02T23:06:26.085Z', + value: '5.2.0', }, }, }, diff --git a/spec/providers/analytics.spec.ts b/spec/providers/analytics.spec.ts index 95920fb27..cef1d8328 100644 --- a/spec/providers/analytics.spec.ts +++ b/spec/providers/analytics.spec.ts @@ -22,204 +22,220 @@ import * as analytics from '../../src/providers/analytics'; import { expect } from 'chai'; -import { Event } from '../../src/cloud-functions'; +import { LegacyEvent } from '../../src/cloud-functions'; import * as analytics_spec_input from './analytics.spec.input'; -describe('AnalyticsEventBuilder', () => { - before(() => { - process.env.GCLOUD_PROJECT = 'project1'; - }); +describe('Analytics Functions', () => { + describe('EventBuilder', () => { + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); - after(() => { - delete process.env.GCLOUD_PROJECT; - }); + after(() => { + delete process.env.GCLOUD_PROJECT; + }); - describe('#onLog', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = analytics.event('first_open').onLog(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/google.firebase.analytics/eventTypes/event.log', - resource: 'projects/project1/events/first_open', - }, + describe('#onLog', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = analytics.event('first_open').onLog(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/google.firebase.analytics/eventTypes/event.log', + resource: 'projects/project1/events/first_open', + service: 'app-measurement.com', + }, + }); }); }); - }); - describe('#dataConstructor', () => { - it('should handle an event with the appropriate fields', () => { - const cloudFunction = analytics.event('first_open').onLog((ev: Event) => ev.data); - - // The event data delivered over the wire will be the JSON for an AnalyticsEvent: - // https://firebase.google.com/docs/auth/admin/manage-users#retrieve_user_data - let event = { - eventId: 'f2e2f0bf-2e47-4d92-b009-e7a375ecbd3e', - eventType: 'providers/google.firebase.analytics/eventTypes/event.log', - resource: 'projects/myUnitTestProject/events/first_open', - notSupported: { - }, - data: { - userDim: { + describe('#dataConstructor', () => { + it('should handle an event with the appropriate fields', () => { + const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + + // The event data delivered over the wire will be the JSON for an AnalyticsEvent: + // https://firebase.google.com/docs/auth/admin/manage-users#retrieve_user_data + let event: LegacyEvent = { + eventId: 'f2e2f0bf-2e47-4d92-b009-e7a375ecbd3e', + eventType: 'providers/google.firebase.analytics/eventTypes/event.log', + resource: 'projects/myUnitTestProject/events/first_open', + data: { + userDim: { + userId: 'hi!', + }, + }, + }; + + return expect(cloudFunction(event)).to.eventually.deep.equal({ + params: {}, + user: { userId: 'hi!', + userProperties: {}, }, - }, - }; - - return expect(cloudFunction(event)).to.eventually.deep.equal({ - params: {}, - user: { - userId: 'hi!', - userProperties: {}, - }, + }); }); - }); - it('should remove xValues', () => { - const cloudFunction = analytics.event('first_open').onLog((ev: Event) => ev.data); - - // Incoming events will have four kinds of "xValue" fields: "intValue", - // "stringValue", "doubleValue" and "floatValue". We expect those to get - // flattened away, leaving just their values. - let event = { - data: { - eventDim: - [ - { - date: '20170202', - name: 'Loaded_In_Background', - params: { - build: { - stringValue: '1350', - }, - calls_remaining: { - intValue: '10', - }, - goats_teleported: { - doubleValue: 1.1, + it('should remove xValues', () => { + const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + + // Incoming events will have four kinds of "xValue" fields: "intValue", + // "stringValue", "doubleValue" and "floatValue". We expect those to get + // flattened away, leaving just their values. + let event: LegacyEvent = { + data: { + eventDim: + [ + { + date: '20170202', + name: 'Loaded_In_Background', + params: { + build: { + stringValue: '1350', + }, + calls_remaining: { + intValue: '10', + }, + goats_teleported: { + doubleValue: 1.1, + }, + boat_boyancy: { + floatValue: 133.7, + }, }, - boat_boyancy: { - floatValue: 133.7, + }, + ], + userDim: { + userProperties: { + foo: { + value: { + stringValue: 'bar', + }, }, }, }, - ], - userDim: { + }, + }; + + return expect(cloudFunction(event)).to.eventually.deep.equal({ + reportingDate: '20170202', + name: 'Loaded_In_Background', + params: { + build: '1350', + calls_remaining: 10, + goats_teleported: 1.1, + boat_boyancy: 133.7, + }, + user: { userProperties: { foo: { - value: { - stringValue: 'bar', - }, + value: 'bar', }, }, }, - }, - }; - - return expect(cloudFunction(event)).to.eventually.deep.equal({ - reportingDate: '20170202', - name: 'Loaded_In_Background', - params: { - build: '1350', - calls_remaining: 10, - goats_teleported: 1.1, - boat_boyancy: 133.7, - }, - user: { - userProperties: { - foo: { - value: 'bar', - }, - }, - }, + }); }); - }); - it('should change microsecond timestamps to ISO strings, and offsets to millis', () => { - const cloudFunction = analytics.event('first_open').onLog((ev: Event) => ev.data); - - let event = { - data: { - eventDim: - [ - { - date: '20170202', - name: 'Loaded_In_Background', - timestampMicros: '1489080600000000', - previousTimestampMicros: '526657020000000', + it('should change microsecond timestamps to ISO strings, and offsets to millis', () => { + const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + + let event: LegacyEvent = { + data: { + eventDim: + [ + { + date: '20170202', + name: 'Loaded_In_Background', + timestampMicros: '1489080600000000', + previousTimestampMicros: '526657020000000', + }, + ], + userDim: { + firstOpenTimestampMicros: '577978620000000', + userProperties: { + foo: { + setTimestampUsec: '514820220000000', + }, + }, + bundleInfo: { + serverTimestampOffsetMicros: 9876789, + }, }, - ], - userDim: { - firstOpenTimestampMicros: '577978620000000', + }, + }; + + return expect(cloudFunction(event)).to.eventually.deep.equal({ + reportingDate: '20170202', + name: 'Loaded_In_Background', + params: {}, + logTime: '2017-03-09T17:30:00.000Z', + previousLogTime: '1986-09-09T13:37:00.000Z', + user: { + firstOpenTime: '1988-04-25T13:37:00.000Z', userProperties: { foo: { - setTimestampUsec: '514820220000000', + setTime: '1986-04-25T13:37:00.000Z', }, }, bundleInfo: { - serverTimestampOffsetMicros: 9876789, + serverTimestampOffset: 9877, }, }, - }, - }; - - return expect(cloudFunction(event)).to.eventually.deep.equal({ - reportingDate: '20170202', - name: 'Loaded_In_Background', - params: {}, - logTime: '2017-03-09T17:30:00.000Z', - previousLogTime: '1986-09-09T13:37:00.000Z', - user: { - firstOpenTime: '1988-04-25T13:37:00.000Z', - userProperties: { - foo: { - setTime: '1986-04-25T13:37:00.000Z', - }, - }, - bundleInfo: { - serverTimestampOffset: 9877, + }); + }); + + it('should populate currency fields', () => { + const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + + // Incoming events will have four kinds of "xValue" fields: "intValue", + // "stringValue", "doubleValue" and "floatValue". We expect those to get + // flattened away, leaving just their values. + // + // xValues in eventDim[...].params should also populate a 'rawValue' field + // that always contains a string. + // + // Separately, the input has a number of microsecond timestamps that we'd + // like to rename and scale down to milliseconds. + let event: LegacyEvent = { + data: { + eventDim: + [ + { + date: '20170202', + name: 'Loaded_In_Background', + valueInUsd: 123.4, + }, + ], }, - }, + }; + + return expect(cloudFunction(event)).to.eventually.deep.equal({ + reportingDate: '20170202', + name: 'Loaded_In_Background', + params: {}, + valueInUSD: 123.4, // Field renamed Usd -> USD. + }); }); - }); - it('should populate currency fields', () => { - const cloudFunction = analytics.event('first_open').onLog((ev: Event) => ev.data); - - // Incoming events will have four kinds of "xValue" fields: "intValue", - // "stringValue", "doubleValue" and "floatValue". We expect those to get - // flattened away, leaving just their values. - // - // xValues in eventDim[...].params should also populate a 'rawValue' field - // that always contains a string. - // - // Separately, the input has a number of microsecond timestamps that we'd - // like to rename and scale down to milliseconds. - let event = { - data: { - eventDim: - [ - { - date: '20170202', - name: 'Loaded_In_Background', - valueInUsd: 123.4, - }, - ], - }, - }; - - return expect(cloudFunction(event)).to.eventually.deep.equal({ - reportingDate: '20170202', - name: 'Loaded_In_Background', - params: {}, - valueInUSD: 123.4, // Field renamed Usd -> USD. + it('should recognize all the fields the payload can contain', () => { + const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + // The payload in analytics_spec_input contains all possible fields at least once. + return expect(cloudFunction(analytics_spec_input.fullPayload)) + .to.eventually.deep.equal(analytics_spec_input.data); }); }); + }); + + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => analytics.event('event').onLog(() => null)).to.not.throw(Error); + }); + + it('should throw when trigger is accessed', () => { + expect(() => analytics.event('event').onLog(() => null).__trigger).to.throw(Error); + }); - it('should recognize all the fields the payload can contain', () => { - const cloudFunction = analytics.event('first_open').onLog((ev: Event) => ev); - // The payload in analytics_spec_input contains all possible fields at least once. - return expect(cloudFunction(analytics_spec_input.fullPayload)) - .to.eventually.deep.equal(analytics_spec_input.fullEvent); + it('should not throw when #run is called', () => { + let cf = analytics.event('event').onLog(() => null); + expect(cf.run).to.not.throw(Error); }); }); }); diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index 1ea251d79..5ab40bd5a 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -22,115 +22,160 @@ import * as auth from '../../src/providers/auth'; import { expect } from 'chai'; -import { Event } from '../../src/cloud-functions'; import * as firebase from 'firebase-admin'; -describe('AuthBuilder', () => { - let handler: (e: Event) => PromiseLike | any; +describe('Auth Functions', () => { + describe('AuthBuilder', () => { + let handler: (user: firebase.auth.UserRecord) => PromiseLike | any; - before(() => { - process.env.GCLOUD_PROJECT = 'project1'; - }); + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); - after(() => { - delete process.env.GCLOUD_PROJECT; - }); + after(() => { + delete process.env.GCLOUD_PROJECT; + }); - describe('#onCreate', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = auth.user().onCreate(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.auth/eventTypes/user.create', - resource: 'projects/project1', - }, + describe('#onCreate', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = auth.user().onCreate(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/firebase.auth/eventTypes/user.create', + resource: 'projects/project1', + service: 'firebaseauth.googleapis.com', + }, + }); }); }); - }); - describe('#onDelete', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = auth.user().onDelete(handler); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.auth/eventTypes/user.delete', - resource: 'projects/project1', - }, + describe('#onDelete', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = auth.user().onDelete(handler); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/firebase.auth/eventTypes/user.delete', + resource: 'projects/project1', + service: 'firebaseauth.googleapis.com', + }, + }); }); }); - }); - describe('#_dataConstructor', () => { - let cloudFunctionCreate; - let cloudFunctionDelete; - let event; + describe('#_dataConstructor', () => { + let cloudFunctionCreate; + let cloudFunctionDelete; + let event; - before(() => { - cloudFunctionCreate = auth.user().onCreate((ev: Event) => ev.data); - cloudFunctionDelete = auth.user().onDelete((ev: Event) => ev.data); - event = { - data: { - metadata: { - createdAt: '2016-12-15T19:37:37.059Z', - lastSignedInAt: '2017-01-01T00:00:00.000Z', + before(() => { + cloudFunctionCreate = auth.user().onCreate((data: firebase.auth.UserRecord) => data); + cloudFunctionDelete = auth.user().onDelete((data: firebase.auth.UserRecord) => data); + event = { + data: { + metadata: { + createdAt: '2016-12-15T19:37:37.059Z', + lastSignedInAt: '2017-01-01T00:00:00.000Z', + }, }, - }, - }; - }); + }; + }); - it('should transform old wire format for UserRecord into v5.0.0 format', () => { - return Promise.all([ - cloudFunctionCreate(event).then(data => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); - }), - cloudFunctionDelete(event).then(data => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); - }), - ]); + it('should transform wire format for UserRecord into v5.0.0 format', () => { + return Promise.all([ + cloudFunctionCreate(event).then(data => { + expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); + expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + }), + cloudFunctionDelete(event).then(data => { + expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); + expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + }), + ]); + }); + + it('should handle new wire format if/when there is a change', () => { + const newEvent = { + data: { + metadata: { + creationTime: '2016-12-15T19:37:37.059Z', + lastSignInTime: '2017-01-01T00:00:00.000Z', + }, + }, + }; + + return Promise.all([ + cloudFunctionCreate(newEvent).then(data => { + expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); + expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + }), + cloudFunctionDelete(newEvent).then(data => { + expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); + expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + }), + ]); + }); }); + }); - // createdAt and lastSignedIn are fields of admin.auth.UserMetadata below v5.0.0 - // We want to add shims to still expose these fields so that user's code do not break - // The shim and this test should be removed in v1.0.0 of firebase-functions - it('should still retain createdAt and lastSignedIn', () => { - return Promise.all([ - cloudFunctionCreate(event).then(data => { - expect(data.metadata.createdAt).to.deep.equal(new Date('2016-12-15T19:37:37.059Z')); - expect(data.metadata.lastSignedInAt).to.deep.equal(new Date('2017-01-01T00:00:00.000Z')); - }), - cloudFunctionDelete(event).then(data => { - expect(data.metadata.createdAt).to.deep.equal(new Date('2016-12-15T19:37:37.059Z')); - expect(data.metadata.lastSignedInAt).to.deep.equal(new Date('2017-01-01T00:00:00.000Z')); - }), - ]); + describe('userRecordConstructor', () => { + it('will provide falsey values for fields that are not in raw wire data', () => { + const record = auth.userRecordConstructor({ uid: '123'}); + expect(record.toJSON()).to.deep.equal({ + uid: '123', + email: null, + emailVerified: false, + displayName: null, + photoURL: null, + phoneNumber: null, + disabled: false, + providerData: [], + customClaims: {}, + passwordSalt: null, + passwordHash: null, + tokensValidAfterTime: null, + metadata: { + creationTime: null, + lastSignInTime: null, + }, + }); }); - it('should handle new wire format if/when there is a change', () => { - const newEvent = { - data: { - metadata: { - creationTime: '2016-12-15T19:37:37.059Z', - lastSignInTime: '2017-01-01T00:00:00.000Z', - }, + it('will not interfere with fields that are in raw wire data', () => { + const raw = { + uid: '123', + email: 'email@gmail.com', + emailVerified: true, + displayName: 'User', + photoURL: 'url', + phoneNumber: '1233332222', + disabled: true, + providerData: [], + customClaims: {}, + passwordSalt: 'abc', + passwordHash: 'def', + tokensValidAfterTime: '2027-02-02T23:01:19.797Z', + metadata: { + creationTime: '2017-02-02T23:06:26.124Z', + lastSignInTime: '2017-02-02T23:01:19.797Z', }, }; + const record = auth.userRecordConstructor(raw); + expect(record.toJSON()).to.deep.equal(raw); + }); + }); + + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => auth.user().onCreate(() => null)).to.not.throw(Error); + }); + + it('should throw when trigger is accessed', () => { + expect(() => auth.user().onCreate(() => null).__trigger).to.throw(Error); + }); - return Promise.all([ - cloudFunctionCreate(newEvent).then(data => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); - expect(data.metadata.createdAt).to.deep.equal(new Date('2016-12-15T19:37:37.059Z')); - expect(data.metadata.lastSignedInAt).to.deep.equal(new Date('2017-01-01T00:00:00.000Z')); - }), - cloudFunctionDelete(newEvent).then(data => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); - expect(data.metadata.createdAt).to.deep.equal(new Date('2016-12-15T19:37:37.059Z')); - expect(data.metadata.lastSignedInAt).to.deep.equal(new Date('2017-01-01T00:00:00.000Z')); - }), - ]); + it('should not throw when #run is called', () => { + let cf = auth.user().onCreate(() => null); + expect(cf.run).to.not.throw(Error); }); }); }); diff --git a/spec/providers/crashlytics.spec.ts b/spec/providers/crashlytics.spec.ts index 06c941e32..2b678eefb 100644 --- a/spec/providers/crashlytics.spec.ts +++ b/spec/providers/crashlytics.spec.ts @@ -21,57 +21,73 @@ // SOFTWARE. import * as crashlytics from '../../src/providers/crashlytics'; -import { config } from '../../src/index'; import { apps as appsNamespace } from '../../src/apps'; import { expect } from 'chai'; -import { fakeConfig } from '../support/helpers'; describe('Crashlytics Functions', () => { - before(() => { - config.singleton = fakeConfig(); - appsNamespace.init(config.singleton); - process.env.GCLOUD_PROJECT = 'project1'; - }); + describe('Issue Builder', () => { + before(() => { + appsNamespace.init(); + process.env.GCLOUD_PROJECT = 'project1'; + }); - after(() => { - delete appsNamespace.singleton; - delete config.singleton; - delete process.env.GCLOUD_PROJECT; - }); + after(() => { + delete appsNamespace.singleton; + delete process.env.GCLOUD_PROJECT; + }); - describe('#onNewDetected', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics.issue().onNewDetected((event) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.new', - resource: 'projects/project1', - }, + describe('#onNew', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = crashlytics.issue().onNew(data => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/firebase.crashlytics/eventTypes/issue.new', + resource: 'projects/project1', + service: 'fabric.io', + }, + }); }); }); - }); - describe('#onRegressed', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics.issue().onRegressed((event) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.regressed', - resource: 'projects/project1', - }, + describe('#onRegressed', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = crashlytics.issue().onRegressed(data => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/firebase.crashlytics/eventTypes/issue.regressed', + resource: 'projects/project1', + service: 'fabric.io', + }, + }); }); }); - }); - describe('#onVelocityAlert', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics.issue().onVelocityAlert((event) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.velocityAlert', - resource: 'projects/project1', - }, + describe('#onVelocityAlert', () => { + it('should return a TriggerDefinition with appropriate values', () => { + const cloudFunction = crashlytics.issue().onVelocityAlert(data => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/firebase.crashlytics/eventTypes/issue.velocityAlert', + resource: 'projects/project1', + service: 'fabric.io', + }, + }); }); }); }); + + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => crashlytics.issue().onNew(() => null)).to.not.throw(Error); + }); + + it('should throw if __trigger is accessed', () => { + expect(() => crashlytics.issue().onNew(() => null).__trigger).to.throw(Error); + }); + + it('should not throw when #run is called', () => { + let cf = crashlytics.issue().onNew(() => null); + expect(cf.run).to.not.throw(Error); + }); + }); }); diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index 6b06cc2fa..bebdac29a 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -22,442 +22,399 @@ import * as database from '../../src/providers/database'; import { expect as expect } from 'chai'; -import { fakeConfig } from '../support/helpers'; import { apps as appsNamespace } from '../../src/apps'; -import { config } from '../../src/index'; +import { applyChange } from '../../src/utils'; -describe('DatabaseBuilder', () => { +describe('Database Functions', () => { - before(() => { - config.singleton = fakeConfig(); - appsNamespace.init(config.singleton); - }); - - after(() => { - delete appsNamespace.singleton; - delete config.singleton; - }); + describe('DatabaseBuilder', () => { + // TODO add tests for building a data or change based on the type of operation - describe('#onWrite()', () => { - it('should return "ref.write" as the event type', () => { - let eventType = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.write'); - }); - - it('should construct a proper resource path', () => { - let resource = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + before(() => { + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: 'https://subdomain.firebaseio.com', + }); + appsNamespace.init(); }); - it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onWrite(() => null); - let resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + after(() => { + delete process.env.FIREBASE_CONFIG; + delete appsNamespace.singleton; }); - it('should return a handler that emits events with a proper DeltaSnapshot', () => { - let handler = database.ref('/users/{id}').onWrite(event => { - expect(event.data.val()).to.deep.equal({ foo: 'bar' }); + describe('#onWrite()', () => { + it('should return "ref.write" as the event type', () => { + let eventType = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.eventType; + expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.write'); }); - return handler({ - data: { - data: null, - delta: { foo: 'bar' }, - }, - resource: 'projects/_/instances/subdomains/refs/users', - } as any); - }); - }); - - describe('#onCreate()', () => { - it('should return "ref.create" as the event type', () => { - let eventType = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.create'); - }); + it('should construct a proper resource path', () => { + let resource = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + }); - it('should construct a proper resource path', () => { - let resource = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); - }); + it('should let developers choose a database instance', () => { + let func = database.instance('custom').ref('foo').onWrite(() => null); + let resource = func.__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + }); - it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onCreate(() => null); - let resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + it('should return a handler that emits events with a proper DataSnapshot', () => { + let handler = database.ref('/users/{id}').onWrite(change => { + expect(change.after.val()).to.deep.equal({ foo: 'bar' }); + }); + + return handler({ + data: { + data: null, + delta: { foo: 'bar' }, + }, + resource: 'projects/_/instances/subdomains/refs/users', + eventType: 'providers/google.firebase.database/eventTypes/ref.write', + }); + }); }); - it('should return a handler that emits events with a proper DeltaSnapshot', () => { - let handler = database.ref('/users/{id}').onCreate(event => { - expect(event.data.val()).to.deep.equal({ foo: 'bar' }); + describe('#onCreate()', () => { + it('should return "ref.create" as the event type', () => { + let eventType = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.eventType; + expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.create'); }); - return handler({ - data: { - data: null, - delta: { foo: 'bar' }, - }, - resource: 'projects/_/instances/subdomains/refs/users', - } as any); - }); - }); - - describe('#onUpdate()', () => { - it('should return "ref.update" as the event type', () => { - let eventType = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.update'); - }); + it('should construct a proper resource path', () => { + let resource = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + }); - it('should construct a proper resource path', () => { - let resource = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); - }); + it('should let developers choose a database instance', () => { + let func = database.instance('custom').ref('foo').onCreate(() => null); + let resource = func.__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + }); - it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onUpdate(() => null); - let resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + it('should return a handler that emits events with a proper DataSnapshot', () => { + let handler = database.ref('/users/{id}').onCreate(data => { + expect(data.val()).to.deep.equal({ foo: 'bar' }); + }); + + return handler({ + data: { + data: null, + delta: { foo: 'bar' }, + }, + resource: 'projects/_/instances/subdomains/refs/users', + eventType: 'providers/google.firebase.database/eventTypes/ref.create', + }); + }); }); - it('should return a handler that emits events with a proper DeltaSnapshot', () => { - let handler = database.ref('/users/{id}').onUpdate(event => { - expect(event.data.val()).to.deep.equal({ foo: 'bar' }); + describe('#onUpdate()', () => { + it('should return "ref.update" as the event type', () => { + let eventType = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.eventType; + expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.update'); }); - return handler({ - data: { - data: null, - delta: { foo: 'bar' }, - }, - resource: 'projects/_/instances/subdomains/refs/users', - } as any); - }); - }); - - describe('#onDelete()', () => { - it('should return "ref.delete" as the event type', () => { - let eventType = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.delete'); - }); + it('should construct a proper resource path', () => { + let resource = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + }); - it('should construct a proper resource path', () => { - let resource = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); - }); + it('should let developers choose a database instance', () => { + let func = database.instance('custom').ref('foo').onUpdate(() => null); + let resource = func.__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + }); - it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onDelete(() => null); - let resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + it('should return a handler that emits events with a proper DataSnapshot', () => { + let handler = database.ref('/users/{id}').onUpdate(change => { + expect(change.after.val()).to.deep.equal({ foo: 'bar' }); + }); + + return handler({ + data: { + data: null, + delta: { foo: 'bar' }, + }, + resource: 'projects/_/instances/subdomains/refs/users', + eventType: 'providers/google.firebase.database/eventTypes/ref.update', + }); + }); }); - it('should return a handler that emits events with a proper DeltaSnapshot', () => { - let handler = database.ref('/users/{id}').onDelete(event => { - expect(event.data.val()).to.deep.equal({ foo: 'bar' }); + describe('#onDelete()', () => { + it('should return "ref.delete" as the event type', () => { + let eventType = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.eventType; + expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.delete'); }); - return handler({ - data: { - data: null, - delta: { foo: 'bar' }, - }, - resource: 'projects/_/instances/subdomains/refs/users', - } as any); - }); - }); - -}); + it('should construct a proper resource path', () => { + let resource = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + }); -describe('resourceToInstanceAndPath', () => { - it('should return the correct instance and path strings', () => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/foo/refs/bar'); - expect(instance).to.equal('https://foo.firebaseio.com'); - expect(path).to.equal('/bar'); - }); -}); + it('should let developers choose a database instance', () => { + let func = database.instance('custom').ref('foo').onDelete(() => null); + let resource = func.__trigger.eventTrigger.resource; + expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + }); -describe('DeltaSnapshot', () => { - let subject; - const apps = new appsNamespace.Apps(fakeConfig()); - - let populate = (old: any, change: any) => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/other-subdomain/refs/foo'); - subject = new database.DeltaSnapshot( - apps.admin, - apps.admin, - old, - change, - path, - instance - ); - }; - - describe('#ref: firebase.database.Reference', () => { - it('should return a ref for correct instance, not the default instance', () => { - populate({}, {}); - expect(subject.ref.toJSON()).to.equal('https://other-subdomain.firebaseio.com/foo'); + it('should return a handler that emits events with a proper DataSnapshot', () => { + let handler = database.ref('/users/{id}').onDelete(data => { + expect(data.val()).to.deep.equal({ foo: 'bar' }); + }); + + return handler({ + data: { + data: { foo: 'bar' }, + delta: null, + }, + resource: 'projects/_/instances/subdomains/refs/users', + eventType: 'providers/google.firebase.database/eventTypes/ref.delete', + }); + }); }); - }); - describe('#adminRef(): firebase.database.Reference', () => { - it('should return an adminRef for correct instance, not the default instance', () => { - populate({}, {}); - expect(subject.adminRef.toJSON()).to.equal('https://other-subdomain.firebaseio.com/foo'); - }); }); - describe('#val(): any', () => { - it('should return child values based on the child path', () => { - populate({ a: { b: 'c' } }, { a: { d: 'e' } }); - expect(subject.child('a').val()).to.deep.equal({ b: 'c', d: 'e' }); + describe('process.env.FIREBASE_CONFIG not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => database.ref('/path').onWrite(() => null)).to.not.throw(Error); }); - it('should return null for children past a leaf', () => { - populate({ a: 23 }, { b: 33 }); - expect(subject.child('a/b').val()).to.be.null; - expect(subject.child('b/c').val()).to.be.null; + it('should throw when trigger is accessed', () => { + expect(() => database.ref('/path').onWrite(() => null).__trigger).to.throw(Error); }); - it('should return a leaf value', () => { - populate(null, 23); - expect(subject.val()).to.eq(23); - populate({ a: 23 }, { b: 23, a: null }); - expect(subject.child('b').val()).to.eq(23); + it('should not throw when #run is called', () => { + let cf = database.ref('/path').onWrite(() => null); + expect(cf.run).to.not.throw(Error); }); + }); - it('should coerce object into array if all keys are integers', () => { - populate(null, { 0: 'a', 1: 'b', 2: { c: 'd' } }); - expect(subject.val()).to.deep.equal(['a', 'b', { c: 'd' }]); - populate(null, { 0: 'a', 2: 'b', 3: { c: 'd' } }); - expect(subject.val()).to.deep.equal(['a', , 'b', { c: 'd' }]); - populate(null, { 'foo': { 0: 'a', 1: 'b' } }); - expect(subject.val()).to.deep.equal({ foo: ['a', 'b'] }); + describe('resourceToInstanceAndPath', () => { + it('should return the correct instance and path strings', () => { + let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/foo/refs/bar'); + expect(instance).to.equal('https://foo.firebaseio.com'); + expect(path).to.equal('/bar'); }); + }); - // Regression test: zero-values (including children) were accidentally forwarded as 'null'. - it('should deal with zero-values appropriately', () => { - populate(null, 0); - expect(subject.val()).to.equal(0); - populate(null, { myKey: 0 }); - expect(subject.val()).to.deep.equal({ myKey: 0 }); - - // Null values are still reported as null. - populate({ myKey: 'foo', myOtherKey: 'bar' }, { myKey: null }); - expect(subject.val()).to.deep.equal({ myOtherKey: 'bar' }); - }); + describe('DataSnapshot', () => { + let subject; + const apps = new appsNamespace.Apps(); - // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995) - it('should return correct values when data has "length" property', () => { - populate(null, { length: 3, foo: 'bar' }); - expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar'}); - }); - }); + let populate = (data: any) => { + let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/other-subdomain/refs/foo'); + subject = new database.DataSnapshot( + data, + path, + apps.admin, + instance + ); + }; - describe('#child(): DeltaSnapshot', () => { - it('should work with multiple calls', () => { - populate(null, { a: { b: { c: 'd' } } }); - expect(subject.child('a').child('b/c').val()).to.equal('d'); + describe('#ref: firebase.database.Reference', () => { + it('should return a ref for correct instance, not the default instance', () => { + populate({}); + expect(subject.ref.toJSON()).to.equal('https://other-subdomain.firebaseio.com/foo'); + }); }); - }); - describe('#exists(): boolean', () => { - it('should be true for an object value', () => { - populate(null, { a: { b: 'c' } }); - expect(subject.child('a').exists()).to.be.true; - }); + describe('#val(): any', () => { + it('should return child values based on the child path', () => { + populate(applyChange({ a: { b: 'c' } }, { a: { d: 'e' } })); + expect(subject.child('a').val()).to.deep.equal({ b: 'c', d: 'e' }); + }); - it('should be true for a leaf value', () => { - populate(null, { a: { b: 'c' } }); - expect(subject.child('a/b').exists()).to.be.true; - }); + it('should return null for children past a leaf', () => { + populate(applyChange({ a: 23 }, { b: 33 })); + expect(subject.child('a/b').val()).to.be.null; + expect(subject.child('b/c').val()).to.be.null; + }); - it('should be false for a non-existent value', () => { - populate(null, { a: { b: 'c' } }); - expect(subject.child('d').exists()).to.be.false; - }); + it('should return a leaf value', () => { + populate(23); + expect(subject.val()).to.eq(23); + populate({ b: 23, a: null }); + expect(subject.child('b').val()).to.eq(23); + }); - it('should be false for a value pathed beyond a leaf', () => { - populate(null, { a: { b: 'c' } }); - expect(subject.child('a/b/c').exists()).to.be.false; - }); - }); + it('should coerce object into array if all keys are integers', () => { + populate({ 0: 'a', 1: 'b', 2: { c: 'd' } }); + expect(subject.val()).to.deep.equal(['a', 'b', { c: 'd' }]); + populate({ 0: 'a', 2: 'b', 3: { c: 'd' } }); + expect(subject.val()).to.deep.equal(['a', , 'b', { c: 'd' }]); + populate({ 'foo': { 0: 'a', 1: 'b' } }); + expect(subject.val()).to.deep.equal({ foo: ['a', 'b'] }); + }); - describe('#previous: DeltaSnapshot', () => { - it('should cause val() to return old data only', () => { - populate({ a: 'b' }, { a: 'c', d: 'c' }); - expect(subject.previous.child('a').val()).to.equal('b'); - }); + // Regression test: zero-values (including children) were accidentally forwarded as 'null'. + it('should deal with zero-values appropriately', () => { + populate(0); + expect(subject.val()).to.equal(0); + populate({ myKey: 0 }); + expect(subject.val()).to.deep.equal({ myKey: 0 }); - it('should return a null if the new value is present', () => { - populate(null, 23); - expect(subject.previous.val()).to.be.null; - }); - }); + // Null values are still reported as null. + populate({ myKey: null }); + expect(subject.val()).to.deep.equal({ myKey: null }); + }); - describe('#current: DeltaSnapshot', () => { - it('should cause a previous snapshot to return new data', () => { - populate({ a: 'b' }, { a: 'c', d: 'c' }); - expect(subject.previous.child('a').current.val()).to.equal('c'); + // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995) + it('should return correct values when data has "length" property', () => { + populate({ length: 3, foo: 'bar' }); + expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar'}); + }); }); - it('should return a null if the new value is null', () => { - populate(23, null); - expect(subject.previous.current.val()).to.be.null; + describe('#child(): DataSnapshot', () => { + it('should work with multiple calls', () => { + populate({ a: { b: { c: 'd' } } }); + expect(subject.child('a').child('b/c').val()).to.equal('d'); + }); }); - }); - describe('#changed(): boolean', () => { - it('should be true only when the current value has changed', () => { - populate({ a: { b: 'c' } }, { a: { d: 'e' } }); - expect(subject.child('a').changed()).to.be.true; - expect(subject.child('a/b').changed()).to.be.false; - expect(subject.child('a/d').changed()).to.be.true; - }); + describe('#exists(): boolean', () => { + it('should be true for an object value', () => { + populate({ a: { b: 'c' } }); + expect(subject.child('a').exists()).to.be.true; + }); - it('should be true when going to or from a null value', () => { - populate(null, 'foo'); - expect(subject.changed()).to.be.true; - populate('foo', null); - expect(subject.changed()).to.be.true; - }); - }); + it('should be true for a leaf value', () => { + populate({ a: { b: 'c' } }); + expect(subject.child('a/b').exists()).to.be.true; + }); - describe('#forEach(action: (a: DeltaSnapshot) => boolean): boolean', () => { - it('should iterate through child snapshots', () => { - populate({ a: 'b' }, { c: 'd' }); - let out = ''; - subject.forEach(snap => { - out += snap.val(); + it('should be false for a non-existent value', () => { + populate({ a: { b: 'c' } }); + expect(subject.child('d').exists()).to.be.false; }); - expect(out).to.equal('bd'); - }); - it('should have correct key values for child snapshots', () => { - populate({ a: 'b' }, { c: 'd' }); - let out = ''; - subject.forEach(snap => { - out += snap.key; + it('should be false for a value pathed beyond a leaf', () => { + populate({ a: { b: 'c' } }); + expect(subject.child('a/b/c').exists()).to.be.false; }); - expect(out).to.equal('ac'); }); - it('should not execute for leaf or null nodes', () => { - populate(null, 23); - let count = 0; - let counter = snap => count++; + describe('#forEach(action: (a: DataSnapshot) => boolean): boolean', () => { + it('should iterate through child snapshots', () => { + populate({ a: 'b', c: 'd' }); + let out = ''; + subject.forEach(snap => { + out += snap.val(); + }); + expect(out).to.equal('bd'); + }); - expect(subject.forEach(counter)).to.equal(false); - populate(23, null); + it('should have correct key values for child snapshots', () => { + populate({ a: 'b', c: 'd' }); + let out = ''; + subject.forEach(snap => { + out += snap.key; + }); + expect(out).to.equal('ac'); + }); - expect(subject.forEach(counter)).to.equal(false); - expect(count).to.eq(0); - }); + it('should not execute for leaf or null nodes', () => { + populate(23); + let count = 0; + let counter = snap => count++; - it('should cancel further enumeration if callback returns true', () => { - populate(null, { a: 'b', c: 'd', e: 'f', g: 'h' }); - let out = ''; - const ret = subject.forEach(snap => { - if (snap.val() === 'f') { - return true; - } - out += snap.val(); - }); - expect(out).to.equal('bd'); - expect(ret).to.equal(true); - }); + expect(subject.forEach(counter)).to.equal(false); + expect(count).to.eq(0); + }); - it('should not cancel further enumeration if callback returns a truthy value', () => { - populate(null, { a: 'b', c: 'd', e: 'f', g: 'h' }); - let out = ''; - const ret = subject.forEach(snap => { - out += snap.val(); - return 1; + it('should cancel further enumeration if callback returns true', () => { + populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); + let out = ''; + const ret = subject.forEach(snap => { + if (snap.val() === 'f') { + return true; + } + out += snap.val(); + }); + expect(out).to.equal('bd'); + expect(ret).to.equal(true); }); - expect(out).to.equal('bdfh'); - expect(ret).to.equal(false); - }); - it('should not cancel further enumeration if callback does not return', () => { - populate(null, { a: 'b', c: 'd', e: 'f', g: 'h' }); - let out = ''; - const ret = subject.forEach(snap => { - out += snap.val(); + it('should not cancel further enumeration if callback returns a truthy value', () => { + populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); + let out = ''; + const ret = subject.forEach(snap => { + out += snap.val(); + return 1; + }); + expect(out).to.equal('bdfh'); + expect(ret).to.equal(false); }); - expect(out).to.equal('bdfh'); - expect(ret).to.equal(false); - }); - }); - describe('#numChildren()', () => { - it('should be key count for objects', () => { - populate(null, { a: 'b', c: 'd' }); - expect(subject.numChildren()).to.eq(2); + it('should not cancel further enumeration if callback does not return', () => { + populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); + let out = ''; + const ret = subject.forEach(snap => { + out += snap.val(); + }); + expect(out).to.equal('bdfh'); + expect(ret).to.equal(false); + }); }); - it('should be 0 for non-objects', () => { - populate(null, 23); - expect(subject.numChildren()).to.eq(0); - }); - }); + describe('#numChildren()', () => { + it('should be key count for objects', () => { + populate({ a: 'b', c: 'd' }); + expect(subject.numChildren()).to.eq(2); + }); - describe('#hasChild(childPath): boolean', () => { - it('should return true for a child or deep child', () => { - populate(null, { a: { b: 'c' }, d: 23 }); - expect(subject.hasChild('a/b')).to.be.true; - expect(subject.hasChild('d')).to.be.true; + it('should be 0 for non-objects', () => { + populate(23); + expect(subject.numChildren()).to.eq(0); + }); }); - it('should return false if a child is missing', () => { - populate(null, { a: 'b' }); - expect(subject.hasChild('c')).to.be.false; - expect(subject.hasChild('a/b')).to.be.false; - }); - }); + describe('#hasChild(childPath): boolean', () => { + it('should return true for a child or deep child', () => { + populate({ a: { b: 'c' }, d: 23 }); + expect(subject.hasChild('a/b')).to.be.true; + expect(subject.hasChild('d')).to.be.true; + }); - describe('#key: string', () => { - it('should return the key name', () => { - expect(subject.key).to.equal('foo'); + it('should return false if a child is missing', () => { + populate({ a: 'b' }); + expect(subject.hasChild('c')).to.be.false; + expect(subject.hasChild('a/b')).to.be.false; + }); }); - it('should return null for the root', () => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/refs/refs'); - const snapshot = new database.DeltaSnapshot( - apps.admin, - apps.admin, - null, - null, - path, - instance - ); - expect(snapshot.key).to.be.null; - }); + describe('#key: string', () => { + it('should return the key name', () => { + expect(subject.key).to.equal('foo'); + }); - it('should return null for explicit root', () => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/refs/refs'); - expect(new database.DeltaSnapshot( - apps.admin, - apps.admin, - null, - {}, - path, - instance - ).key).to.be.null; - }); + it('should return null for the root', () => { + let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/foo/refs/'); + const snapshot = new database.DataSnapshot( + null, + path, + apps.admin, + instance + ); + expect(snapshot.key).to.be.null; + }); - it('should work for child paths', () => { - expect(subject.child('foo/bar').key).to.equal('bar'); + it('should work for child paths', () => { + expect(subject.child('foo/bar').key).to.equal('bar'); + }); }); - }); - describe('#toJSON(): Object', () => { - it('should return the current value', () => { - populate(null, { a: 'b' }); - expect(subject.toJSON()).to.deep.equal(subject.val()); - expect(subject.previous.toJSON()).to.deep.equal(subject.previous.val()); - }); - it('should be stringifyable', () => { - populate(null, { a: 'b' }); - expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}'); + describe('#toJSON(): Object', () => { + it('should return the current value', () => { + populate({ a: 'b' }); + expect(subject.toJSON()).to.deep.equal(subject.val()); + }); + it('should be stringifyable', () => { + populate({ a: 'b' }); + expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}'); + }); }); }); }); diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index b37f6992f..86ed024bb 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -33,39 +33,31 @@ describe('Firestore Functions', () => { }; }; - beforeEach(() => { - process.env.GCLOUD_PROJECT = 'project1'; - process.env.FIREBASE_PROJECT = JSON.stringify({ - databaseUrl: 'project1@firebaseio.com', - }); - }); - - afterEach(() => { - delete process.env.GCLOUD_PROJECT; - delete process.env.FIREBASE_PROJECT; - }); - describe('document builders and event types', () => { function expectedTrigger(resource: string, eventType: string) { return { eventTrigger: { resource, - eventType: `providers/${firestore.provider}/eventTypes/${eventType}`, + eventType: `providers/cloud.firestore/eventTypes/${eventType}`, + service: 'firestore.googleapis.com', }, }; } + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + it('should allow terse constructors', () => { let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; let cloudFunction = firestore.document('users/{uid}').onWrite(() => null); expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger(resource, 'document.write')); }); - it('should throw useful error when GCLOUD_PROJECT missing', () => { - delete process.env.GCLOUD_PROJECT; - expect(() => firestore.document('users/{uid}')).to.throw(Error, 'GCLOUD_PROJECT'); - }); - it('should allow custom namespaces', () => { let resource = 'projects/project1/databases/(default)/documents@v2/users/{uid}'; let cloudFunction = firestore.namespace('v2').document('users/{uid}').onWrite(() => null); @@ -103,14 +95,29 @@ describe('Firestore Functions', () => { }); }); + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => firestore.document('input').onCreate(() => null)).to.not.throw(Error); + }); + + it('should throw when trigger is accessed', () => { + expect(() => firestore.document('input').onCreate(() => null).__trigger).to.throw(Error); + }); + + it('should not throw when #run is called', () => { + let cf = firestore.document('input').onCreate(() => null); + expect(cf.run).to.not.throw(Error); + }); + }); + describe('dataConstructor', () => { - function constructEvent(oldValue: object, value: object) { + function constructEvent(oldValue: object, value: object, eventType: string) { return { 'data': { 'oldValue': oldValue, 'value': value, }, - 'resource': 'projects/pid/databases/(default)/documents/collection/123', + 'context': {}, }; } @@ -137,53 +144,54 @@ describe('Firestore Functions', () => { } it('constructs appropriate fields and getters for event.data on "document.write" events', () => { - let testFunction = firestore.document('path').onWrite((event) => { - expect(event.data.data()).to.deep.equal({key1: true, key2: 123}); - expect(event.data.get('key1')).to.equal(true); - expect(event.data.previous.data()).to.deep.equal({key1: false, key2: 111}); - expect(event.data.previous.get('key1')).to.equal(false); + let testFunction = firestore.document('path').onWrite((change) => { + expect(change.before.data()).to.deep.equal({key1: false, key2: 111}); + expect(change.before.get('key1')).to.equal(false); + expect(change.after.data()).to.deep.equal({key1: true, key2: 123}); + expect(change.after.get('key1')).to.equal(true); + return true; // otherwise will get warning about returning undefined }); - let data = constructEvent(createOldValue(), createValue()); + let data = constructEvent(createOldValue(), createValue(), 'document.write'); return testFunction(data); - }); + }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.create" events', () => { - let testFunction = firestore.document('path').onCreate((event) => { - expect(event.data.data()).to.deep.equal({key1: true, key2: 123}); - expect(event.data.get('key1')).to.equal(true); - expect(event.data.previous).to.not.equal(null); - expect(event.data.previous.exists).to.be.false; + let testFunction = firestore.document('path').onCreate((data) => { + expect(data.data()).to.deep.equal({key1: true, key2: 123}); + expect(data.get('key1')).to.equal(true); + return true; // otherwise will get warning about returning undefined }); - let data = constructEvent({}, createValue()); + let data = constructEvent({}, createValue(), 'document.create'); return testFunction(data); - }); + }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.update" events', () => { - let testFunction = firestore.document('path').onUpdate((event) => { - expect(event.data.data()).to.deep.equal({key1: true, key2: 123}); - expect(event.data.get('key1')).to.equal(true); - expect(event.data.previous.data()).to.deep.equal({key1: false, key2: 111}); - expect(event.data.previous.get('key1')).to.equal(false); + let testFunction = firestore.document('path').onUpdate((change) => { + expect(change.before.data()).to.deep.equal({key1: false, key2: 111}); + expect(change.before.get('key1')).to.equal(false); + expect(change.after.data()).to.deep.equal({key1: true, key2: 123}); + expect(change.after.get('key1')).to.equal(true); + return true; // otherwise will get warning about returning undefined }); - let data = constructEvent(createOldValue(), createValue()); + let data = constructEvent(createOldValue(), createValue(), 'document.update'); return testFunction(data); - }); + }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.delete" events', () => { - let testFunction = firestore.document('path').onDelete((event) => { - expect(event.data.exists).to.equal(false); - expect(event.data.previous.data()).to.deep.equal({key1: false, key2: 111}); - expect(event.data.previous.get('key1')).to.equal(false); + let testFunction = firestore.document('path').onDelete((data) => { + expect(data.data()).to.deep.equal({key1: false, key2: 111}); + expect(data.get('key1')).to.equal(false); + return true; // otherwise will get warning about returning undefined }); - let data = constructEvent(createOldValue(), {}); + let data = constructEvent(createOldValue(), {}, 'document.delete'); return testFunction(data); - }); + }).timeout(5000); }); - describe('DeltaDocumentSnapshot', () => { + describe('SnapshotConstructor', () => { describe('#data()', () => { it('should parse int values', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: constructValue({'key': {'integerValue': '123'}}), }, @@ -192,7 +200,7 @@ describe('Firestore Functions', () => { }); it('should parse double values', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: constructValue({'key': {'doubleValue': 12.34}}), }, @@ -201,7 +209,7 @@ describe('Firestore Functions', () => { }); it('should parse null values', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: constructValue({'key': {'nullValue': null}}), }, @@ -210,7 +218,7 @@ describe('Firestore Functions', () => { }); it('should parse boolean values', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: constructValue({'key': {'booleanValue': true}}), }, @@ -219,7 +227,7 @@ describe('Firestore Functions', () => { }); it('should parse string values', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: constructValue({'key': {'stringValue': 'foo'}}), }, @@ -238,7 +246,7 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'key': [1, 2]}); @@ -259,7 +267,7 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'keyParent': {'key1':'val1', 'key2':'val2'}}); @@ -280,7 +288,7 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'geoPointValue': { @@ -295,7 +303,7 @@ describe('Firestore Functions', () => { 'referenceValue': 'projects/proj1/databases/(default)/documents/doc1/id', }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()['referenceVal'].path).to.equal('doc1/id'); @@ -307,7 +315,7 @@ describe('Firestore Functions', () => { 'timestampValue': '2017-06-13T00:58:40.349Z', }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'timestampVal': new Date('2017-06-13T00:58:40.349Z')}); @@ -319,7 +327,7 @@ describe('Firestore Functions', () => { 'timestampValue': '2017-06-13T00:58:40Z', }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'timestampVal': new Date('2017-06-13T00:58:40Z')}); @@ -333,7 +341,7 @@ describe('Firestore Functions', () => { 'bytesValue': 'Zm9vYmFy', }, }); - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); expect(snapshot.data()).to.deep.equal({'binaryVal': new Buffer('foobar')}); @@ -344,7 +352,7 @@ describe('Firestore Functions', () => { let snapshot; before(() => { - snapshot = firestore.dataConstructor({ + snapshot = firestore.snapshotConstructor({ 'data': { 'value': { 'fields': {'key': {'integerValue': '1'}}, @@ -385,7 +393,7 @@ describe('Firestore Functions', () => { describe('Handle empty and non-existent documents', () => { it('constructs non-existent DocumentSnapshot when whole document deleted', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ 'data': { 'value': {}, // value is empty when the whole document is deleted }, @@ -396,7 +404,7 @@ describe('Firestore Functions', () => { }); it('constructs existent DocumentSnapshot with empty data when all fields of document deleted', () => { - let snapshot = firestore.dataConstructor({ + let snapshot = firestore.snapshotConstructor({ 'data': { 'value': { // value is not empty when document still exists 'createTime': '2017-06-02T18:48:58.920638Z', diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index b9c523007..d75cfb60c 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -27,7 +27,7 @@ import * as jwt from 'jsonwebtoken'; import * as mocks from '../fixtures/credential/key.json'; import * as nock from 'nock'; import * as _ from 'lodash'; -import { apps } from '../../src/apps'; +import { apps as appsNamespace } from '../../src/apps'; import { expect } from 'chai'; describe('CloudHttpsBuilder', () => { @@ -201,7 +201,7 @@ export function generateIdToken(projectId: string): string { } describe('callable.FunctionBuilder', () => { - let oldCredential: firebase.credential.Credential = undefined; + let app; before(() => { let credential = { @@ -217,12 +217,16 @@ describe('callable.FunctionBuilder', () => { }; }, }; - oldCredential = apps().admin.options.credential; - apps().admin.options.credential = credential; + app = firebase.initializeApp({ + projectId: 'aProjectId', + credential: credential, + }); + Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); }); after(() => { - apps().admin.options.credential = oldCredential; + app.delete(); + delete appsNamespace.singleton; }); describe('#onCall', () => { @@ -375,7 +379,7 @@ describe('callable.FunctionBuilder', () => { it('should handle auth', async () => { const mock = mockFetchPublicKeys(); - const projectId = apps().admin.options.projectId; + const projectId = appsNamespace().admin.options.projectId; const idToken = generateIdToken(projectId); await runTest({ httpRequest: request(null, 'application/json', { diff --git a/spec/providers/pubsub.spec.ts b/spec/providers/pubsub.spec.ts index 307f38da8..e4330bff8 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/providers/pubsub.spec.ts @@ -23,91 +23,109 @@ import * as pubsub from '../../src/providers/pubsub'; import { expect } from 'chai'; -describe('pubsub.Message', () => { - describe('#json', () => { - it('should return json decoded from base64', () => { - let message = new pubsub.Message({ - data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'), +describe('Pubsub Functions', () => { + describe('pubsub.Message', () => { + describe('#json', () => { + it('should return json decoded from base64', () => { + let message = new pubsub.Message({ + data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'), + }); + + expect(message.json.hello).to.equal('world'); }); - expect(message.json.hello).to.equal('world'); - }); + it('should preserve passed in json', () => { + let message = new pubsub.Message({ + data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'), + json: {goodbye: 'world'}, + }); - it('should preserve passed in json', () => { - let message = new pubsub.Message({ - data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'), - json: {goodbye: 'world'}, + expect(message.json.goodbye).to.equal('world'); }); - - expect(message.json.goodbye).to.equal('world'); }); - }); - describe('#toJSON', () => { - it('should be JSON stringify-able', () => { - let encoded = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); - let message = new pubsub.Message({ - data: encoded, - }); + describe('#toJSON', () => { + it('should be JSON stringify-able', () => { + let encoded = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); + let message = new pubsub.Message({ + data: encoded, + }); - expect(JSON.parse(JSON.stringify(message))).to.deep.equal({ - data: encoded, - attributes: {}, + expect(JSON.parse(JSON.stringify(message))).to.deep.equal({ + data: encoded, + attributes: {}, + }); }); }); }); -}); -describe('pubsub.FunctionBuilder', () => { + describe('pubsub.FunctionBuilder', () => { - before(() => { - process.env.GCLOUD_PROJECT = 'project1'; - }); + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); - after(() => { - delete process.env.GCLOUD_PROJECT; - }); + after(() => { + delete process.env.GCLOUD_PROJECT; + }); - describe('#onPublish', () => { - it('should return a TriggerDefinition with appropriate values', () => { - // Pick up project from process.env.GCLOUD_PROJECT - const result = pubsub.topic('toppy').onPublish(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/cloud.pubsub/eventTypes/topic.publish', - resource: 'projects/project1/topics/toppy', - }, + describe('#onPublish', () => { + it('should return a TriggerDefinition with appropriate values', () => { + // Pick up project from process.env.GCLOUD_PROJECT + const result = pubsub.topic('toppy').onPublish(() => null); + expect(result.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.pubsub.topic.publish', + resource: 'projects/project1/topics/toppy', + service: 'pubsub.googleapis.com', + }, + }); }); - }); - it ('should throw with improperly formatted topics', () => { - expect(() => pubsub.topic('bad/topic/format')).to.throw(Error); - }); + it ('should throw with improperly formatted topics', () => { + expect(() => pubsub.topic('bad/topic/format')).to.throw(Error); + }); - it('should properly handle a new-style event', () => { - const raw = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); - const event = { - data: { - data: raw, - attributes: { - foo: 'bar', + it('should properly handle a new-style event', () => { + const raw = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); + const event = { + data: { + data: raw, + attributes: { + foo: 'bar', + }, }, - }, - }; - - const result = pubsub.topic('toppy').onPublish(ev => { - return { - raw: ev.data.data, - json: ev.data.json, - attributes: ev.data.attributes, }; - }); - return expect(result(event)).to.eventually.deep.equal({ - raw, - json: {hello: 'world'}, - attributes: {foo: 'bar'}, + const result = pubsub.topic('toppy').onPublish(data => { + return { + raw: data.data, + json: data.json, + attributes: data.attributes, + }; + }); + + return expect(result(event)).to.eventually.deep.equal({ + raw, + json: {hello: 'world'}, + attributes: {foo: 'bar'}, + }); }); }); }); + + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => pubsub.topic('toppy').onPublish(() => null)).to.not.throw(Error); + }); + + it('should throw when trigger is accessed', () => { + expect(() => pubsub.topic('toppy').onPublish(() => null).__trigger).to.throw(Error); + }); + + it('should not throw when #run is called', () => { + let cf = pubsub.topic('toppy').onPublish(() => null); + expect(cf.run).to.not.throw(Error); + }); + }); }); diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index fa74f1ecf..182789e1b 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -22,67 +22,256 @@ import * as storage from '../../src/providers/storage'; import { expect as expect } from 'chai'; -import { fakeConfig } from '../support/helpers'; -import { config } from '../../src/index'; -describe('storage.FunctionBuilder', () => { - before(() => { - config.singleton = fakeConfig(); - }); +describe('Storage Functions', () => { + describe('ObjectBuilder', () => { + before(() => { + process.env.FIREBASE_CONFIG = JSON.stringify({ + storageBucket: 'bucket', + }); + }); - after(() => { - delete config.singleton; - }); + after(() => { + delete process.env.FIREBASE_CONFIG; + }); - describe('#onChange', () => { - it('should return a TriggerDefinition with appropriate values', () => { - let cloudFunction = storage.bucket('bucky').object().onChange(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/cloud.storage/eventTypes/object.change', - resource: 'projects/_/buckets/bucky', - }, + describe('#onArchive', () => { + it('should return a TriggerDefinition with appropriate values', () => { + let cloudFunction = storage.bucket('bucky').object().onArchive(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.archive', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should use the default bucket when none is provided', () => { + let cloudFunction = storage.object().onArchive(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.archive', + resource: 'projects/_/buckets/bucket', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should allow fully qualified bucket names', () => { + let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let result = subjectQualified.onArchive(() => null); + expect(result.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.archive', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should throw with improperly formatted buckets', () => { + expect(() => storage.bucket('bad/bucket/format').object().onArchive(() => null).__trigger) + .to.throw(Error); }); - }); - it('should use the default bucket when none is provided', () => { - let cloudFunction = storage.object().onChange(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/cloud.storage/eventTypes/object.change', - resource: 'projects/_/buckets/bucket', - }, + it('should not mess with media links using non-literal slashes', () => { + let cloudFunction = storage.object().onArchive(data => { + return data.mediaLink; + }); + let goodMediaLinkEvent = { + data: { + mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + }, + }; + return cloudFunction(goodMediaLinkEvent).then(result => { + expect(result).equals(goodMediaLinkEvent.data.mediaLink); + }); }); }); - it('should allow fully qualified bucket names', () => { - let subjectQualified = new storage.ObjectBuilder('projects/_/buckets/bucky'); - let result = subjectQualified.onChange(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/cloud.storage/eventTypes/object.change', - resource: 'projects/_/buckets/bucky', - }, + describe('#onDelete', () => { + it('should return a TriggerDefinition with appropriate values', () => { + let cloudFunction = storage.bucket('bucky').object().onDelete(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.delete', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should use the default bucket when none is provided', () => { + let cloudFunction = storage.object().onDelete(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.delete', + resource: 'projects/_/buckets/bucket', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should allow fully qualified bucket names', () => { + let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let result = subjectQualified.onDelete(() => null); + expect(result.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.delete', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should throw with improperly formatted buckets', () => { + expect(() => storage.bucket('bad/bucket/format').object().onDelete(() => null).__trigger) + .to.throw(Error); + }); + + it('should not mess with media links using non-literal slashes', () => { + let cloudFunction = storage.object().onDelete(data => { + return data.mediaLink; + }); + let goodMediaLinkEvent = { + data: { + mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + }, + }; + return cloudFunction(goodMediaLinkEvent).then(result => { + expect(result).equals(goodMediaLinkEvent.data.mediaLink); + }); }); }); - it('should throw with improperly formatted buckets', () => { - expect(() => storage.bucket('bad/bucket/format')).to.throw(Error); + describe('#onFinalize', () => { + it('should return a TriggerDefinition with appropriate values', () => { + let cloudFunction = storage.bucket('bucky').object().onFinalize(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.finalize', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should use the default bucket when none is provided', () => { + let cloudFunction = storage.object().onFinalize(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.finalize', + resource: 'projects/_/buckets/bucket', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should allow fully qualified bucket names', () => { + let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let result = subjectQualified.onFinalize(() => null); + expect(result.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.finalize', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should throw with improperly formatted buckets', () => { + expect(() => storage.bucket('bad/bucket/format').object().onFinalize(() => null).__trigger) + .to.throw(Error); + }); + + it('should not mess with media links using non-literal slashes', () => { + let cloudFunction = storage.object().onFinalize(data => { + return data.mediaLink; + }); + let goodMediaLinkEvent = { + data: { + mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + }, + }; + return cloudFunction(goodMediaLinkEvent).then(result => { + expect(result).equals(goodMediaLinkEvent.data.mediaLink); + }); + }); }); - it('should not mess with media links using non-literal slashes', () => { - let cloudFunction = storage.object().onChange((event) => { - return event.data.mediaLink; + describe('#onMetadataUpdate', () => { + it('should return a TriggerDefinition with appropriate values', () => { + let cloudFunction = storage.bucket('bucky').object().onMetadataUpdate(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.metadataUpdate', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); }); - let goodMediaLinkEvent = { - data: { - mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' - + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', - }, - }; - return cloudFunction(goodMediaLinkEvent).then(result => { - expect(result).equals(goodMediaLinkEvent.data.mediaLink); + + it('should use the default bucket when none is provided', () => { + let cloudFunction = storage.object().onMetadataUpdate(() => null); + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.metadataUpdate', + resource: 'projects/_/buckets/bucket', + service: 'storage.googleapis.com', + }, + }); }); + + it('should allow fully qualified bucket names', () => { + let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let result = subjectQualified.onMetadataUpdate(() => null); + expect(result.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'google.storage.object.metadataUpdate', + resource: 'projects/_/buckets/bucky', + service: 'storage.googleapis.com', + }, + }); + }); + + it('should throw with improperly formatted buckets', () => { + expect(() => storage.bucket('bad/bucket/format').object().onMetadataUpdate(() => null).__trigger) + .to.throw(Error); + }); + + it('should not mess with media links using non-literal slashes', () => { + let cloudFunction = storage.object().onMetadataUpdate(data => { + return data.mediaLink; + }); + let goodMediaLinkEvent = { + data: { + mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + }, + }; + return cloudFunction(goodMediaLinkEvent).then(result => { + expect(result).equals(goodMediaLinkEvent.data.mediaLink); + }); + }); + }); + }); + + describe('process.env.FIREBASE_CONFIG not set', () => { + it('should not throw if __trigger is not accessed', () => { + expect(() => storage.object().onArchive(() => null)).to.not.throw(Error); + }); + + it('should throw when trigger is accessed', () => { + expect(() => storage.object().onArchive(() => null).__trigger).to.throw(Error); + }); + + it('should not throw when #run is called', () => { + let cf = storage.object().onArchive(() => null); + expect(cf.run).to.not.throw(Error); }); }); }); diff --git a/spec/support/helpers.ts b/spec/support/helpers.ts deleted file mode 100644 index f9dff566d..000000000 --- a/spec/support/helpers.ts +++ /dev/null @@ -1,51 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -import * as _ from 'lodash'; -import { config } from '../../src/config'; - -export function fakeConfig(data?: Object) { - return _.extend({}, data, { - firebase: { - projectId: 'aProjectId', - databaseURL: 'https://subdomain.firebaseio.com', - storageBucket: 'bucket', - credential: { - getAccessToken: () => { - return Promise.resolve({ - expires_in: 1000, - access_token: 'fake', - }); - }, - getCertificate: () => { - return { - projectId: 'aProjectId', - }; - }, - }, - }, - }); -} - -export function unsetSingleton() { - delete config.singleton; -} diff --git a/spec/utils.spec.ts b/spec/utils.spec.ts index d4cfb489d..cd195a28f 100644 --- a/spec/utils.spec.ts +++ b/spec/utils.spec.ts @@ -19,9 +19,9 @@ // 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. -// -import {normalizePath, pathParts, valAt, applyChange} from '../src/utils'; -import {expect} from 'chai'; + +import { normalizePath, pathParts, valAt, applyChange } from '../src/utils'; +import { expect } from 'chai'; describe ('utils', () => { describe('.normalizePath(path: string)', () => { diff --git a/src/apps.ts b/src/apps.ts index 815788079..ac3a41b94 100644 --- a/src/apps.ts +++ b/src/apps.ts @@ -22,13 +22,12 @@ import * as _ from 'lodash'; import * as firebase from 'firebase-admin'; -import {config} from './index'; -import sha1 = require('sha1'); +import { firebaseConfig } from './config'; /** @internal */ export function apps(): apps.Apps { if (typeof apps.singleton === 'undefined') { - apps.init(config()); + apps.init(); } return apps.singleton; } @@ -47,7 +46,7 @@ export namespace apps { export let singleton: apps.Apps; - export let init = (config: config.Config) => singleton = new Apps(config); + export let init = () => singleton = new Apps(); export interface AuthMode { admin: boolean; @@ -61,11 +60,9 @@ export namespace apps { /** @internal */ export class Apps { - private _config: config.Config; private _refCounter: RefCounter; - constructor(config: config.Config) { - this._config = config; + constructor() { this._refCounter = {}; } @@ -78,19 +75,6 @@ export namespace apps { } } - _appName(auth: AuthMode): string { - if (!auth || typeof auth !== 'object') { - return '__noauth__'; - } else if (auth.admin) { - return '__admin__'; - } else if (!auth.variable) { - return '__noauth__'; - } else { - // Use hash of auth variable as name of user-authenticated app - return sha1(JSON.stringify(auth.variable)) as string; - } - } - _destroyApp(appName: string) { if (!this._appAlive(appName)) { return; @@ -98,25 +82,20 @@ export namespace apps { firebase.app(appName).delete().catch(_.noop); } - retain(payload) { - let auth: AuthMode = _.get(payload, 'auth', null); + retain() { let increment = n => { return (n || 0) + 1; }; - // Increment counter for admin because function might use event.data.adminRef + // Increment counter for admin because function might use event.data.ref _.update(this._refCounter, '__admin__', increment); - // Increment counter according to auth type because function might use event.data.ref - _.update(this._refCounter, this._appName(auth), increment); } - release(payload) { - let auth: AuthMode = _.get(payload, 'auth', null); + release() { let decrement = n => { return n - 1; }; return delay(garbageCollectionInterval).then(() => { _.update(this._refCounter, '__admin__', decrement); - _.update(this._refCounter, this._appName(auth), decrement); _.forEach(this._refCounter, (count, key) => { if (count <= 0) { this._destroyApp(key); @@ -132,39 +111,8 @@ export namespace apps { return firebase.initializeApp(this.firebaseArgs, '__admin__'); } - get noauth(): firebase.app.App { - if (this._appAlive('__noauth__')) { - return firebase.app('__noauth__'); - } - const param = _.extend({}, this.firebaseArgs, { - databaseAuthVariableOverride: null, - }); - return firebase.initializeApp(param, '__noauth__'); - } - - forMode(auth: AuthMode): firebase.app.App { - if (typeof auth !== 'object') { - return this.noauth; - } - if (auth.admin) { - return this.admin; - } - if (!auth.variable) { - return this.noauth; - } - - const appName = this._appName(auth); - if (this._appAlive(appName)) { - return firebase.app(appName); - } - const param = _.extend({}, this.firebaseArgs, { - databaseAuthVariableOverride: auth.variable, - }); - return firebase.initializeApp(param, appName); - } - private get firebaseArgs() { - return _.get(this._config, 'firebase', {}); + return _.assign({}, firebaseConfig(), {credential: firebase.credential.applicationDefault()}); } } } diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 361c62cfb..739f7d6b6 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -26,17 +26,129 @@ import { Request, Response } from 'express'; export { Request, Response }; const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); -/** An event to be handled in a developer's Cloud Function */ -export interface Event { - eventId?: string; - timestamp?: string; +/** Legacy wire format for an event + * @internal + */ +export interface LegacyEvent { + data: any; eventType?: string; resource?: string; + eventId?: string; + timestamp?: string; params?: { [option: string]: any }; - data: T; + auth?: apps.AuthMode; +} + +/** Wire format for an event + * @internal + */ +export interface Event { + context: { + eventId: string; + timestamp: string; + eventType: string; + resource: Resource; + }; + data: any; +} + +/** The context in which an event occurred. + * An EventContext describes: + * - The time an event occurred. + * - A unique identifier of the event. + * - The resource on which the event occurred, if applicable. + * - Authorization of the request that triggered the event, if applicable and available. + */ +export interface EventContext { + /** ID of the event */ + eventId: string; + /** Timestamp for when the event occured (ISO string) */ + timestamp: string; + /** Type of event */ + eventType: string; + /** Resource that triggered the event */ + resource: Resource; + /** Key-value pairs that represent the values of wildcards in a database reference */ + params: { [option: string]: any }; // added by SDK, but may be {} + /** Type of authentication for the triggering action, valid value are: 'ADMIN', 'USER', + * 'UNAUTHENTICATED'. Only available for database functions. + */ + authType?: 'ADMIN' | 'USER' | 'UNAUTHENTICATED'; + /** Firebase auth variable for the user whose action triggered the function. Field will be + * null for unauthenticated users, and will not exist for admin users. Only available + * for database functions. + */ + auth?: { + uid: string, + token: object, + }; +} + +/** Change describes a change of state - "before" represents the state prior + * to the event, "after" represents the state after the event. + */ +export class Change { + constructor( + public before?: T, + public after?: T, + ) {}; +} + +/** ChangeJson is the JSON format used to construct a Change object. */ +export interface ChangeJson { + /** Key-value pairs representing state of data before the change. + * If `fieldMask` is set, then only fields that changed are present in `before`. + */ + before?: any; + /** Key-value pairs representing state of data after the change. */ + after?: any; + /** Comma-separated string that represents names of field that changed. */ + fieldMask?: string; +} + +export namespace Change { + function reinterpretCast(x: any) { return x as T; } + + /** Factory method for creating a Change from a `before` object and an `after` object. */ + export function fromObjects(before: T, after: T) { + return new Change(before, after); + } + + /** Factory method for creating a Change from a JSON and an optional customizer function to be + * applied to both the `before` and the `after` fields. + */ + export function fromJSON(json: ChangeJson, customizer: (any) => T = reinterpretCast): Change { + let before = _.assign({}, json.before); + if (json.fieldMask) { + before = applyFieldMask(before, json.after, json.fieldMask); + } + return Change.fromObjects(customizer(before || {}), customizer(json.after || {})); + } /** @internal */ - auth?: apps.AuthMode; + export function applyFieldMask(sparseBefore, after, fieldMask) { + let before = _.assign({}, after); + let masks = fieldMask.split(','); + _.forEach(masks, mask => { + const val = _.get(sparseBefore, mask); + if (typeof val === 'undefined') { + _.unset(before, mask); + } else { + _.set(before, mask, val); + } + }); + return before; + } +} + +/** Resource is a standard format for defining a resource (google.rpc.context.AttributeContext.Resource). + * In Cloud Functions, it is the resource that triggered the function - such as a storage bucket. + */ +export interface Resource { + service: string; + name: string; + type?: string; + labels?: { [tag: string]: string }; } /** TriggerAnnotated is used internally by the firebase CLI to understand what type of Cloud Function to deploy. */ @@ -46,10 +158,16 @@ export interface TriggerAnnotated { eventTrigger?: { eventType: string; resource: string; + service: string; } }; } +/** A Runnable has a `run` method which directly invokes the user-defined function - useful for unit testing. */ +export interface Runnable { + run: (data: T, context?: EventContext) => PromiseLike | any; +} + /** * An HttpsFunction is both an object that exports its trigger definitions at __trigger and * can be called as a function that takes an express.js Request and Response object. @@ -60,59 +178,68 @@ export type HttpsFunction = TriggerAnnotated & ((req: Request, resp: Response) = * A CloudFunction is both an object that exports its trigger definitions at __trigger and * can be called as a function using the raw JS API for Google Cloud Functions. */ -export type CloudFunction = TriggerAnnotated & ((event: Event | Event) => PromiseLike | any); +export type CloudFunction = Runnable & TriggerAnnotated & ((input: any) => PromiseLike | any); /** @internal */ export interface MakeCloudFunctionArgs { + // TODO should remove `provider` and require a fully qualified `eventType` + // once all providers have migrated to new format. provider: string; eventType: string; - resource: string; - dataConstructor?: (raw: Event) => EventData; - handler: (event?: Event) => PromiseLike | any; - before?: (raw: Event) => void; - after?: (raw: Event) => void; -} - -function _makeParams(event: Event, triggerResource: string): { [option: string]: any } { - if (!event.resource) { // In unit testing, "resource" may not be populated for a test event. - return event.params || {}; - } - - let wildcards = triggerResource.match(WILDCARD_REGEX); - let params = {}; - if (wildcards) { - let triggerResourceParts = _.split(triggerResource, '/'); - let eventResourceParts = _.split(event.resource, '/'); - _.forEach(wildcards, wildcard => { - let wildcardNoBraces = wildcard.slice(1,-1); - - let position = _.indexOf(triggerResourceParts, wildcard); - params[wildcardNoBraces] = eventResourceParts[position]; - }); - } - - return params; + triggerResource: () => string; + service: string; + dataConstructor?: (raw: Event | LegacyEvent) => EventData; + handler: (data: EventData, context?: EventContext) => PromiseLike | any; + before?: (raw: Event | LegacyEvent) => void; + after?: (raw: Event | LegacyEvent) => void; + legacyEventType?: string; } /** @internal */ export function makeCloudFunction({ provider, eventType, - resource, - dataConstructor = (raw: Event) => raw.data, + triggerResource, + service, + dataConstructor = (raw: Event | LegacyEvent) => raw.data, handler, before = () => { return; }, after = () => { return; }, + legacyEventType, }: MakeCloudFunctionArgs): CloudFunction { - let cloudFunction: any = async (event: Event) => { + let cloudFunction: any = async (event: Event | LegacyEvent) => { + if (!_.has(event, 'data')) { + throw Error('Cloud function needs to be called with an event parameter.' + + 'If you are writing unit tests, please use the Node module firebase-functions-fake.'); + } try { before(event); - let typedEvent: Event = _.cloneDeep(event); - typedEvent.data = dataConstructor(event); - typedEvent.params = _makeParams(event, resource) || {}; + let dataOrChange = dataConstructor(event); + let context; + if (isEvent(event)) { // new event format + context = _.cloneDeep(event.context); + } else { // legacy event format + context = { + eventId: event.eventId, + timestamp: event.timestamp, + eventType: provider + '.' + eventType, + resource: { + service: service, + name: event.resource, + }, + }; + if (provider === 'google.firebase.database') { + context.authType = _detectAuthType(event); + if (context.authType !== 'ADMIN') { + context.auth = _makeAuth(event, context.authType); + } + } + } - let promise = handler(typedEvent); + context.params = _makeParams(context, triggerResource); + + let promise = handler(dataOrChange, context); if (typeof promise === 'undefined') { console.warn('Function returned undefined, expected Promise or value'); } @@ -121,13 +248,63 @@ export function makeCloudFunction({ after(event); } }; - - cloudFunction.__trigger = { - eventTrigger: { - resource, - eventType: `providers/${provider}/eventTypes/${eventType}`, + Object.defineProperty(cloudFunction, '__trigger', { + get: () => { + return { + eventTrigger: { + resource: triggerResource(), + eventType: legacyEventType || provider + '.' + eventType, + service, + }, + }; }, + }); + cloudFunction.run = handler; + return cloudFunction; +} + +function isEvent(event: Event | LegacyEvent): event is Event { + return _.has(event, 'context'); +} + +function _makeParams(context: EventContext, triggerResourceGetter: () => string): { [option: string]: any } { + if (context.params) { // In unit testing, user may directly provide `context.params`. + return context.params; + } + if (!context.resource) { // In unit testing, `resource` may be unpopulated for a test event. + return {}; + } + let triggerResource = triggerResourceGetter(); + let wildcards = triggerResource.match(WILDCARD_REGEX); + let params = {}; + if (wildcards) { + let triggerResourceParts = _.split(triggerResource, '/'); + let eventResourceParts = _.split(context.resource.name, '/'); + _.forEach(wildcards, wildcard => { + let wildcardNoBraces = wildcard.slice(1,-1); + let position = _.indexOf(triggerResourceParts, wildcard); + params[wildcardNoBraces] = eventResourceParts[position]; + }); + } + return params; +} + +function _makeAuth(event: LegacyEvent, authType: string) { + if (authType === 'UNAUTHENTICATED') { + return null; + } + return { + uid: _.get(event, 'auth.variable.uid'), + token: _.get(event, 'auth.variable.token'), }; +} - return cloudFunction; +function _detectAuthType(event: LegacyEvent) { + if (_.get(event, 'auth.admin')) { + return 'ADMIN'; + } + if (_.has(event, 'auth.variable')) { + return 'USER'; + } + return 'UNAUTHENTICATED'; } diff --git a/src/config.ts b/src/config.ts index dddaeab48..a1cfc7090 100644 --- a/src/config.ts +++ b/src/config.ts @@ -21,13 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as _ from 'lodash'; import * as firebase from 'firebase-admin'; export function config(): config.Config { if (typeof config.singleton === 'undefined') { - const cred = firebase.credential.applicationDefault(); - init(cred); + init(); } return config.singleton; } @@ -35,38 +33,66 @@ export function config(): config.Config { export namespace config { // Config type is usable as a object (dot notation allowed), and firebase // property will also code complete. - export type Config = { [key: string]: any } & { firebase: firebase.AppOptions }; + export type Config = { [key: string]: any }; /** @internal */ export let singleton: config.Config; } -function init (credential: firebase.credential.Credential) { - let firebaseEnv = {}; - if (process.env.FIREBASE_PROJECT) { - firebaseEnv = { firebase: JSON.parse(process.env.FIREBASE_PROJECT) }; +/* @internal */ +export function firebaseConfig(): firebase.AppOptions | null { + + // The FIREBASE_PROJECT environment variable was introduced to help local emulation with `firebase-tools` 3.18 + // Unfortunately, API review decided that the name should be FIREBASE_CONFIG to avoid confusions that Firebase has + // a separate project from Google Cloud. This accepts both versions, preferring the documented name. + const env = process.env.FIREBASE_CONFIG || process.env.FIREBASE_PROJECT; + if (env) { + return JSON.parse(env); } - let merged = firebaseEnv; + // Could have Runtime Config with Firebase in it as an ENV value. try { - merged = _.merge({}, JSON.parse(process.env.CLOUD_RUNTIME_CONFIG), firebaseEnv); - } catch (e) { - try { - let path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; - merged = _.merge({}, require(path), firebaseEnv); - } catch (e) { - // Do nothing + const config = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG); + if (config.firebase) { + return config.firebase; } + } catch (e) { + // Do nothing } - if (!hasFirebase(merged)) { - throw new Error('Firebase config variables are not available. ' + - 'Please use the latest version of the Firebase CLI to deploy this function.'); + + // Could have Runtime Config with Firebase in it as an ENV location or default. + try { + const path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; + const config = require(path); + if (config.firebase) { + return config.firebase; + } + } catch (e) { + // Do nothing } - _.set(merged, 'firebase.credential', credential); - config.singleton = merged; + return null; } -function hasFirebase (merged: { [key: string]: any }): merged is config.Config { - return _.has(merged, 'firebase'); +function init() { + try { + const parsed = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG); + delete parsed.firebase; + config.singleton = parsed; + return; + } catch (e) { + // Do nothing + } + + try { + let path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; + const parsed = require(path); + delete parsed.firebase; + config.singleton = parsed; + return; + } catch (e) { + // Do nothing + } + + config.singleton = {}; } diff --git a/src/index.ts b/src/index.ts index 5cb5d8f7d..f5ebbb6d7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -29,8 +29,29 @@ import * as firestore from './providers/firestore'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; +import { firebaseConfig } from './config'; export { analytics, auth, crashlytics, database, firestore, https, pubsub, storage }; // Exported root types: export * from './config'; export * from './cloud-functions'; + +// TEMPORARY WORKAROUND (BUG 63586213): +// Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what +// we can deduce. +if (!process.env.FIREBASE_CONFIG) { + const cfg = firebaseConfig(); + if (cfg) { + process.env.FIREBASE_CONFIG = JSON.stringify(cfg); + + } else if (process.env.GCLOUD_PROJECT) { + console.warn('Warning, estimating Firebase Config based on GCLOUD_PROJECT. Intializing firebase-admin may fail'); + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, + storageBucket: `${process.env.GCLOUD_PROJECT}.appspot.com`, + projectId: process.env.GCLOUD_PROJECT, + }); + } else { + console.warn('Warning, FIREBASE_CONFIG environment variable is missing. Initializing firebase-admin will fail'); + } +} diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index eaec4b52f..834d2a4ab 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -20,11 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, Event } from '../cloud-functions'; +import { makeCloudFunction, CloudFunction, Event, EventContext } from '../cloud-functions'; import * as _ from 'lodash'; /** @internal */ -export const provider = 'google.firebase.analytics'; +export const provider = 'google.analytics'; +/** @internal */ +export const service = 'app-measurement.com'; /** * Registers a Cloud Function to handle analytics events. @@ -36,8 +38,12 @@ export const provider = 'google.firebase.analytics'; * interface. */ export function event(analyticsEventType: string) { - return new AnalyticsEventBuilder( - 'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType); + return new AnalyticsEventBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return 'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType; + }); } /** @@ -47,7 +53,7 @@ export function event(analyticsEventType: string) { */ export class AnalyticsEventBuilder { /** @internal */ - constructor(private resource: string) { } + constructor(private triggerResource: () => string) { } /** * Event handler that fires every time a Firebase Analytics event occurs. @@ -60,19 +66,17 @@ export class AnalyticsEventBuilder { * Cloud Function you can export. */ onLog( - handler: (event: Event) => PromiseLike | any - ): CloudFunction { - const dataConstructor = (raw: Event) => { - if (raw.data instanceof AnalyticsEvent) { - return raw.data; - } + handler: (event: AnalyticsEvent, context?: EventContext) => PromiseLike | any): CloudFunction { + const dataConstructor = (raw: Event) => { return new AnalyticsEvent(raw.data); }; return makeCloudFunction({ - provider, handler, + provider, eventType: 'event.log', - resource: this.resource, + service, + legacyEventType: `providers/google.firebase.analytics/eventTypes/event.log`, + triggerResource: this.triggerResource, dataConstructor, }); } diff --git a/src/providers/auth.ts b/src/providers/auth.ts index b95f103ec..4bfc631ea 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -20,38 +20,30 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, Event } from '../cloud-functions'; +import { makeCloudFunction, CloudFunction, EventContext, LegacyEvent } from '../cloud-functions'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; /** @internal */ -export const provider = 'firebase.auth'; +export const provider = 'google.firebase.auth'; +/** @internal */ +export const service = 'firebaseauth.googleapis.com'; /** Handle events in the Firebase Auth user lifecycle. */ export function user() { - return new UserBuilder('projects/' + process.env.GCLOUD_PROJECT); + return new UserBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return 'projects/' + process.env.GCLOUD_PROJECT; + }); } export class UserRecordMetadata implements firebase.auth.UserMetadata { constructor(public creationTime: string, public lastSignInTime: string) { }; - // Remove in v1.0.0 - /** @internal */ - get lastSignedInAt() { - console.warn('WARNING: "lastSignedInAt" will be removed in firebase-functions v1.0.0. ' + - 'Please start using "lastSignInTime", which is an ISO string.'); - return new Date(this.lastSignInTime); - } - - // Remove in v1.0.0 - /** @internal */ - get createdAt() { - console.warn('WARNING: "createdAt" will be removed in firebase-functions v1.0.0. ' + - 'Please start using "creationTime", which is an ISO string.'); - return new Date(this.creationTime); - } - + /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */ toJSON() { return { creationTime: this.creationTime, @@ -62,47 +54,35 @@ export class UserRecordMetadata implements firebase.auth.UserMetadata { /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */ export class UserBuilder { - private static dataConstructor(raw: any): firebase.auth.UserRecord { - // The UserRecord returned here is an interface. The firebase-admin/auth/user-record module - // also has a class of the same name, which is one implementation of the interface. - - // Transform payload to firebase-admin v5.0.0 format - let data = _.clone(raw.data); - if (data.metadata) { - let meta = data.metadata; - data.metadata = new UserRecordMetadata( - meta.createdAt || meta.creationTime, - meta.lastSignedInAt || meta.lastSignInTime, - ); - } - - return data; + private static dataConstructor(raw: LegacyEvent): firebase.auth.UserRecord { + return userRecordConstructor(raw.data); } /** @internal */ - constructor(private resource: string) { } + constructor(private triggerResource: () => string) { } /** Respond to the creation of a Firebase Auth user. */ - onCreate( - handler: (event: Event) => PromiseLike | any - ): CloudFunction { - return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: 'user.create', - dataConstructor: UserBuilder.dataConstructor, - }); + onCreate(handler: (user: UserRecord, context?: EventContext) => PromiseLike | any): CloudFunction { + return this.onOperation(handler, 'user.create'); } /** Respond to the deletion of a Firebase Auth user. */ - onDelete( - handler: (event: Event) => PromiseLike | any + onDelete(handler: (user: UserRecord, context?: EventContext) => PromiseLike | any): CloudFunction { + return this.onOperation(handler, 'user.delete'); + } + + private onOperation( + handler: (user: UserRecord, context?: EventContext) => PromiseLike | any, + eventType: string ): CloudFunction { return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: 'user.delete', + handler, + provider, + eventType, + service, + triggerResource: this.triggerResource, dataConstructor: UserBuilder.dataConstructor, + legacyEventType: `providers/firebase.auth/eventTypes/${eventType}`, }); } } @@ -112,3 +92,46 @@ export class UserBuilder { * SDK. */ export type UserRecord = firebase.auth.UserRecord; + +export function userRecordConstructor(wireData: Object): firebase.auth.UserRecord { + // Falsey values from the wire format proto get lost when converted to JSON, this adds them back. + let falseyValues = { + email: null, + emailVerified: false, + displayName: null, + photoURL: null, + phoneNumber: null, + disabled: false, + providerData: [], + customClaims: {}, + passwordSalt: null, + passwordHash: null, + tokensValidAfterTime: null, + }; + let record = _.assign({}, falseyValues, wireData); + + let meta = _.get(record, 'metadata'); + if (meta) { + _.set(record, 'metadata', new UserRecordMetadata( + // Transform payload to firebase-admin v5.0.0 format because wire format is different (BUG 63167395) + meta.createdAt || meta.creationTime, + meta.lastSignedInAt || meta.lastSignInTime, + )); + } else { + _.set(record, 'metadata', new UserRecordMetadata(null, null)); + } + _.forEach(record.providerData, entry => { + _.set(entry, 'toJSON', () => { + return entry; + }); + }); + _.set(record, 'toJSON', () => { + const json: any = _.pick(record, ['uid', 'email', 'emailVerified', 'displayName', + 'photoURL', 'phoneNumber', 'disabled', 'passwordHash', 'passwordSalt', 'tokensValidAfterTime']); + json.metadata = _.get(record, 'metadata').toJSON(); + json.customClaims = _.cloneDeep(record.customClaims); + json.providerData = _.map(record.providerData, entry => entry.toJSON()); + return json; + }); + return record as firebase.auth.UserRecord; +} diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index e06911bf7..31643af39 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -20,51 +20,62 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, Event } from '../cloud-functions'; +import { makeCloudFunction, CloudFunction, EventContext } from '../cloud-functions'; /** @internal */ -export const provider = 'firebase.crashlytics'; +export const provider = 'google.firebase.crashlytics'; +/** @internal */ +export const service = 'fabric.io'; /** * Handle events related to Crashlytics issues. An issue in Crashlytics is an * aggregation of crashes which have a shared root cause. */ export function issue() { - return new IssueBuilder('projects/' + process.env.GCLOUD_PROJECT); + return new IssueBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return 'projects/' + process.env.GCLOUD_PROJECT; + }); } /** Builder used to create Cloud Functions for Crashlytics issue events. */ export class IssueBuilder { /** @internal */ - constructor(private resource: string) { } + constructor(private triggerResource: () => string) { } + + /** @internal */ + onNewDetected(handler: any): Error { + throw new Error('"onNewDetected" is now deprecated, please use "onNew"'); + } /** Handle Crashlytics New Issue events. */ - onNewDetected(handler: (event: Event) => PromiseLike | any - ): CloudFunction { - return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: 'issue.new', - }); + onNew(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + return this.onEvent(handler, 'issue.new'); } /** Handle Crashlytics Regressed Issue events. */ - onRegressed(handler: (event: Event) => PromiseLike | any - ): CloudFunction { - return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: 'issue.regressed', - }); + onRegressed(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + return this.onEvent(handler, 'issue.regressed'); } /** Handle Crashlytics Velocity Alert events. */ - onVelocityAlert(handler: (event: Event) => PromiseLike | any + onVelocityAlert(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + return this.onEvent(handler, 'issue.velocityAlert'); + } + + private onEvent( + handler: (issue: Issue, context?: EventContext) => PromiseLike | any, + eventType: string ): CloudFunction { return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: 'issue.velocityAlert', + handler, + provider, + eventType, + service, + legacyEventType: `providers/firebase.crashlytics/eventTypes/${eventType}`, + triggerResource: this.triggerResource, }); } } @@ -72,7 +83,7 @@ export class IssueBuilder { /** * Interface representing a Crashlytics issue event that was logged for a specific issue. */ -export class Issue { +export interface Issue { /** Fabric Issue ID. */ issueId: string; @@ -92,7 +103,7 @@ export class Issue { velocityAlert?: VelocityAlert; } -export class VelocityAlert { +export interface VelocityAlert { /** The percentage of sessions which have been impacted by this issue. Example: .04 */ crashPercentage: number; diff --git a/src/providers/database.ts b/src/providers/database.ts index 11aef3207..9450c35e1 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -22,13 +22,15 @@ import * as _ from 'lodash'; import { apps } from '../apps'; -import { Event, CloudFunction, makeCloudFunction } from '../cloud-functions'; -import { normalizePath, applyChange, pathParts, valAt, joinPath } from '../utils'; +import { LegacyEvent, CloudFunction, makeCloudFunction, EventContext, Change } from '../cloud-functions'; +import { normalizePath, applyChange, pathParts, joinPath } from '../utils'; import * as firebase from 'firebase-admin'; -import { config } from '../index'; +import { firebaseConfig } from '../config'; /** @internal */ export const provider = 'google.firebase.database'; +/** @internal */ +export const service = 'firebaseio.com'; // NOTE(inlined): Should we relax this a bit to allow staging or alternate implementations of our API? const databaseURLRegex = new RegExp('https://([^.]+).firebaseio.com'); @@ -46,7 +48,7 @@ export class InstanceBuilder { ref(path: string): RefBuilder { const normalized = normalizePath(path); - return new RefBuilder(apps(), `projects/_/instances/${this.instance}/refs/${normalized}`); + return new RefBuilder(apps(), () => `projects/_/instances/${this.instance}/refs/${normalized}`); } } @@ -74,73 +76,117 @@ export class InstanceBuilder { * triggered the Cloud Function. */ export function ref(path: string): RefBuilder { - const normalized = normalizePath(path); - const databaseURL = config().firebase.databaseURL; - if (!databaseURL) { - throw new Error('Missing expected config value firebase.databaseURL, ' + - 'config is actually' + JSON.stringify(config())); - } - const match = databaseURL.match(databaseURLRegex); - if (!match) { - throw new Error('Invalid value for config firebase.databaseURL: ' + databaseURL); - } - const subdomain = match[1]; - let resource = `projects/_/instances/${subdomain}/refs/${normalized}`; - return new RefBuilder(apps(), resource); + const resourceGetter = () => { + const normalized = normalizePath(path); + const databaseURL = firebaseConfig().databaseURL; + if (!databaseURL) { + throw new Error('Missing expected firebase config value databaseURL, ' + + 'config is actually' + JSON.stringify(firebaseConfig()) + + '\n If you are unit testing, please set process.env.FIREBASE_CONFIG'); + } + const match = databaseURL.match(databaseURLRegex); + if (!match) { + throw new Error('Invalid value for config firebase.databaseURL: ' + databaseURL); + } + const subdomain = match[1]; + return `projects/_/instances/${subdomain}/refs/${normalized}`; + }; + + return new RefBuilder(apps(), resourceGetter); } /** Builder used to create Cloud Functions for Firebase Realtime Database References. */ export class RefBuilder { /** @internal */ - constructor(private apps: apps.Apps, private resource: string) { } + constructor(private apps: apps.Apps, private triggerResource: () => string) { } /** Respond to any write that affects a ref. */ - onWrite(handler: (event: Event) => PromiseLike | any): CloudFunction { - return this.onOperation(handler, 'ref.write'); - } - - /** Respond to new data on a ref. */ - onCreate(handler: (event: Event) => PromiseLike | any): CloudFunction { - return this.onOperation(handler, 'ref.create'); + onWrite(handler: ( + change: Change, + context?: EventContext) => PromiseLike | any, + ): CloudFunction> { + return this.onOperation(handler, 'ref.write', this.changeConstructor); } /** Respond to update on a ref. */ - onUpdate(handler: (event: Event) => PromiseLike | any): CloudFunction { - return this.onOperation(handler, 'ref.update'); + onUpdate(handler: ( + change: Change, + context?: EventContext) => PromiseLike | any, + ): CloudFunction> { + return this.onOperation(handler, 'ref.update', this.changeConstructor); } - /** Respond to all data being deleted from a ref. */ - onDelete(handler: (event: Event) => PromiseLike | any): CloudFunction { - return this.onOperation(handler, 'ref.delete'); + /** Respond to new data on a ref. */ + onCreate(handler: ( + snapshot: DataSnapshot, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + let dataConstructor = (raw: LegacyEvent) => { + let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); + return new DataSnapshot( + raw.data.delta, + path, + this.apps.admin, + dbInstance + ); + }; + return this.onOperation(handler, 'ref.create', dataConstructor); } - private onOperation( - handler: (event: Event) => PromiseLike | any, - eventType: string): CloudFunction { - - const dataConstructor = (raw: Event) => { - if (raw.data instanceof DeltaSnapshot) { - return raw.data; - } + /** Respond to all data being deleted from a ref. */ + onDelete(handler: ( + snapshot: DataSnapshot, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + let dataConstructor = (raw: LegacyEvent) => { let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); - return new DeltaSnapshot( - this.apps.forMode(raw.auth), - this.apps.admin, + return new DataSnapshot( raw.data.data, - raw.data.delta, path, + this.apps.admin, dbInstance ); }; + return this.onOperation(handler, 'ref.delete', dataConstructor); + } + + private onOperation( + handler: (data: T, context?: EventContext) => PromiseLike | any, + eventType: string, + dataConstructor): CloudFunction { + return makeCloudFunction({ - provider, handler, - eventType: eventType, - resource: this.resource, - dataConstructor, - before: (event) => this.apps.retain(event), - after: (event) => this.apps.release(event), + handler, + provider, + service, + eventType, + legacyEventType: `providers/${provider}/eventTypes/${eventType}`, + triggerResource: this.triggerResource, + dataConstructor: dataConstructor, + before: (event) => this.apps.retain(), + after: (event) => this.apps.release(), }); } + + private changeConstructor = (raw: LegacyEvent): Change => { + let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); + let before = new DataSnapshot( + raw.data.data, + path, + this.apps.admin, + dbInstance + ); + let after = new DataSnapshot( + applyChange(raw.data.data, raw.data.delta), + path, + this.apps.admin, + dbInstance + ); + return { + before: before, + after: after, + }; + }; } /* Utility function to extract database reference from resource string */ @@ -160,47 +206,43 @@ export function resourceToInstanceAndPath(resource) { return [dbInstance, path]; } -export class DeltaSnapshot { - private _adminRef: firebase.database.Reference; +export class DataSnapshot { + public instance: string; private _ref: firebase.database.Reference; private _path: string; private _data: any; - private _delta: any; - private _newData: any; - private _childPath: string; - private _isPrevious: boolean; constructor( - private app: firebase.app.App, - private adminApp: firebase.app.App, data: any, - delta: any, path?: string, // path will be undefined for the database root - public instance?: string, + private app?: firebase.app.App, + instance?: string, ) { - if (delta !== undefined) { - this._path = path; - this._data = data; - this._delta = delta; - this._newData = applyChange(this._data, this._delta); + if (instance) { // SDK always supplies instance, but user's unit tests may not + this.instance = instance; + } else if (app) { + this.instance = app.options.databaseURL; + } else if (process.env.GCLOUD_PROJECT) { + this.instance = 'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com'; } + + this._path = path; + this._data = data; } + /** Ref returns a reference to the database with full admin access. */ get ref(): firebase.database.Reference { + if (!this.app) { // may be unpopulated in user's unit tests + throw new Error('Please supply a Firebase app in the constructor for DataSnapshot' + + ' in order to use the .ref method.'); + } if (!this._ref) { this._ref = this.app.database(this.instance).ref(this._fullPath()); } return this._ref; } - get adminRef(): firebase.database.Reference { - if (!this._adminRef) { - this._adminRef = this.adminApp.database(this.instance).ref(this._fullPath()); - } - return this._adminRef; - } - get key(): string { let last = _.last(pathParts(this._fullPath())); return (!last || last === '') ? null : last; @@ -208,7 +250,7 @@ export class DeltaSnapshot { val(): any { let parts = pathParts(this._childPath); - let source = this._isPrevious ? this._data : this._newData; + let source = this._data; let node = _.cloneDeep(parts.length ? _.get(source, parts, null) : source); return this._checkAndConvertToArray(node); } @@ -225,26 +267,14 @@ export class DeltaSnapshot { return !_.isNull(this.val()); } - child(childPath: string): DeltaSnapshot { + child(childPath: string): DataSnapshot { if (!childPath) { return this; } - return this._dup(this._isPrevious, childPath); + return this._dup(childPath); } - get previous(): DeltaSnapshot { - return this._isPrevious ? this : this._dup(true); - } - - get current(): DeltaSnapshot { - return this._isPrevious ? this._dup(false) : this; - } - - changed(): boolean { - return valAt(this._delta, this._childPath) !== undefined; - } - - forEach(action: (a: DeltaSnapshot) => boolean): boolean { + forEach(action: (a: DataSnapshot) => boolean): boolean { let val = this.val(); if (_.isPlainObject(val)) { return _.some(val, (value, key: string) => action(this.child(key)) === true); @@ -311,14 +341,9 @@ export class DeltaSnapshot { return obj; } - private _dup(previous: boolean, childPath?: string): DeltaSnapshot { - let dup = new DeltaSnapshot(this.app, this.adminApp, undefined, undefined, undefined, this.instance); - [dup._path, dup._data, dup._delta, dup._childPath, dup._newData] = - [this._path, this._data, this._delta, this._childPath, this._newData]; - - if (previous) { - dup._isPrevious = true; - } + private _dup(childPath?: string): DataSnapshot { + let dup = new DataSnapshot(this._data, undefined, this.app, this.instance); + [dup._path, dup._childPath] = [this._path, this._childPath]; if (childPath) { dup._childPath = joinPath(dup._childPath, childPath); diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index e534c0b4a..640b250b8 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -24,23 +24,28 @@ import { posix } from 'path'; import * as _ from 'lodash'; import * as firebase from 'firebase-admin'; import { apps } from '../apps'; -import { makeCloudFunction, CloudFunction, Event } from '../cloud-functions'; +import { makeCloudFunction, CloudFunction, LegacyEvent, Change, + EventContext } from '../cloud-functions'; import { dateToTimestampProto } from '../encoder'; /** @internal */ -export const provider = 'cloud.firestore'; +export const provider = 'google.firestore'; +/** @internal */ +export const service = 'firestore.googleapis.com'; +export type DocumentSnapshot = firebase.firestore.DocumentSnapshot; /** @internal */ export const defaultDatabase = '(default)'; let firestoreInstance; +/** @internal */ +// Multiple databases are not yet supported by Firestore. export function database(database: string = defaultDatabase) { - if (!process.env.GCLOUD_PROJECT) { - throw new Error('Environment variable GCLOUD_PROJECT is not set.'); - } - return new DatabaseBuilder(posix.join('projects', process.env.GCLOUD_PROJECT, 'databases', database)); + return new DatabaseBuilder(database); } +/** @internal */ +// Multiple databases are not yet supported by Firestore. export function namespace(namespace: string) { return database().namespace(namespace); } @@ -51,116 +56,127 @@ export function document(path: string) { export class DatabaseBuilder { /** @internal */ - constructor(private resource: string) { } + constructor(private database: string) { } namespace(namespace: string) { - return new NamespaceBuilder(`${posix.join(this.resource, 'documents')}@${namespace}`); + return new NamespaceBuilder(this.database, namespace); } document(path: string) { - return (new NamespaceBuilder(posix.join(this.resource, 'documents'))).document(path); + return new NamespaceBuilder(this.database).document(path); } } export class NamespaceBuilder { /** @internal */ - constructor(private resource: string) { } + constructor(private database: string, private namespace?: string) { } document(path: string) { - return new DocumentBuilder(posix.join(this.resource, path)); + return new DocumentBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + let database = posix.join('projects', process.env.GCLOUD_PROJECT, 'databases', this.database); + return posix.join( + database, + this.namespace ? `documents@${this.namespace}` : 'documents', + path); + }); } } -export interface DeltaDocumentSnapshot { - exists: Boolean; - ref: firebase.firestore.DocumentReference; - id: string; - createTime?: string; - updateTime?: string; - readTime?: string; - previous: DeltaDocumentSnapshot; - data: () => any; - get: (key: string) => any; -}; - -function isDeltaDocumentSnapshot(data: any): data is DeltaDocumentSnapshot { - return 'exists' in data; -}; - -function getValueProto(event, valueFieldName) { - let data = event.data; +function _getValueProto(data: any, resource: string, valueFieldName: string) { if (_.isEmpty(_.get(data, valueFieldName))) { // Firestore#snapshot_ takes resource string instead of proto for a non-existent snapshot - return event.resource; + return resource; } let proto = { fields: _.get(data, [valueFieldName, 'fields'], {}), createTime: dateToTimestampProto(_.get(data, [valueFieldName, 'createTime'])), updateTime: dateToTimestampProto(_.get(data, [valueFieldName, 'updateTime'])), - name: _.get(data, [valueFieldName, 'name'], event.resource), + name: _.get(data, [valueFieldName, 'name'], resource), }; return proto; }; /** @internal */ -export function dataConstructor(raw: Event) { - if (isDeltaDocumentSnapshot(raw.data)) { - return raw.data; - } +export function snapshotConstructor(event: LegacyEvent): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); } - let valueProto = getValueProto(raw, 'value'); - let readTime = dateToTimestampProto(_.get(raw.data, 'value.readTime')); - let snapshot = firestoreInstance.snapshot_(valueProto, readTime, 'json') as DeltaDocumentSnapshot; - Object.defineProperty(snapshot, 'previous', { - get: () => { - let oldValueProto = getValueProto(raw, 'oldValue'); - let oldReadTime = dateToTimestampProto(_.get(raw.data, 'oldValue.readTime')); - return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json') as DeltaDocumentSnapshot; - }, - }); - return snapshot; + let valueProto = _getValueProto(event.data, event.resource, 'value'); + let readTime = dateToTimestampProto(_.get(event, 'data.value.readTime')); + return firestoreInstance.snapshot_(valueProto, readTime, 'json'); }; +/** @internal */ +// TODO remove this function when wire format changes to new format +export function beforeSnapshotConstructor(event: LegacyEvent): DocumentSnapshot { + if (!firestoreInstance) { + firestoreInstance = firebase.firestore(apps().admin); + } + let oldValueProto = _getValueProto(event.data, event.resource, 'oldValue'); + let oldReadTime = dateToTimestampProto(_.get(event, 'data.oldValue.readTime')); + return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json'); +} + +function changeConstructor(raw: LegacyEvent) { + return Change.fromObjects( + beforeSnapshotConstructor(raw), + snapshotConstructor(raw) + ); +} + export class DocumentBuilder { /** @internal */ - constructor(private resource: string) { + constructor(private triggerResource: () => string) { // TODO what validation do we want to do here? } /** Respond to all document writes (creates, updates, or deletes). */ - onWrite(handler: (event: Event) => PromiseLike | - any): CloudFunction { - return this.onOperation(handler, 'document.write'); - } + onWrite(handler: ( + change: Change, + context?: EventContext) => PromiseLike | any, + ): CloudFunction> { + return this.onOperation(handler, 'document.write', changeConstructor); + }; - /** Respond only to document creations. */ - onCreate(handler: (event: Event) => PromiseLike | - any): CloudFunction { - return this.onOperation(handler, 'document.create'); + /** Respond only to document updates. */ + onUpdate(handler: ( + change: Change, + context?: EventContext) => PromiseLike | any, + ): CloudFunction> { + return this.onOperation(handler, 'document.update', changeConstructor); } - /** Respond only to document updates. */ - onUpdate(handler: (event: Event) => PromiseLike | - any): CloudFunction { - return this.onOperation(handler, 'document.update'); + /** Respond only to document creations. */ + onCreate(handler: ( + snapshot: DocumentSnapshot, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'document.create', snapshotConstructor); } /** Respond only to document deletions. */ - onDelete(handler: (event: Event) => PromiseLike | - any): CloudFunction { - return this.onOperation(handler, 'document.delete'); + onDelete(handler: ( + snapshot: DocumentSnapshot, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'document.delete', beforeSnapshotConstructor); } - private onOperation( - handler: (event: Event) => PromiseLike | any, - eventType: string): CloudFunction { - return makeCloudFunction({ - provider, handler, - resource: this.resource, - eventType: eventType, - dataConstructor, - }); + private onOperation( + handler: (data: T, context?: EventContext) => PromiseLike | any, + eventType: string, + dataConstructor): CloudFunction { + return makeCloudFunction({ + handler, + provider, + eventType, + service, + triggerResource: this.triggerResource, + legacyEventType: `providers/cloud.firestore/eventTypes/${eventType}`, + dataConstructor, + }); } } diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index efcc85517..c11e816e1 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -20,10 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import {Event, CloudFunction, makeCloudFunction} from '../cloud-functions'; +import { CloudFunction, makeCloudFunction, EventContext } from '../cloud-functions'; /** @internal */ -export const provider = 'cloud.pubsub'; +export const provider = 'google.pubsub'; +/** @internal */ +export const service = 'pubsub.googleapis.com'; /** Handle events on a Cloud Pub/Sub topic. */ export function topic(topic: string): TopicBuilder { @@ -31,22 +33,29 @@ export function topic(topic: string): TopicBuilder { throw new Error('Topic name may not have a /'); } - return new TopicBuilder(`projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`); + return new TopicBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`; + }); } /** Builder used to create Cloud Functions for Google Pub/Sub topics. */ export class TopicBuilder { /** @internal */ - constructor(private resource: string) { } + constructor(private triggerResource: () => string) { } /** Handle a Pub/Sub message that was published to a Cloud Pub/Sub topic */ - onPublish(handler: (event: Event) => PromiseLike | any): CloudFunction { + onPublish(handler: (message: Message, context?: EventContext) => PromiseLike | any): CloudFunction { return makeCloudFunction({ - provider, handler, - resource: this.resource, + handler, + provider, + service, + triggerResource: this.triggerResource, eventType: 'topic.publish', - dataConstructor: (raw) => raw.data instanceof Message ? raw.data : new Message(raw.data), + dataConstructor: (raw) => new Message(raw.data), }); } } diff --git a/src/providers/storage.ts b/src/providers/storage.ts index 60cbbeef5..f806889b1 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -20,66 +20,118 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { Event, CloudFunction, makeCloudFunction } from '../cloud-functions'; -import { config } from '../index'; +import { CloudFunction, EventContext, makeCloudFunction } from '../cloud-functions'; +import { firebaseConfig } from '../config'; /** @internal */ -export const provider = 'cloud.storage'; +export const provider = 'google.storage'; +/** @internal */ +export const service = 'storage.googleapis.com'; /** * The optional bucket function allows you to choose which buckets' events to handle. * This step can be bypassed by calling object() directly, which will use the bucket that * the Firebase SDK for Cloud Storage uses. */ -export function bucket(bucket: string): BucketBuilder { - if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) { - throw new Error('Invalid bucket name ${bucket}'); - } - return new BucketBuilder(`projects/_/buckets/${bucket}`); +export function bucket(bucket?: string): BucketBuilder { + const resourceGetter = () => { + bucket = bucket || firebaseConfig().storageBucket; + if (!bucket) { + throw new Error('Missing bucket name. If you are unit testing, please provide a bucket name' + + ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.'); + } + if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) { + throw new Error('Invalid bucket name ${bucket}'); + } + return `projects/_/buckets/${bucket}`; + }; + return new BucketBuilder(resourceGetter); } export function object(): ObjectBuilder { - return bucket(config().firebase.storageBucket).object(); + return bucket().object(); } export class BucketBuilder { /** @internal */ - constructor(private resource) { } + constructor(private triggerResource: () => string) { } /** Handle events for objects in this bucket. */ object() { - return new ObjectBuilder(this.resource); + return new ObjectBuilder(this.triggerResource); } } export class ObjectBuilder { /** @internal */ - constructor(private resource) { } + constructor(private triggerResource: () => string) { } - /** - * Handle any change to any object. - */ - onChange(handler: (event: Event) => PromiseLike | any): CloudFunction { - return makeCloudFunction( - { provider, handler: handler, resource: this.resource, eventType: 'object.change' }); + /** @internal */ + onChange(handler: any): Error { + throw new Error('"onChange" is now deprecated, please use "onArchive", "onDelete", ' + + '"onFinalize", or "onMetadataUpdate".'); + } + + /** Respond to archiving of an object, this is only for buckets that enabled object versioning. */ + onArchive(handler: ( + object: ObjectMetadata, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'object.archive'); + } + + /** Respond to the deletion of an object (not to archiving, if object versioning is enabled). */ + onDelete(handler: ( + object: ObjectMetadata, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'object.delete'); + } + + /** Respond to the successful creation of an object. */ + onFinalize(handler: ( + object: ObjectMetadata, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'object.finalize'); + } + + /** Respond to metadata updates of existing objects. */ + onMetadataUpdate(handler: ( + object: ObjectMetadata, + context?: EventContext) => PromiseLike | any, + ): CloudFunction { + return this.onOperation(handler, 'object.metadataUpdate'); + } + + private onOperation( + handler: (object: ObjectMetadata, context?: EventContext) => PromiseLike | any, + eventType: string): CloudFunction { + return makeCloudFunction({ + handler, + provider, + service, + eventType, + triggerResource: this.triggerResource, + }); } } export interface ObjectMetadata { kind: string; id: string; - resourceState: string; + bucket: string; + storageClass: string; + size: string; + timeCreated: string; + updated: string; selfLink?: string; name?: string; - bucket: string; - generation?: number; - metageneration?: number; + generation?: string; contentType?: string; - timeCreated?: string; - updated?: string; + metageneration?: string; timeDeleted?: string; - storageClass?: string; - size?: number; + timeStorageClassUpdated?: string; md5Hash?: string; mediaLink?: string; contentEncoding?: string; @@ -89,8 +141,33 @@ export interface ObjectMetadata { metadata?: { [key: string]: string; }; + acl?: [ + { + kind?: string, + id?: string, + selfLink?: string, + bucket?: string, + object?: string, + generation?: string, + entity?: string, + role?: string, + email?: string, + entityId?: string, + domain?: string, + projectTeam?: { + projectNumber?: string, + team?: string + }, + etag?: string + } + ]; + owner?: { + entity?: string, + entityId?: string + }; crc32c?: string; - componentCount?: number; + componentCount?: string; + etag?: string; customerEncryption?: { encryptionAlgorithm?: string, keySha256?: string, diff --git a/tsconfig.json b/tsconfig.json index 7be92e55a..04fc40239 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "lib": ["es6", "es2015.promise"], + "lib": ["es6"], "module": "commonjs", "noImplicitAny": false, "outDir": ".tmp", diff --git a/tsconfig.release.json b/tsconfig.release.json index 1e8b54f29..b114d4697 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -1,7 +1,7 @@ { "compilerOptions": { "declaration": true, - "lib": ["es6", "es2015.promise"], + "lib": ["es6"], "module": "commonjs", "noImplicitAny": false, "outDir": "lib", diff --git a/upgrade-warning b/upgrade-warning new file mode 100644 index 000000000..9f2ecc220 --- /dev/null +++ b/upgrade-warning @@ -0,0 +1,15 @@ +#!/usr/bin/env node + +'use strict'; + +const message = ` +======== WARNING! ======== + +This upgrade of firebase-functions contains breaking changes if you are upgrading from a version below v1.0.0. + +To see a complete list of these breaking changes, please go to: + +https://firebase.google.com/docs/functions/beta-v1-diff +`; + +console.log(message); From 76bee818059962facaa503d2de50dd5d2b72d2de Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 3 Apr 2018 08:30:59 -0700 Subject: [PATCH 008/705] Changelog for v1.0.0 (#201) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..8848e31de 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +breaking - v1 release of `firebase-functions` contains several breaking changes. Please see migration guide at https://firebase.google.com/docs/functions/beta-v1-diff. From 5d3ce09d677530ccc9c0a718ee6bba222389bad0 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 3 Apr 2018 08:44:02 -0700 Subject: [PATCH 009/705] Revise changelog --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 8848e31de..27acd926d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1 @@ -breaking - v1 release of `firebase-functions` contains several breaking changes. Please see migration guide at https://firebase.google.com/docs/functions/beta-v1-diff. +important - v1 release of `firebase-functions` contains several breaking changes. Please see migration guide at https://firebase.google.com/docs/functions/beta-v1-diff. From 4263cd50180aa9a808bf1ac6790dccd3bf1d2d26 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 3 Apr 2018 15:45:36 +0000 Subject: [PATCH 010/705] [firebase-release] Updated SDK for Cloud Functions to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff884b2a7..f22b1dbf6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "0.9.1", + "version": "1.0.0", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 0a0aea9fca234b12e182f4971fc6e4621bc4bff2 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 3 Apr 2018 15:45:45 +0000 Subject: [PATCH 011/705] [firebase-release] Removed change log and reset repo after 1.0.0 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 27acd926d..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -important - v1 release of `firebase-functions` contains several breaking changes. Please see migration guide at https://firebase.google.com/docs/functions/beta-v1-diff. From 92889e561af9287f787aeb71a194f16b52b93a7c Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 6 Apr 2018 10:47:42 -0700 Subject: [PATCH 012/705] Update firebase-admin to v5.12.0 (#219) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f22b1dbf6..2f5468790 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/sinon": "^1.16.29", "chai": "^3.5.0", "chai-as-promised": "^5.2.0", - "firebase-admin": "~5.10.0", + "firebase-admin": "~5.12.0", "istanbul": "^0.4.2", "mocha": "^2.4.5", "mock-require": "^2.0.1", @@ -49,7 +49,7 @@ "typescript": "^2.0.3" }, "peerDependencies": { - "firebase-admin": "~5.11.0" + "firebase-admin": "~5.12.0" }, "dependencies": { "@types/cors": "^2.8.1", From 5dd8aac224674a2bf1309e02576bfcaf942d2327 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 6 Apr 2018 11:29:45 -0700 Subject: [PATCH 013/705] Changelog for v1.0.1 (#221) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..d2c998da6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +changed - Update firebase-admin peer dependency to v5.12.0 From bc7f7aa1f621bbf76376bd477e30d04d8e8548ec Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Fri, 6 Apr 2018 18:31:25 +0000 Subject: [PATCH 014/705] [firebase-release] Updated SDK for Cloud Functions to 1.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f5468790..40a7e54e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.0", + "version": "1.0.1", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From d26ec60274ba3c46b6b26a84cbc366e3b448ff5b Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Fri, 6 Apr 2018 18:31:34 +0000 Subject: [PATCH 015/705] [firebase-release] Removed change log and reset repo after 1.0.1 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index d2c998da6..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -changed - Update firebase-admin peer dependency to v5.12.0 From bcb006f0965338fa5a6d9fb34389515727196ca6 Mon Sep 17 00:00:00 2001 From: Daniela Yassuda Date: Tue, 10 Apr 2018 00:51:08 +0200 Subject: [PATCH 016/705] Disallow implicit any typings (noImplicitAny: true) (#215) --- spec/apps.spec.ts | 2 +- spec/cloud-functions.spec.ts | 11 ++++++----- spec/providers/auth.spec.ts | 17 +++++++++-------- spec/providers/database.spec.ts | 14 +++++++------- spec/providers/firestore.spec.ts | 4 ++-- spec/providers/https.spec.ts | 4 ++-- spec/providers/storage.spec.ts | 8 ++++---- spec/utils.spec.ts | 2 +- src/apps.ts | 4 ++-- src/cloud-functions.ts | 8 ++++---- src/encoder.ts | 2 +- src/providers/analytics.ts | 4 ++-- src/providers/auth.ts | 2 +- src/providers/database.ts | 12 ++++++------ src/providers/firestore.ts | 6 +++--- src/providers/https.ts | 4 ++-- src/utils.ts | 2 +- tsconfig.json | 2 +- 18 files changed, 55 insertions(+), 53 deletions(-) diff --git a/spec/apps.spec.ts b/spec/apps.spec.ts index 6b3d3e822..20c654cd0 100644 --- a/spec/apps.spec.ts +++ b/spec/apps.spec.ts @@ -42,7 +42,7 @@ describe('apps', () => { }); describe('retain/release', () => { - let clock; + let clock: sinon.SinonFakeTimers; beforeEach(() => { clock = sinon.useFakeTimers(); diff --git a/spec/cloud-functions.spec.ts b/spec/cloud-functions.spec.ts index 9f0e9a30b..7566ea494 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/cloud-functions.spec.ts @@ -22,7 +22,8 @@ import * as _ from 'lodash'; import { expect } from 'chai'; -import { Event, LegacyEvent, makeCloudFunction, MakeCloudFunctionArgs, Change } from '../src/cloud-functions'; +import { Event, EventContext, LegacyEvent, + makeCloudFunction, MakeCloudFunctionArgs, Change } from '../src/cloud-functions'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { @@ -45,7 +46,7 @@ describe('makeCloudFunction', () => { }); it('should construct the right context for legacy event format', () => { - let args: any = _.assign({}, cloudFunctionArgs, {handler: (data, context) => context}); + let args: any = _.assign({}, cloudFunctionArgs, {handler: (data: any, context: EventContext) => context}); let cf = makeCloudFunction(args); let test: LegacyEvent = { eventId: '00000', @@ -68,7 +69,7 @@ describe('makeCloudFunction', () => { }); it('should construct the right context for new event format', () => { - let args: any = _.assign({}, cloudFunctionArgs, { handler: (data, context) => context }); + let args: any = _.assign({}, cloudFunctionArgs, { handler: (data: any, context: EventContext) => context }); let cf = makeCloudFunction(args); let test: Event = { context: { @@ -277,9 +278,9 @@ describe('Change', () => { }); it('should apply the customizer function to `before` and `after`', () => { - function customizer(input) { + function customizer(input: any) { _.set(input, 'another', 'value'); - return input; + return input as T; } let created = Change.fromJSON( { diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index 5ab40bd5a..989f4cf22 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -23,6 +23,7 @@ import * as auth from '../../src/providers/auth'; import { expect } from 'chai'; import * as firebase from 'firebase-admin'; +import { CloudFunction } from '../../src'; describe('Auth Functions', () => { describe('AuthBuilder', () => { @@ -63,9 +64,9 @@ describe('Auth Functions', () => { }); describe('#_dataConstructor', () => { - let cloudFunctionCreate; - let cloudFunctionDelete; - let event; + let cloudFunctionCreate: CloudFunction; + let cloudFunctionDelete: CloudFunction; + let event: any; before(() => { cloudFunctionCreate = auth.user().onCreate((data: firebase.auth.UserRecord) => data); @@ -82,11 +83,11 @@ describe('Auth Functions', () => { it('should transform wire format for UserRecord into v5.0.0 format', () => { return Promise.all([ - cloudFunctionCreate(event).then(data => { + cloudFunctionCreate(event).then((data: any) => { expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); }), - cloudFunctionDelete(event).then(data => { + cloudFunctionDelete(event).then((data: any) => { expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); }), @@ -104,11 +105,11 @@ describe('Auth Functions', () => { }; return Promise.all([ - cloudFunctionCreate(newEvent).then(data => { + cloudFunctionCreate(newEvent).then((data: any) => { expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); }), - cloudFunctionDelete(newEvent).then(data => { + cloudFunctionDelete(newEvent).then((data: any) => { expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); }), @@ -141,7 +142,7 @@ describe('Auth Functions', () => { }); it('will not interfere with fields that are in raw wire data', () => { - const raw = { + const raw: any = { uid: '123', email: 'email@gmail.com', emailVerified: true, diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index bebdac29a..d0cc20f9e 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -200,7 +200,7 @@ describe('Database Functions', () => { }); describe('DataSnapshot', () => { - let subject; + let subject: any; const apps = new appsNamespace.Apps(); let populate = (data: any) => { @@ -300,7 +300,7 @@ describe('Database Functions', () => { it('should iterate through child snapshots', () => { populate({ a: 'b', c: 'd' }); let out = ''; - subject.forEach(snap => { + subject.forEach((snap: any) => { out += snap.val(); }); expect(out).to.equal('bd'); @@ -309,7 +309,7 @@ describe('Database Functions', () => { it('should have correct key values for child snapshots', () => { populate({ a: 'b', c: 'd' }); let out = ''; - subject.forEach(snap => { + subject.forEach((snap: any) => { out += snap.key; }); expect(out).to.equal('ac'); @@ -318,7 +318,7 @@ describe('Database Functions', () => { it('should not execute for leaf or null nodes', () => { populate(23); let count = 0; - let counter = snap => count++; + let counter = (snap: any) => count++; expect(subject.forEach(counter)).to.equal(false); expect(count).to.eq(0); @@ -327,7 +327,7 @@ describe('Database Functions', () => { it('should cancel further enumeration if callback returns true', () => { populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); let out = ''; - const ret = subject.forEach(snap => { + const ret = subject.forEach((snap: any) => { if (snap.val() === 'f') { return true; } @@ -340,7 +340,7 @@ describe('Database Functions', () => { it('should not cancel further enumeration if callback returns a truthy value', () => { populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); let out = ''; - const ret = subject.forEach(snap => { + const ret = subject.forEach((snap: any) => { out += snap.val(); return 1; }); @@ -351,7 +351,7 @@ describe('Database Functions', () => { it('should not cancel further enumeration if callback does not return', () => { populate({ a: 'b', c: 'd', e: 'f', g: 'h' }); let out = ''; - const ret = subject.forEach(snap => { + const ret = subject.forEach((snap: any) => { out += snap.val(); }); expect(out).to.equal('bdfh'); diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 86ed024bb..a8a44c1fa 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -24,7 +24,7 @@ import * as firestore from '../../src/providers/firestore'; import { expect } from 'chai'; describe('Firestore Functions', () => { - let constructValue = (fields) => { + let constructValue = (fields: any) => { return { 'fields': fields, 'name': 'projects/pid/databases/(default)/documents/collection/123', @@ -349,7 +349,7 @@ describe('Firestore Functions', () => { }); describe('Other DocumentSnapshot methods', () => { - let snapshot; + let snapshot: FirebaseFirestore.DocumentSnapshot; before(() => { snapshot = firestore.snapshotConstructor({ diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index d75cfb60c..c8c7bd239 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -87,7 +87,7 @@ function runHandler(handler: express.Handler, request: express.Request): Promise } // Headers are only set by the cors handler. - public setHeader(name, value: string) { + public setHeader(name: string, value: string) { this.headers[name] = value; } @@ -201,7 +201,7 @@ export function generateIdToken(projectId: string): string { } describe('callable.FunctionBuilder', () => { - let app; + let app: firebase.app.App; before(() => { let credential = { diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index 182789e1b..c6946082f 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -85,7 +85,7 @@ describe('Storage Functions', () => { + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; - return cloudFunction(goodMediaLinkEvent).then(result => { + return cloudFunction(goodMediaLinkEvent).then((result: any) => { expect(result).equals(goodMediaLinkEvent.data.mediaLink); }); }); @@ -141,7 +141,7 @@ describe('Storage Functions', () => { + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; - return cloudFunction(goodMediaLinkEvent).then(result => { + return cloudFunction(goodMediaLinkEvent).then((result: any) => { expect(result).equals(goodMediaLinkEvent.data.mediaLink); }); }); @@ -197,7 +197,7 @@ describe('Storage Functions', () => { + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; - return cloudFunction(goodMediaLinkEvent).then(result => { + return cloudFunction(goodMediaLinkEvent).then((result: any) => { expect(result).equals(goodMediaLinkEvent.data.mediaLink); }); }); @@ -253,7 +253,7 @@ describe('Storage Functions', () => { + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; - return cloudFunction(goodMediaLinkEvent).then(result => { + return cloudFunction(goodMediaLinkEvent).then((result: any) => { expect(result).equals(goodMediaLinkEvent.data.mediaLink); }); }); diff --git a/spec/utils.spec.ts b/spec/utils.spec.ts index cd195a28f..1a2ad54c1 100644 --- a/spec/utils.spec.ts +++ b/spec/utils.spec.ts @@ -72,7 +72,7 @@ describe ('utils', () => { it('should return the merged value of two objects', () => { let from = {a: {b: 'foo', c: 23, d: 444}, d: {e: 42}}; - let to = {a: {b: 'bar', c: null}, d: null, e: {f: 'g'}}; + let to: any = {a: {b: 'bar', c: null}, d: null, e: {f: 'g'}}; let result = {a: {b: 'bar', d: 444}, e: {f: 'g'}}; expect(applyChange(from, to)).to.deep.equal(result); }); diff --git a/src/apps.ts b/src/apps.ts index ac3a41b94..37d7febbc 100644 --- a/src/apps.ts +++ b/src/apps.ts @@ -83,7 +83,7 @@ export namespace apps { } retain() { - let increment = n => { + let increment = (n?: number) => { return (n || 0) + 1; }; // Increment counter for admin because function might use event.data.ref @@ -91,7 +91,7 @@ export namespace apps { } release() { - let decrement = n => { + let decrement = (n: number) => { return n - 1; }; return delay(garbageCollectionInterval).then(() => { diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 739f7d6b6..cc5305055 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -117,7 +117,7 @@ export namespace Change { /** Factory method for creating a Change from a JSON and an optional customizer function to be * applied to both the `before` and the `after` fields. */ - export function fromJSON(json: ChangeJson, customizer: (any) => T = reinterpretCast): Change { + export function fromJSON(json: ChangeJson, customizer: (x: any) => T = reinterpretCast): Change { let before = _.assign({}, json.before); if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); @@ -126,7 +126,7 @@ export namespace Change { } /** @internal */ - export function applyFieldMask(sparseBefore, after, fieldMask) { + export function applyFieldMask(sparseBefore: any, after: any, fieldMask: string) { let before = _.assign({}, after); let masks = fieldMask.split(','); _.forEach(masks, mask => { @@ -216,7 +216,7 @@ export function makeCloudFunction({ before(event); let dataOrChange = dataConstructor(event); - let context; + let context: any; if (isEvent(event)) { // new event format context = _.cloneDeep(event.context); } else { // legacy event format @@ -276,7 +276,7 @@ function _makeParams(context: EventContext, triggerResourceGetter: () => string) } let triggerResource = triggerResourceGetter(); let wildcards = triggerResource.match(WILDCARD_REGEX); - let params = {}; + let params: { [option: string]: any } = {}; if (wildcards) { let triggerResourceParts = _.split(triggerResource, '/'); let eventResourceParts = _.split(context.resource.name, '/'); diff --git a/src/encoder.ts b/src/encoder.ts index 59d3cb223..dfa010a0b 100644 --- a/src/encoder.ts +++ b/src/encoder.ts @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -export function dateToTimestampProto(timeString) { +export function dateToTimestampProto(timeString?: string) { if (typeof timeString === 'undefined') { return; } diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 834d2a4ab..77e5b693d 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -346,13 +346,13 @@ export class ExportBundleInfo { } function copyFieldTo( - from: any, to: T, fromField: string, toField: K, transform: (any) => T[K] = _.identity): void { + from: any, to: T, fromField: string, toField: K, transform: (val: any) => T[K] = _.identity): void { if (from[fromField] !== undefined) { to[toField] = transform(from[fromField]); } } -function copyField(from: any, to: T, field: K, transform: (any) => T[K] = _.identity): void { +function copyField(from: any, to: T, field: K, transform: (val: any) => T[K] = _.identity): void { copyFieldTo(from, to, field, field, transform); } diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 4bfc631ea..c8b95c432 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -95,7 +95,7 @@ export type UserRecord = firebase.auth.UserRecord; export function userRecordConstructor(wireData: Object): firebase.auth.UserRecord { // Falsey values from the wire format proto get lost when converted to JSON, this adds them back. - let falseyValues = { + let falseyValues: any = { email: null, emailVerified: false, displayName: null, diff --git a/src/providers/database.ts b/src/providers/database.ts index 9450c35e1..db42e9a9a 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -22,7 +22,7 @@ import * as _ from 'lodash'; import { apps } from '../apps'; -import { LegacyEvent, CloudFunction, makeCloudFunction, EventContext, Change } from '../cloud-functions'; +import { LegacyEvent, CloudFunction, makeCloudFunction, Event, EventContext, Change } from '../cloud-functions'; import { normalizePath, applyChange, pathParts, joinPath } from '../utils'; import * as firebase from 'firebase-admin'; import { firebaseConfig } from '../config'; @@ -153,7 +153,7 @@ export class RefBuilder { private onOperation( handler: (data: T, context?: EventContext) => PromiseLike | any, eventType: string, - dataConstructor): CloudFunction { + dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { return makeCloudFunction({ handler, @@ -191,7 +191,7 @@ export class RefBuilder { /* Utility function to extract database reference from resource string */ /** @internal */ -export function resourceToInstanceAndPath(resource) { +export function resourceToInstanceAndPath(resource: string) { let resourceRegex = `projects/([^/]+)/instances/([^/]+)/refs(/.+)?`; let match = resource.match(new RegExp(resourceRegex)); if (!match) { @@ -305,14 +305,14 @@ export class DataSnapshot { } /* Recursive function to check if keys are numeric & convert node object to array if they are */ - private _checkAndConvertToArray(node): any { + private _checkAndConvertToArray(node: any): any { if (node === null || typeof node === 'undefined') { return null; } if (typeof node !== 'object') { return node; } - let obj = {}; + let obj: any = {}; let numKeys = 0; let maxKey = 0; let allIntegerKeys = true; @@ -331,7 +331,7 @@ export class DataSnapshot { if (allIntegerKeys && maxKey < 2 * numKeys) { // convert to array. - let array = []; + let array: any = []; _.forOwn(obj, (val, key) => { array[key] = val; }); diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 640b250b8..e0db9c3dd 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -25,7 +25,7 @@ import * as _ from 'lodash'; import * as firebase from 'firebase-admin'; import { apps } from '../apps'; import { makeCloudFunction, CloudFunction, LegacyEvent, Change, - EventContext } from '../cloud-functions'; + Event, EventContext } from '../cloud-functions'; import { dateToTimestampProto } from '../encoder'; /** @internal */ @@ -36,7 +36,7 @@ export type DocumentSnapshot = firebase.firestore.DocumentSnapshot; /** @internal */ export const defaultDatabase = '(default)'; -let firestoreInstance; +let firestoreInstance: any; /** @internal */ // Multiple databases are not yet supported by Firestore. @@ -168,7 +168,7 @@ export class DocumentBuilder { private onOperation( handler: (data: T, context?: EventContext) => PromiseLike | any, eventType: string, - dataConstructor): CloudFunction { + dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { return makeCloudFunction({ handler, provider, diff --git a/src/providers/https.ts b/src/providers/https.ts index 2930910a5..3e44efd0e 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -29,7 +29,7 @@ import * as cors from 'cors'; export function onRequest(handler: (req: express.Request, resp: express.Response) => void): HttpsFunction { // lets us add __trigger without altering handler: - let cloudFunction: any = (req, res) => { handler(req, res); }; + let cloudFunction: any = (req: express.Request, res: express.Response) => { handler(req, res); }; cloudFunction.__trigger = {httpsTrigger: {}}; return cloudFunction; @@ -321,7 +321,7 @@ export function encode(data: any): any { * This is exposed only for testing. */ /** @internal */ -export function decode(data: any) { +export function decode(data: any): any { if (data === null) { return data; } diff --git a/src/utils.ts b/src/utils.ts index 114a8e7e5..522dadb9f 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -49,7 +49,7 @@ export function applyChange(src: any, dest: any) { return pruneNulls(_.merge({}, src, dest)); } -export function pruneNulls(obj: Object) { +export function pruneNulls(obj: any) { for (let key in obj) { if (obj[key] === null) { delete obj[key]; diff --git a/tsconfig.json b/tsconfig.json index 04fc40239..573a354fe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "lib": ["es6"], "module": "commonjs", - "noImplicitAny": false, + "noImplicitAny": true, "outDir": ".tmp", "sourceMap": true, "target": "es6", From d44f345ee5e5766b3eaa49f74d637f62dff92d81 Mon Sep 17 00:00:00 2001 From: Slawek Walkowski Date: Tue, 24 Apr 2018 20:09:33 +0200 Subject: [PATCH 017/705] Update firebase-admin in integration tests to v5.12.0 (#229) --- integration_test/functions/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/functions/package.json b/integration_test/functions/package.json index 5e021fc7c..866f84c6b 100644 --- a/integration_test/functions/package.json +++ b/integration_test/functions/package.json @@ -8,7 +8,7 @@ "@google-cloud/pubsub": "^0.6.0", "@types/lodash": "^4.14.41", "firebase": "^4.9.1", - "firebase-admin": "~5.10.0", + "firebase-admin": "~5.12.0", "firebase-functions": "./firebase-functions.tgz", "lodash": "^4.17.2" }, From 71a41d7204fbdbed77c3efae1728b9aadfd6c4e1 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 24 Apr 2018 14:16:48 -0700 Subject: [PATCH 018/705] Update jsonwebtoken to v8.2.1 (#231) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 40a7e54e3..c62a8d7a6 100644 --- a/package.json +++ b/package.json @@ -54,11 +54,11 @@ "dependencies": { "@types/cors": "^2.8.1", "@types/express": "^4.11.1", - "@types/jsonwebtoken": "^7.1.32", + "@types/jsonwebtoken": "^7.2.6", "@types/lodash": "^4.14.34", "cors": "^2.8.4", "express": "^4.16.2", - "jsonwebtoken": "^7.1.9", + "jsonwebtoken": "^8.2.1", "lodash": "^4.6.1" }, "engines": { From 9cc9069c9e71e282b621fdee46e62e7069b1f7f3 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 24 Apr 2018 14:22:42 -0700 Subject: [PATCH 019/705] Changelog for v1.0.2 (#233) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..31356b44c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fixed bug where developers writing functions in TypeScript had to disable `noImplicitAny` in their tsconfig.json in order to avoid compiler errors. From 21eed822dd60b7261501a7e999980730ffc3b888 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 24 Apr 2018 21:27:01 +0000 Subject: [PATCH 020/705] [firebase-release] Updated SDK for Cloud Functions to 1.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c62a8d7a6..5826d0b72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.1", + "version": "1.0.2", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 950a9df3d81a31a6dcc8f9b782fd1fe48619f867 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 24 Apr 2018 21:27:23 +0000 Subject: [PATCH 021/705] [firebase-release] Removed change log and reset repo after 1.0.2 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 31356b44c..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fixed bug where developers writing functions in TypeScript had to disable `noImplicitAny` in their tsconfig.json in order to avoid compiler errors. From 427ae7a7da167c0c64413e7c0b5ed3f567ed5782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Wed, 16 May 2018 17:44:51 +0000 Subject: [PATCH 022/705] Change `context` parameter in handlers to be not optional (#232) --- integration_test/functions/src/testing.ts | 4 ++-- src/cloud-functions.ts | 4 ++-- src/providers/analytics.ts | 2 +- src/providers/auth.ts | 6 +++--- src/providers/crashlytics.ts | 8 ++++---- src/providers/database.ts | 10 +++++----- src/providers/firestore.ts | 10 +++++----- src/providers/pubsub.ts | 2 +- src/providers/storage.ts | 10 +++++----- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 765dfacf0..73d3855f1 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -2,7 +2,7 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import { EventContext } from 'firebase-functions'; -export type TestCase = (data: T, context?: EventContext) => any +export type TestCase = (data: T, context: EventContext) => any export type TestCaseMap = { [key: string]: TestCase }; export class TestSuite { @@ -19,7 +19,7 @@ export class TestSuite { return this; } - run(testId: string, data: T, context?: EventContext): Promise { + run(testId: string, data: T, context: EventContext): Promise { let running: Array> = []; for (let testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { continue; } diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index cc5305055..8db2f15ea 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -165,7 +165,7 @@ export interface TriggerAnnotated { /** A Runnable has a `run` method which directly invokes the user-defined function - useful for unit testing. */ export interface Runnable { - run: (data: T, context?: EventContext) => PromiseLike | any; + run: (data: T, context: EventContext) => PromiseLike | any; } /** @@ -189,7 +189,7 @@ export interface MakeCloudFunctionArgs { triggerResource: () => string; service: string; dataConstructor?: (raw: Event | LegacyEvent) => EventData; - handler: (data: EventData, context?: EventContext) => PromiseLike | any; + handler: (data: EventData, context: EventContext) => PromiseLike | any; before?: (raw: Event | LegacyEvent) => void; after?: (raw: Event | LegacyEvent) => void; legacyEventType?: string; diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 77e5b693d..322b0d6e7 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -66,7 +66,7 @@ export class AnalyticsEventBuilder { * Cloud Function you can export. */ onLog( - handler: (event: AnalyticsEvent, context?: EventContext) => PromiseLike | any): CloudFunction { + handler: (event: AnalyticsEvent, context: EventContext) => PromiseLike | any): CloudFunction { const dataConstructor = (raw: Event) => { return new AnalyticsEvent(raw.data); }; diff --git a/src/providers/auth.ts b/src/providers/auth.ts index c8b95c432..813a69ab9 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -62,17 +62,17 @@ export class UserBuilder { constructor(private triggerResource: () => string) { } /** Respond to the creation of a Firebase Auth user. */ - onCreate(handler: (user: UserRecord, context?: EventContext) => PromiseLike | any): CloudFunction { + onCreate(handler: (user: UserRecord, context: EventContext) => PromiseLike | any): CloudFunction { return this.onOperation(handler, 'user.create'); } /** Respond to the deletion of a Firebase Auth user. */ - onDelete(handler: (user: UserRecord, context?: EventContext) => PromiseLike | any): CloudFunction { + onDelete(handler: (user: UserRecord, context: EventContext) => PromiseLike | any): CloudFunction { return this.onOperation(handler, 'user.delete'); } private onOperation( - handler: (user: UserRecord, context?: EventContext) => PromiseLike | any, + handler: (user: UserRecord, context: EventContext) => PromiseLike | any, eventType: string ): CloudFunction { return makeCloudFunction({ diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index 31643af39..418936e14 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -51,22 +51,22 @@ export class IssueBuilder { } /** Handle Crashlytics New Issue events. */ - onNew(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + onNew(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { return this.onEvent(handler, 'issue.new'); } /** Handle Crashlytics Regressed Issue events. */ - onRegressed(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + onRegressed(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { return this.onEvent(handler, 'issue.regressed'); } /** Handle Crashlytics Velocity Alert events. */ - onVelocityAlert(handler: (issue: Issue, context?: EventContext) => PromiseLike | any): CloudFunction { + onVelocityAlert(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { return this.onEvent(handler, 'issue.velocityAlert'); } private onEvent( - handler: (issue: Issue, context?: EventContext) => PromiseLike | any, + handler: (issue: Issue, context: EventContext) => PromiseLike | any, eventType: string ): CloudFunction { return makeCloudFunction({ diff --git a/src/providers/database.ts b/src/providers/database.ts index db42e9a9a..d21ac2409 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -103,7 +103,7 @@ export class RefBuilder { /** Respond to any write that affects a ref. */ onWrite(handler: ( change: Change, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction> { return this.onOperation(handler, 'ref.write', this.changeConstructor); } @@ -111,7 +111,7 @@ export class RefBuilder { /** Respond to update on a ref. */ onUpdate(handler: ( change: Change, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction> { return this.onOperation(handler, 'ref.update', this.changeConstructor); } @@ -119,7 +119,7 @@ export class RefBuilder { /** Respond to new data on a ref. */ onCreate(handler: ( snapshot: DataSnapshot, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { let dataConstructor = (raw: LegacyEvent) => { let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); @@ -136,7 +136,7 @@ export class RefBuilder { /** Respond to all data being deleted from a ref. */ onDelete(handler: ( snapshot: DataSnapshot, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { let dataConstructor = (raw: LegacyEvent) => { let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); @@ -151,7 +151,7 @@ export class RefBuilder { } private onOperation( - handler: (data: T, context?: EventContext) => PromiseLike | any, + handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index e0db9c3dd..c9dec2795 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -136,7 +136,7 @@ export class DocumentBuilder { /** Respond to all document writes (creates, updates, or deletes). */ onWrite(handler: ( change: Change, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction> { return this.onOperation(handler, 'document.write', changeConstructor); }; @@ -144,7 +144,7 @@ export class DocumentBuilder { /** Respond only to document updates. */ onUpdate(handler: ( change: Change, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction> { return this.onOperation(handler, 'document.update', changeConstructor); } @@ -152,7 +152,7 @@ export class DocumentBuilder { /** Respond only to document creations. */ onCreate(handler: ( snapshot: DocumentSnapshot, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'document.create', snapshotConstructor); } @@ -160,13 +160,13 @@ export class DocumentBuilder { /** Respond only to document deletions. */ onDelete(handler: ( snapshot: DocumentSnapshot, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'document.delete', beforeSnapshotConstructor); } private onOperation( - handler: (data: T, context?: EventContext) => PromiseLike | any, + handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { return makeCloudFunction({ diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index c11e816e1..c2359b73c 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -48,7 +48,7 @@ export class TopicBuilder { constructor(private triggerResource: () => string) { } /** Handle a Pub/Sub message that was published to a Cloud Pub/Sub topic */ - onPublish(handler: (message: Message, context?: EventContext) => PromiseLike | any): CloudFunction { + onPublish(handler: (message: Message, context: EventContext) => PromiseLike | any): CloudFunction { return makeCloudFunction({ handler, provider, diff --git a/src/providers/storage.ts b/src/providers/storage.ts index f806889b1..f99ef3fa7 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -75,7 +75,7 @@ export class ObjectBuilder { /** Respond to archiving of an object, this is only for buckets that enabled object versioning. */ onArchive(handler: ( object: ObjectMetadata, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'object.archive'); } @@ -83,7 +83,7 @@ export class ObjectBuilder { /** Respond to the deletion of an object (not to archiving, if object versioning is enabled). */ onDelete(handler: ( object: ObjectMetadata, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'object.delete'); } @@ -91,7 +91,7 @@ export class ObjectBuilder { /** Respond to the successful creation of an object. */ onFinalize(handler: ( object: ObjectMetadata, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'object.finalize'); } @@ -99,13 +99,13 @@ export class ObjectBuilder { /** Respond to metadata updates of existing objects. */ onMetadataUpdate(handler: ( object: ObjectMetadata, - context?: EventContext) => PromiseLike | any, + context: EventContext) => PromiseLike | any, ): CloudFunction { return this.onOperation(handler, 'object.metadataUpdate'); } private onOperation( - handler: (object: ObjectMetadata, context?: EventContext) => PromiseLike | any, + handler: (object: ObjectMetadata, context: EventContext) => PromiseLike | any, eventType: string): CloudFunction { return makeCloudFunction({ handler, From 728cbf357cc8d883eab80e1b9bc0bb4b32764033 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 21 May 2018 13:49:26 -0700 Subject: [PATCH 023/705] Update firebase-admin peer-dependency to v5.12.1 (#246) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5826d0b72..5e20b1d1a 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/sinon": "^1.16.29", "chai": "^3.5.0", "chai-as-promised": "^5.2.0", - "firebase-admin": "~5.12.0", + "firebase-admin": "~5.12.1", "istanbul": "^0.4.2", "mocha": "^2.4.5", "mock-require": "^2.0.1", @@ -49,7 +49,7 @@ "typescript": "^2.0.3" }, "peerDependencies": { - "firebase-admin": "~5.12.0" + "firebase-admin": "~5.12.1" }, "dependencies": { "@types/cors": "^2.8.1", From c2dc3e981419e118fb21a59d40d0fd15b227ab64 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 21 May 2018 13:49:43 -0700 Subject: [PATCH 024/705] Changelog for v1.0.3 (#244) --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..c5c64d57d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1,2 @@ +fixed - Fixed TypeScript type for `context` in event handlers to be always defined. +changed - Updated firebase-admin peer-dependency to v5.12.1. From 83a6302cc2a2ebb06ab0124a4f4ca594727ce92c Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Mon, 21 May 2018 20:51:19 +0000 Subject: [PATCH 025/705] [firebase-release] Updated SDK for Cloud Functions to 1.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e20b1d1a..10878574a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.2", + "version": "1.0.3", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 3f70cc2a683c43ee22140ee4428add67cac7d823 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Mon, 21 May 2018 20:51:30 +0000 Subject: [PATCH 026/705] [firebase-release] Removed change log and reset repo after 1.0.3 release --- changelog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index c5c64d57d..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,2 +0,0 @@ -fixed - Fixed TypeScript type for `context` in event handlers to be always defined. -changed - Updated firebase-admin peer-dependency to v5.12.1. From 5ff3b6c9a8fcd29145bef5e03d949df4069c6382 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 4 Jun 2018 13:22:48 -0700 Subject: [PATCH 027/705] Fix integration test. (#250) --- .travis.yml | 3 ++- integration_test/functions/package.json | 4 ++-- integration_test/functions/src/auth-tests.ts | 8 ++++---- integration_test/functions/src/database-tests.ts | 3 +-- integration_test/functions/src/firestore-tests.ts | 2 +- integration_test/functions/src/index.ts | 7 ++++--- integration_test/functions/src/pubsub-tests.ts | 2 +- integration_test/functions/src/testing.ts | 4 ++-- integration_test/functions/tsconfig.json | 5 +---- package.json | 2 +- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe5ba40c7..8f5bf9f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: node_js node_js: -- '6.11.5' +- '6.14.0' +- '8' - stable sudo: false diff --git a/integration_test/functions/package.json b/integration_test/functions/package.json index 866f84c6b..aa727bc91 100644 --- a/integration_test/functions/package.json +++ b/integration_test/functions/package.json @@ -8,13 +8,13 @@ "@google-cloud/pubsub": "^0.6.0", "@types/lodash": "^4.14.41", "firebase": "^4.9.1", - "firebase-admin": "~5.12.0", + "firebase-admin": "~5.12.1", "firebase-functions": "./firebase-functions.tgz", "lodash": "^4.17.2" }, "main": "lib/index.js", "devDependencies": { - "typescript": "^2.0.10" + "typescript": "^2.8.3" }, "private": true } diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/auth-tests.ts index 367f6fe87..b3e5fe745 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/auth-tests.ts @@ -9,12 +9,12 @@ export const createUserTests: any = functions.auth.user().onCreate((u, c) => { return new TestSuite('auth user onCreate') .it('should have a project as resource', (user, context) => expectEq( - context.resource, `projects/${process.env.GCLOUD_PROJECT}`)) + context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)) .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) .it('should have the correct eventType', (user, context) => expectEq( - context.eventType, 'providers/firebase.auth/eventTypes/user.create')) + context.eventType, 'google.firebase.auth.user.create')) .it('should have an eventId', (user, context)=> context.eventId) @@ -33,12 +33,12 @@ export const deleteUserTests: any = functions.auth.user().onDelete((u, c) => { return new TestSuite('auth user onDelete') .it('should have a project as resource', (user, context) => expectEq( - context.resource, `projects/${process.env.GCLOUD_PROJECT}`)) + context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)) .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) .it('should have the correct eventType', (user, context) => expectEq( - context.eventType, 'providers/firebase.auth/eventTypes/user.delete')) + context.eventType, 'google.firebase.auth.user.delete')) .it('should have an eventId', (user, context) => context.eventId) diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index e7ca21a8f..22d0a6b07 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -2,7 +2,6 @@ import * as functions from 'firebase-functions'; import { TestSuite, expectEq, expectMatches } from './testing'; import * as admin from 'firebase-admin'; import DataSnapshot = admin.database.DataSnapshot; -import { Change } from '../../../src/cloud-functions'; const testIdFieldName = 'testId'; @@ -14,7 +13,7 @@ export const databaseTests: any = functions.database.ref('dbTests/{testId}/start return; } - return new TestSuite>('database ref onWrite') + return new TestSuite>('database ref onWrite') .it('should not have event.app', (change, context) => !(context as any).app) diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index 4e7cfd912..545fd61fd 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -19,7 +19,7 @@ export const firestoreTests: any = functions.firestore.document('tests/{document ) .it('should have the right eventType', (snap, context) => expectEq( - context.eventType, 'providers/cloud.firestore/eventTypes/document.create')) + context.eventType, 'google.firestore.document.create')) .it('should have eventId', (snap, context) => context.eventId) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 9979e372b..58c3d4b31 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -11,8 +11,9 @@ export * from './firestore-tests'; export * from './https-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. -// Client SDK doesn't support auto initialization: -firebase.initializeApp(JSON.parse(process.env.FIREBASE_CONFIG)); +import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) +const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); +firebase.initializeApp(firebaseConfig); console.log('initializing admin'); admin.initializeApp(); @@ -21,7 +22,7 @@ function callHttpsTrigger(name: string, data: any) { return new Promise((resolve, reject) => { const request = https.request({ method: 'POST', - host: 'us-central1-' + functions.config().firebase.projectId + '.cloudfunctions.net', + host: 'us-central1-' + firebaseConfig.projectId + '.cloudfunctions.net', path: '/' + name, headers: { 'Content-Type': 'application/json', diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index 044dd2382..7919a23f7 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -19,7 +19,7 @@ export const pubsubTests: any = functions.pubsub.topic('pubsubTests').onPublish( .it('should not have a path', (message, context) => expectEq((context as any).path, undefined)) .it('should have the correct eventType', (message, context) => expectEq( - context.eventType, 'providers/cloud.pubsub/eventTypes/topic.publish')) + context.eventType, 'google.pubsub.topic.publish')) .it('should have an eventId', (message, context) => context.eventId) diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 73d3855f1..765dfacf0 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -2,7 +2,7 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import { EventContext } from 'firebase-functions'; -export type TestCase = (data: T, context: EventContext) => any +export type TestCase = (data: T, context?: EventContext) => any export type TestCaseMap = { [key: string]: TestCase }; export class TestSuite { @@ -19,7 +19,7 @@ export class TestSuite { return this; } - run(testId: string, data: T, context: EventContext): Promise { + run(testId: string, data: T, context?: EventContext): Promise { let running: Array> = []; for (let testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { continue; } diff --git a/integration_test/functions/tsconfig.json b/integration_test/functions/tsconfig.json index 494cc1dec..554bd3a6b 100644 --- a/integration_test/functions/tsconfig.json +++ b/integration_test/functions/tsconfig.json @@ -1,9 +1,6 @@ { "compilerOptions": { - "lib": [ - "es6", - "es2015.promise" - ], + "lib": ["es6"], "module": "commonjs", "target": "es6", "noImplicitAny": false, diff --git a/package.json b/package.json index 10878574a..efae65e26 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "nock": "^9.0.0", "sinon": "^1.17.4", "tslint": "^3.15.1", - "typescript": "^2.0.3" + "typescript": "^2.8.3" }, "peerDependencies": { "firebase-admin": "~5.12.1" From e00301d9bf89b49be769b33ec73a2cc0d9d495ab Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 4 Jun 2018 19:00:07 -0700 Subject: [PATCH 028/705] Lock in TypeScript version (#260) --- integration_test/functions/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test/functions/package.json b/integration_test/functions/package.json index aa727bc91..746d9526d 100644 --- a/integration_test/functions/package.json +++ b/integration_test/functions/package.json @@ -14,7 +14,7 @@ }, "main": "lib/index.js", "devDependencies": { - "typescript": "^2.8.3" + "typescript": "~2.8.3" }, "private": true } diff --git a/package.json b/package.json index efae65e26..512a47a72 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "nock": "^9.0.0", "sinon": "^1.17.4", "tslint": "^3.15.1", - "typescript": "^2.8.3" + "typescript": "~2.8.3" }, "peerDependencies": { "firebase-admin": "~5.12.1" From b727a066185c41baed48a42727a0563bdb37fdb7 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 4 Jun 2018 19:02:30 -0700 Subject: [PATCH 029/705] Changelog for v1.0.4 (#259) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..8915afc5d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fixed integration test. From 2a923ac3c78af5b937cf3dfb16eea5d74d6f2477 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 5 Jun 2018 02:06:34 +0000 Subject: [PATCH 030/705] [firebase-release] Updated SDK for Cloud Functions to 1.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 512a47a72..36b6d0720 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.3", + "version": "1.0.4", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 6f1bc8889fd7cd69e0a33ad5217c67db27ac918b Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 5 Jun 2018 02:06:44 +0000 Subject: [PATCH 031/705] [firebase-release] Removed change log and reset repo after 1.0.4 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 8915afc5d..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fixed integration test. From 33435b5e1a169bc4ab9afbda1f9bf03b3f1565fc Mon Sep 17 00:00:00 2001 From: Laurent Pellegrino Date: Wed, 20 Jun 2018 20:33:19 +0200 Subject: [PATCH 032/705] Pass the raw Express request to CallableContext (#269) --- spec/providers/https.spec.ts | 18 ++++++++++++++++++ src/providers/https.ts | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index c8c7bd239..3d80f60ef 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -443,6 +443,24 @@ describe('callable.FunctionBuilder', () => { }, }); }); + + it('should expose raw request', async () => { + const mockRequest = request(null, 'application/json', {}); + await runTest({ + httpRequest: mockRequest, + expectedData: null, + callableFunction: (data, context) => { + expect(context.rawRequest).to.not.be.undefined; + expect(context.rawRequest).to.equal(mockRequest); + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: {result: null}, + }, + }); + }); }); }); diff --git a/src/providers/https.ts b/src/providers/https.ts index 3e44efd0e..6ea209dab 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -217,6 +217,11 @@ export interface CallableContext { * An unverified token for a Firebase Instance ID. */ instanceIdToken?: string; + + /** + * The raw request handled by the callable. + */ + rawRequest: express.Request; } // The allowed interface for an http request for a callable function. @@ -373,7 +378,7 @@ export function onCall( throw new HttpsError('invalid-argument', 'Bad Request'); } - const context: CallableContext = {}; + const context: CallableContext = { rawRequest: req }; const authorization = req.header('Authorization'); if (authorization) { From d713b6678027a2bca4f4699ba8fcced896723d62 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 20 Jun 2018 11:50:28 -0700 Subject: [PATCH 033/705] Changelog for v1.0.5 (#272) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..47c57e2b8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +feature - Make raw HTTP request available to callable HTTP functions via `context.rawRequest`. From f41d00df064dcd1e4a1de6fa8a4e7917896f7962 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 20 Jun 2018 18:52:14 +0000 Subject: [PATCH 034/705] [firebase-release] Updated SDK for Cloud Functions to 1.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36b6d0720..85f2828c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.4", + "version": "1.1.0", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 54b2d889bfe5a6a02cd02bdfa40a7c90f908de43 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 20 Jun 2018 18:52:24 +0000 Subject: [PATCH 035/705] [firebase-release] Removed change log and reset repo after 1.1.0 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 47c57e2b8..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -feature - Make raw HTTP request available to callable HTTP functions via `context.rawRequest`. From df3db62d6e7b4d68ac3bda987ebd96ee00d3e248 Mon Sep 17 00:00:00 2001 From: Bryan Klimt Date: Thu, 21 Jun 2018 15:15:36 -0400 Subject: [PATCH 036/705] Add trigger labels support and label callables. (#273) --- spec/providers/https.spec.ts | 5 ++++- src/cloud-functions.ts | 3 ++- src/providers/https.ts | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index 3d80f60ef..6e3a89032 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -234,7 +234,10 @@ describe('callable.FunctionBuilder', () => { const result = https.onCall((data) => { return 'response'; }); - expect(result.__trigger).to.deep.equal({httpsTrigger: {}}); + expect(result.__trigger).to.deep.equal({ + httpsTrigger: {}, + labels: { 'deployment-callable': 'true' }, + }); }); it('should handle success', () => { diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 8db2f15ea..3717f8ca1 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -159,7 +159,8 @@ export interface TriggerAnnotated { eventType: string; resource: string; service: string; - } + }, + labels?: { [key: string]: string } }; } diff --git a/src/providers/https.ts b/src/providers/https.ts index 6ea209dab..82f5c56ba 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -435,7 +435,10 @@ export function onCall( return corsHandler(req, res, () => func(req, res)); }; - corsFunc.__trigger = {httpsTrigger: {}}; + corsFunc.__trigger = { + httpsTrigger: {}, + labels: { 'deployment-callable': 'true' }, + }; return corsFunc; } From 6c1cdca5720144dd2bac98742244aedf57c1bf8c Mon Sep 17 00:00:00 2001 From: Kota Yoshitsugu Date: Tue, 3 Jul 2018 04:24:46 +0900 Subject: [PATCH 037/705] Fix error message in storage bucket function (#276) --- src/providers/storage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/storage.ts b/src/providers/storage.ts index f99ef3fa7..6650a304b 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -41,7 +41,7 @@ export function bucket(bucket?: string): BucketBuilder { ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.'); } if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) { - throw new Error('Invalid bucket name ${bucket}'); + throw new Error(`Invalid bucket name ${bucket}`); } return `projects/_/buckets/${bucket}`; }; From 01665efef3f0ad8fe5041417e51c1f6f23f52b51 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 6 Jul 2018 16:03:48 -0700 Subject: [PATCH 038/705] Use prettier instead of linter (#204) --- .prettierrc | 4 + integration_test/functions/src/auth-tests.ts | 46 ++- .../functions/src/database-tests.ts | 88 +++-- .../functions/src/firestore-tests.ts | 42 ++- integration_test/functions/src/https-tests.ts | 4 +- integration_test/functions/src/index.ts | 178 ++++++----- .../functions/src/pubsub-tests.ts | 89 +++--- integration_test/functions/src/testing.ts | 68 ++-- package.json | 11 +- spec/apps.spec.ts | 26 +- spec/cloud-functions.spec.ts | 32 +- spec/config.spec.ts | 30 +- spec/fixtures/credential/key.d.ts | 2 +- spec/fixtures/http.ts | 48 ++- spec/providers/analytics.spec.ts | 47 ++- spec/providers/auth.spec.ts | 42 ++- spec/providers/crashlytics.spec.ts | 10 +- spec/providers/database.spec.ts | 106 +++++-- spec/providers/firestore.spec.ts | 300 +++++++++++------- spec/providers/https.spec.ts | 196 +++++++----- spec/providers/pubsub.spec.ts | 21 +- spec/providers/storage.spec.ts | 98 ++++-- spec/testing.spec.ts | 2 +- spec/utils.spec.ts | 22 +- src/apps.ts | 11 +- src/cloud-functions.ts | 75 +++-- src/config.ts | 8 +- src/encoder.ts | 2 +- src/index.ts | 22 +- src/providers/analytics.ts | 93 +++++- src/providers/auth.ts | 57 +++- src/providers/crashlytics.ts | 24 +- src/providers/database.ts | 120 ++++--- src/providers/firestore.ts | 87 +++-- src/providers/https.ts | 94 ++++-- src/providers/pubsub.ts | 28 +- src/providers/storage.ts | 100 +++--- src/utils.ts | 6 +- 38 files changed, 1457 insertions(+), 782 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..c1a6f6671 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "trailingComma": "es5" +} diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/auth-tests.ts index b3e5fe745..7b7f8686c 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/auth-tests.ts @@ -8,21 +8,29 @@ export const createUserTests: any = functions.auth.user().onCreate((u, c) => { console.log(`testId is ${testId}`); return new TestSuite('auth user onCreate') - .it('should have a project as resource', (user, context) => expectEq( - context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)) + .it('should have a project as resource', (user, context) => + expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`) + ) - .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) + .it('should not have a path', (user, context) => + expectEq((context as any).path, undefined) + ) - .it('should have the correct eventType', (user, context) => expectEq( - context.eventType, 'google.firebase.auth.user.create')) + .it('should have the correct eventType', (user, context) => + expectEq(context.eventType, 'google.firebase.auth.user.create') + ) - .it('should have an eventId', (user, context)=> context.eventId) + .it('should have an eventId', (user, context) => context.eventId) .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have auth', (user, context) => expectEq((context as any).auth, undefined)) + .it('should not have auth', (user, context) => + expectEq((context as any).auth, undefined) + ) - .it('should not have action', (user, context) => expectEq((context as any).action, undefined)) + .it('should not have action', (user, context) => + expectEq((context as any).action, undefined) + ) .run(testId, u, c); }); @@ -32,21 +40,29 @@ export const deleteUserTests: any = functions.auth.user().onDelete((u, c) => { console.log(`testId is ${testId}`); return new TestSuite('auth user onDelete') - .it('should have a project as resource', (user, context) => expectEq( - context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)) + .it('should have a project as resource', (user, context) => + expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`) + ) - .it('should not have a path', (user, context) => expectEq((context as any).path, undefined)) + .it('should not have a path', (user, context) => + expectEq((context as any).path, undefined) + ) - .it('should have the correct eventType', (user, context) => expectEq( - context.eventType, 'google.firebase.auth.user.delete')) + .it('should have the correct eventType', (user, context) => + expectEq(context.eventType, 'google.firebase.auth.user.delete') + ) .it('should have an eventId', (user, context) => context.eventId) .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have auth', (user, context) => expectEq((context as any).auth, undefined)) + .it('should not have auth', (user, context) => + expectEq((context as any).auth, undefined) + ) - .it('should not have action', (user, context) => expectEq((context as any).action, undefined)) + .it('should not have action', (user, context) => + expectEq((context as any).action, undefined) + ) .run(testId, u, c); }); diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index 22d0a6b07..183d3d785 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -5,44 +5,72 @@ import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; -export const databaseTests: any = functions.database.ref('dbTests/{testId}/start').onWrite((ch, ctx) => { - if (ch.after.val() === null) { - console.log( - 'Event for ' + ctx.params[testIdFieldName] - + ' is null; presuming data cleanup, so skipping.'); - return; - } +export const databaseTests: any = functions.database + .ref('dbTests/{testId}/start') + .onWrite((ch, ctx) => { + if (ch.after.val() === null) { + console.log( + 'Event for ' + + ctx.params[testIdFieldName] + + ' is null; presuming data cleanup, so skipping.' + ); + return; + } - return new TestSuite>('database ref onWrite') + return new TestSuite>('database ref onWrite') - .it('should not have event.app', (change, context) => !(context as any).app) + .it( + 'should not have event.app', + (change, context) => !(context as any).app + ) - .it('should give refs access to admin data', (change) => - change.after.ref.parent.child('adminOnly').update({ allowed: 1 }).then(() => true)) + .it('should give refs access to admin data', change => + change.after.ref.parent + .child('adminOnly') + .update({ allowed: 1 }) + .then(() => true) + ) - .it('should have a correct ref url', (change) => { - const url = change.after.ref.toString(); - return Promise.resolve().then(() => { - return expectMatches(url, new RegExp(`^https://${process.env.GCLOUD_PROJECT}.firebaseio.com/dbTests`)); - }).then(() => { - return expectMatches(url, /\/start$/); - }); - }) + .it('should have a correct ref url', change => { + const url = change.after.ref.toString(); + return Promise.resolve() + .then(() => { + return expectMatches( + url, + new RegExp( + `^https://${process.env.GCLOUD_PROJECT}.firebaseio.com/dbTests` + ) + ); + }) + .then(() => { + return expectMatches(url, /\/start$/); + }); + }) - .it('should have refs resources', (change, context) => expectEq( - context.resource.name, - `projects/_/instances/${process.env.GCLOUD_PROJECT}/refs/dbTests/${context.params.testId}/start`)) + .it('should have refs resources', (change, context) => + expectEq( + context.resource.name, + `projects/_/instances/${process.env.GCLOUD_PROJECT}/refs/dbTests/${ + context.params.testId + }/start` + ) + ) - .it('should not include path', (change, context) => expectEq((context as any).path, undefined)) + .it('should not include path', (change, context) => + expectEq((context as any).path, undefined) + ) - .it('should have the right eventType', (change, context) => expectEq( - context.eventType, 'google.firebase.database.ref.write')) + .it('should have the right eventType', (change, context) => + expectEq(context.eventType, 'google.firebase.database.ref.write') + ) - .it('should have eventId', (change, context) => context.eventId) + .it('should have eventId', (change, context) => context.eventId) - .it('should have timestamp', (change, context) => context.timestamp) + .it('should have timestamp', (change, context) => context.timestamp) - .it('should not have action', (change, context) => expectEq((context as any).action, undefined)) + .it('should not have action', (change, context) => + expectEq((context as any).action, undefined) + ) - .run(ctx.params[testIdFieldName], ch, ctx); -}); + .run(ctx.params[testIdFieldName], ch, ctx); + }); diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index 545fd61fd..26def7fff 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -5,27 +5,37 @@ import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; -export const firestoreTests: any = functions.firestore.document('tests/{documentId}').onCreate((s, c) => { - return new TestSuite('firestore document onWrite') +export const firestoreTests: any = functions.firestore + .document('tests/{documentId}') + .onCreate((s, c) => { + return new TestSuite('firestore document onWrite') - .it('should not have event.app', (snap, context) => !(context as any).app) + .it('should not have event.app', (snap, context) => !(context as any).app) - .it('should give refs write access', (snap) => - snap.ref.set({ allowed: 1 }, {merge: true}).then(() => true)) + .it('should give refs write access', snap => + snap.ref.set({ allowed: 1 }, { merge: true }).then(() => true) + ) - .it('should have well-formatted resource', (snap, context) => expectEq( - context.resource.name, - `projects/${process.env.GCLOUD_PROJECT}/databases/(default)/documents/tests/${context.params.documentId}`) - ) + .it('should have well-formatted resource', (snap, context) => + expectEq( + context.resource.name, + `projects/${ + process.env.GCLOUD_PROJECT + }/databases/(default)/documents/tests/${context.params.documentId}` + ) + ) - .it('should have the right eventType', (snap, context) => expectEq( - context.eventType, 'google.firestore.document.create')) + .it('should have the right eventType', (snap, context) => + expectEq(context.eventType, 'google.firestore.document.create') + ) - .it('should have eventId', (snap, context) => context.eventId) + .it('should have eventId', (snap, context) => context.eventId) - .it('should have timestamp', (snap, context) => context.timestamp) + .it('should have timestamp', (snap, context) => context.timestamp) - .it('should have the correct data', (snap, context) => expectDeepEq(snap.data(), {test: context.params.documentId})) + .it('should have the correct data', (snap, context) => + expectDeepEq(snap.data(), { test: context.params.documentId }) + ) - .run(c.params[testIdFieldName], s, c); -}); + .run(c.params[testIdFieldName], s, c); + }); diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/https-tests.ts index 4595214e8..4184f124d 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/https-tests.ts @@ -4,6 +4,8 @@ import { TestSuite, expectEq } from './testing'; export const callableTests: any = functions.https.onCall(d => { return new TestSuite('https onCall') - .it('should have the correct data', data => expectEq(_.get(data, 'foo'), 'bar')) + .it('should have the correct data', data => + expectEq(_.get(data, 'foo'), 'bar') + ) .run(d.testId, d); }); diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 58c3d4b31..42626dbec 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -9,7 +9,7 @@ export * from './database-tests'; export * from './auth-tests'; export * from './firestore-tests'; export * from './https-tests'; -const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. +const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); @@ -20,81 +20,117 @@ admin.initializeApp(); // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. function callHttpsTrigger(name: string, data: any) { return new Promise((resolve, reject) => { - const request = https.request({ - method: 'POST', - host: 'us-central1-' + firebaseConfig.projectId + '.cloudfunctions.net', - path: '/' + name, - headers: { - 'Content-Type': 'application/json', + const request = https.request( + { + method: 'POST', + host: 'us-central1-' + firebaseConfig.projectId + '.cloudfunctions.net', + path: '/' + name, + headers: { + 'Content-Type': 'application/json', + }, }, - }, (response) => { - let body = ''; - response.on('data', (chunk) => { body += chunk; }); - response.on('end', () => resolve(body)); - }); + response => { + let body = ''; + response.on('data', chunk => { + body += chunk; + }); + response.on('end', () => resolve(body)); + } + ); request.on('error', reject); - request.write(JSON.stringify({data})); + request.write(JSON.stringify({ data })); request.end(); }); } -export const integrationTests: any = functions.https.onRequest((req: Request, resp: Response) => { - let pubsub: any = require('@google-cloud/pubsub')(); +export const integrationTests: any = functions.https.onRequest( + (req: Request, resp: Response) => { + let pubsub: any = require('@google-cloud/pubsub')(); - const testId = firebase.database().ref().push().key; - return Promise.all([ - // A database write to trigger the Firebase Realtime Database tests. - // The database write happens without admin privileges, so that the triggered function's "event.data.ref" also - // doesn't have admin privileges. - firebase.database().ref(`dbTests/${testId}/start`).set({ '.sv': 'timestamp' }), - // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. - pubsub.topic('pubsubTests').publish({ testId }), - // A user creation to trigger the Firebase Auth user creation tests. - admin.auth().createUser({ - email: `${testId}@fake.com`, - password: 'secret', - displayName: `${testId}`, - }).then(userRecord => { - // A user deletion to trigger the Firebase Auth user deletion tests. - admin.auth().deleteUser(userRecord.uid); - }), - // A firestore write to trigger the Cloud Firestore tests. - admin.firestore().collection('tests').doc(testId).set({test: testId}), - // Invoke a callable HTTPS trigger. - callHttpsTrigger('callableTests', {foo: 'bar', testId}), - - ]).then(() => { - // On test completion, check that all tests pass and reply "PASS", or provide further details. - console.log('Waiting for all tests to report they pass...'); - let ref = admin.database().ref(`testRuns/${testId}`); - return new Promise((resolve, reject) => { - let testsExecuted = 0; - ref.on('child_added', (snapshot) => { - testsExecuted += 1; - if (!snapshot.val().passed) { - reject(new Error(`test ${snapshot.key} failed; see database for details.`)); - return; - } - console.log(`${snapshot.key} passed (${testsExecuted} of ${numTests})`); - if (testsExecuted < numTests) { - // Not all tests have completed. Wait longer. - return; - } - // All tests have passed! - resolve(); + const testId = firebase + .database() + .ref() + .push().key; + return Promise.all([ + // A database write to trigger the Firebase Realtime Database tests. + // The database write happens without admin privileges, so that the triggered function's "event.data.ref" also + // doesn't have admin privileges. + firebase + .database() + .ref(`dbTests/${testId}/start`) + .set({ '.sv': 'timestamp' }), + // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. + pubsub.topic('pubsubTests').publish({ testId }), + // A user creation to trigger the Firebase Auth user creation tests. + admin + .auth() + .createUser({ + email: `${testId}@fake.com`, + password: 'secret', + displayName: `${testId}`, + }) + .then(userRecord => { + // A user deletion to trigger the Firebase Auth user deletion tests. + admin.auth().deleteUser(userRecord.uid); + }), + // A firestore write to trigger the Cloud Firestore tests. + admin + .firestore() + .collection('tests') + .doc(testId) + .set({ test: testId }), + // Invoke a callable HTTPS trigger. + callHttpsTrigger('callableTests', { foo: 'bar', testId }), + ]) + .then(() => { + // On test completion, check that all tests pass and reply "PASS", or provide further details. + console.log('Waiting for all tests to report they pass...'); + let ref = admin.database().ref(`testRuns/${testId}`); + return new Promise((resolve, reject) => { + let testsExecuted = 0; + ref.on('child_added', snapshot => { + testsExecuted += 1; + if (!snapshot.val().passed) { + reject( + new Error( + `test ${snapshot.key} failed; see database for details.` + ) + ); + return; + } + console.log( + `${snapshot.key} passed (${testsExecuted} of ${numTests})` + ); + if (testsExecuted < numTests) { + // Not all tests have completed. Wait longer. + return; + } + // All tests have passed! + resolve(); + }); + }) + .then(() => { + ref.off(); // No more need to listen. + return Promise.resolve(); + }) + .catch(err => { + ref.off(); // No more need to listen. + return Promise.reject(err); + }); + }) + .then(() => { + console.log('All tests pass!'); + resp.status(200).send('PASS'); + }) + .catch(err => { + console.log(`Some tests failed: ${err}`); + resp + .status(500) + .send( + `FAIL - details at https://${ + process.env.GCLOUD_PROJECT + }.firebaseio.com/testRuns/${testId}` + ); }); - }).then(() => { - ref.off(); // No more need to listen. - return Promise.resolve(); - }).catch(err => { - ref.off(); // No more need to listen. - return Promise.reject(err); - }); - }).then(() => { - console.log('All tests pass!'); - resp.status(200).send('PASS'); - }).catch(err => { - console.log(`Some tests failed: ${err}`); - resp.status(500).send(`FAIL - details at https://${process.env.GCLOUD_PROJECT}.firebaseio.com/testRuns/${testId}`); - }); -}); + } +); diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index 7919a23f7..3ce63251e 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -4,39 +4,56 @@ import PubsubMessage = functions.pubsub.Message; // TODO(inlined) use multiple queues to run inline. // Expected message data: {"hello": "world"} -export const pubsubTests: any = functions.pubsub.topic('pubsubTests').onPublish((m, c) => { - let testId: string; - try { - testId = m.json.testId; - } catch (e) { - /* Ignored. Covered in another test case that `event.data.json` works. */ - } - - return new TestSuite('pubsub onPublish') - .it('should have a topic as resource', (message, context) => expectEq( - context.resource.name, `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests`)) - - .it('should not have a path', (message, context) => expectEq((context as any).path, undefined)) - - .it('should have the correct eventType', (message, context) => expectEq( - context.eventType, 'google.pubsub.topic.publish')) - - .it('should have an eventId', (message, context) => context.eventId) - - .it('should have a timestamp', (message, context) => context.timestamp) - - .it('should not have auth', (message, context) => expectEq((context as any).auth, undefined)) - - .it('should not have action', (message, context) => expectEq((context as any).action, undefined)) - - .it('should have pubsub data', (message) => { - const decoded = (new Buffer(message.data, 'base64')).toString(); - const parsed = JSON.parse(decoded); - return evaluate(parsed.hasOwnProperty('testId'), 'Raw data was: ' + message.data); - }) - - .it('should decode JSON payloads with the json helper', (message) => - evaluate(message.json.hasOwnProperty('testId'), message.json)) - - .run(testId, m, c); -}); +export const pubsubTests: any = functions.pubsub + .topic('pubsubTests') + .onPublish((m, c) => { + let testId: string; + try { + testId = m.json.testId; + } catch (e) { + /* Ignored. Covered in another test case that `event.data.json` works. */ + } + + return new TestSuite('pubsub onPublish') + .it('should have a topic as resource', (message, context) => + expectEq( + context.resource.name, + `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests` + ) + ) + + .it('should not have a path', (message, context) => + expectEq((context as any).path, undefined) + ) + + .it('should have the correct eventType', (message, context) => + expectEq(context.eventType, 'google.pubsub.topic.publish') + ) + + .it('should have an eventId', (message, context) => context.eventId) + + .it('should have a timestamp', (message, context) => context.timestamp) + + .it('should not have auth', (message, context) => + expectEq((context as any).auth, undefined) + ) + + .it('should not have action', (message, context) => + expectEq((context as any).action, undefined) + ) + + .it('should have pubsub data', message => { + const decoded = new Buffer(message.data, 'base64').toString(); + const parsed = JSON.parse(decoded); + return evaluate( + parsed.hasOwnProperty('testId'), + 'Raw data was: ' + message.data + ); + }) + + .it('should decode JSON payloads with the json helper', message => + evaluate(message.json.hasOwnProperty('testId'), message.json) + ) + + .run(testId, m, c); + }); diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 765dfacf0..50eaa7966 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -2,7 +2,7 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import { EventContext } from 'firebase-functions'; -export type TestCase = (data: T, context?: EventContext) => any +export type TestCase = (data: T, context?: EventContext) => any; export type TestCaseMap = { [key: string]: TestCase }; export class TestSuite { @@ -22,30 +22,39 @@ export class TestSuite { run(testId: string, data: T, context?: EventContext): Promise { let running: Array> = []; for (let testName in this.tests) { - if (!this.tests.hasOwnProperty(testName)) { continue; } + if (!this.tests.hasOwnProperty(testName)) { + continue; + } const run = Promise.resolve() .then(() => this.tests[testName](data, context)) .then( - (result) => { - console.log(`${result ? 'Passed' : 'Failed with successful op'}: ${testName}`); - return { name: testName, passed: !!result }; - }, - (error) => { - console.error(`Failed: ${testName}`, error); - return { name: testName, passed: 0, error: error }; - } + result => { + console.log( + `${result ? 'Passed' : 'Failed with successful op'}: ${testName}` + ); + return { name: testName, passed: !!result }; + }, + error => { + console.error(`Failed: ${testName}`, error); + return { name: testName, passed: 0, error: error }; + } ); running.push(run); } - return Promise.all(running).then((results) => { - let sum = 0; - results.forEach((val) => sum = sum + val.passed); - const summary = `passed ${sum} of ${running.length}`; - const passed = sum === running.length; - console.log(summary); - const result = { passed, summary, tests: results }; - return firebase.database().ref(`testRuns/${testId}/${this.name}`).set(result); - }).then(() => null); + return Promise.all(running) + .then(results => { + let sum = 0; + results.forEach(val => (sum = sum + val.passed)); + const summary = `passed ${sum} of ${running.length}`; + const passed = sum === running.length; + console.log(summary); + const result = { passed, summary, tests: results }; + return firebase + .database() + .ref(`testRuns/${testId}/${this.name}`) + .set(result); + }) + .then(() => null); } } @@ -67,30 +76,33 @@ export function evaluate(value, errMsg) { export function expectEq(left, right) { return evaluate( left === right, - JSON.stringify(left) + ' does not equal ' + JSON.stringify(right)); + JSON.stringify(left) + ' does not equal ' + JSON.stringify(right) + ); } export function expectDeepEq(left, right) { return evaluate( _.isEqual(left, right), - JSON.stringify(left) + ' does not equal ' + JSON.stringify(right)); + JSON.stringify(left) + ' does not equal ' + JSON.stringify(right) + ); } export function expectMatches(input: string, regexp) { return evaluate( input.match(regexp), - "Input '" + input + "' did not match regexp '" + regexp + "'"); + "Input '" + input + "' did not match regexp '" + regexp + "'" + ); } export function expectReject(f) { - return function (event) { + return function(event) { return Promise.resolve() .then(() => f(event)) .then( - () => { - throw new Error('Test should have returned a rejected promise'); - }, - () => true, // A rejection is what we expected, and so is a positive result. - ); + () => { + throw new Error('Test should have returned a rejected promise'); + }, + () => true // A rejection is what we expected, and so is a positive result. + ); }; } diff --git a/package.json b/package.json index 85f2828c0..316ef0422 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.1.0", + "version": "1.0.4", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { @@ -8,8 +8,10 @@ "build:pack": "rm -rf lib && npm install && node_modules/.bin/tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install typescript firebase-admin && node_modules/.bin/tsc -p tsconfig.release.json", "lint": "node_modules/.bin/tslint src/{**/*,*}.ts spec/{**/*,*}.ts integration_test/functions/src/{**/*,*}.ts", + "format": "prettier --write '**/*.ts'", "pretest": "node_modules/.bin/tsc && cp -r spec/fixtures .tmp/spec", - "test": "mocha .tmp/spec/index.spec.js", + "test": "npm run mocha", + "mocha": "mocha .tmp/spec/index.spec.js", "posttest": "npm run lint && rm -rf .tmp", "postinstall": "node ./upgrade-warning" }, @@ -44,9 +46,10 @@ "mocha": "^2.4.5", "mock-require": "^2.0.1", "nock": "^9.0.0", + "prettier": "^1.13.7", "sinon": "^1.17.4", - "tslint": "^3.15.1", - "typescript": "~2.8.3" + "typescript": "~2.8.3", + "tslint": "^3.15.1" }, "peerDependencies": { "firebase-admin": "~5.12.1" diff --git a/spec/apps.spec.ts b/spec/apps.spec.ts index 20c654cd0..9cf0a35cc 100644 --- a/spec/apps.spec.ts +++ b/spec/apps.spec.ts @@ -32,7 +32,7 @@ describe('apps', () => { beforeEach(() => { apps = new appsNamespace.Apps(); // mock claims intentionally contains dots, square brackets, and nested paths - claims = {'token': {'firebase': {'identities':{'google.com':['111']}}}}; + claims = { token: { firebase: { identities: { 'google.com': ['111'] } } } }; }); afterEach(() => { @@ -125,18 +125,20 @@ describe('apps', () => { apps.retain(); apps.release(); clock.tick(appsNamespace.garbageCollectionInterval / 2); - return Promise.resolve().then(() => { - // Counters are still 1 due second set of retain/release - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 1, - }); - clock.tick(appsNamespace.garbageCollectionInterval / 2); - }).then(() => { - // It's now been a full interval since the second set of retain/release - expect(apps['_refCounter']).to.deep.equal({ - __admin__: 0, + return Promise.resolve() + .then(() => { + // Counters are still 1 due second set of retain/release + expect(apps['_refCounter']).to.deep.equal({ + __admin__: 1, + }); + clock.tick(appsNamespace.garbageCollectionInterval / 2); + }) + .then(() => { + // It's now been a full interval since the second set of retain/release + expect(apps['_refCounter']).to.deep.equal({ + __admin__: 0, + }); }); - }); }); }); }); diff --git a/spec/cloud-functions.spec.ts b/spec/cloud-functions.spec.ts index 7566ea494..7f3564339 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/cloud-functions.spec.ts @@ -22,8 +22,14 @@ import * as _ from 'lodash'; import { expect } from 'chai'; -import { Event, EventContext, LegacyEvent, - makeCloudFunction, MakeCloudFunctionArgs, Change } from '../src/cloud-functions'; +import { + Event, + EventContext, + LegacyEvent, + makeCloudFunction, + MakeCloudFunctionArgs, + Change, +} from '../src/cloud-functions'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { @@ -46,7 +52,9 @@ describe('makeCloudFunction', () => { }); it('should construct the right context for legacy event format', () => { - let args: any = _.assign({}, cloudFunctionArgs, {handler: (data: any, context: EventContext) => context}); + let args: any = _.assign({}, cloudFunctionArgs, { + handler: (data: any, context: EventContext) => context, + }); let cf = makeCloudFunction(args); let test: LegacyEvent = { eventId: '00000', @@ -69,7 +77,9 @@ describe('makeCloudFunction', () => { }); it('should construct the right context for new event format', () => { - let args: any = _.assign({}, cloudFunctionArgs, { handler: (data: any, context: EventContext) => context }); + let args: any = _.assign({}, cloudFunctionArgs, { + handler: (data: any, context: EventContext) => context, + }); let cf = makeCloudFunction(args); let test: Event = { context: { @@ -225,7 +235,9 @@ describe('Change', () => { it('should handle deleted values', () => { const sparseBefore = { baz: 'qux' }; const fieldMask = 'baz'; - expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal( { + expect( + Change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ foo: 'bar', num: 2, obj: { @@ -239,7 +251,9 @@ describe('Change', () => { it('should handle created values', () => { const sparseBefore = {}; const fieldMask = 'num,obj.a'; - expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({ + expect( + Change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ foo: 'bar', obj: { b: 2, @@ -255,7 +269,9 @@ describe('Change', () => { }, }; const fieldMask = 'num,obj.a'; - expect(Change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({ + expect( + Change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ foo: 'bar', num: 3, obj: { @@ -287,7 +303,7 @@ describe('Change', () => { before: { foo: 'bar' }, after: { foo: 'faz' }, }, - customizer, + customizer ); expect(created.before).to.deep.equal({ foo: 'bar', diff --git a/spec/config.spec.ts b/spec/config.spec.ts index aae3ea94d..c72efa633 100644 --- a/spec/config.spec.ts +++ b/spec/config.spec.ts @@ -25,7 +25,6 @@ import { expect } from 'chai'; import { config, firebaseConfig } from '../src/config'; describe('config()', () => { - afterEach(() => { mockRequire.stopAll(); delete config.singleton; @@ -38,7 +37,7 @@ describe('config()', () => { mockRequire('../../../.runtimeconfig.json', { foo: 'bar', firebase: {} }); let loaded = config(); expect(loaded).to.not.have.property('firebase'); - expect(loaded).to.have.property('foo','bar'); + expect(loaded).to.have.property('foo', 'bar'); }); it('does not provide firebase config if .runtimeconfig.json not invalid', () => { @@ -55,14 +54,20 @@ describe('config()', () => { process.env.FIREBASE_PROJECT = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(firebaseConfig()).to.have.property( + 'databaseURL', + 'foo@firebaseio.com' + ); }); it('loads Firebase configs from FIREBASE_CONFIG env variable', () => { process.env.FIREBASE_CONFIG = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(firebaseConfig()).to.have.property( + 'databaseURL', + 'foo@firebaseio.com' + ); }); it('prefers FIREBASE_CONFIG over FIREBASE_PROJECT', () => { @@ -85,7 +90,10 @@ describe('config()', () => { }, foo: 'bar', }); - expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(firebaseConfig()).to.have.property( + 'databaseURL', + 'foo@firebaseio.com' + ); expect(config()).to.have.property('foo', 'bar'); }); @@ -93,11 +101,14 @@ describe('config()', () => { process.env.CLOUD_RUNTIME_CONFIG = 'another.json'; mockRequire('another.json', { foo: 'bar', firebase: {} }); expect(firebaseConfig()).to.not.be.null; - expect(config()).to.have.property('foo','bar'); + expect(config()).to.have.property('foo', 'bar'); }); it('accepts full JSON in env.CLOUD_RUNTIME_CONFIG', () => { - process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({foo: 'bar', firebase:{} }); + process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({ + foo: 'bar', + firebase: {}, + }); expect(firebaseConfig()).to.not.be.null; expect(config()).to.have.property('foo', 'bar'); }); @@ -107,7 +118,10 @@ describe('config()', () => { process.env.FIREBASE_PROJECT = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - expect(firebaseConfig()).to.have.property('databaseURL', 'foo@firebaseio.com'); + expect(firebaseConfig()).to.have.property( + 'databaseURL', + 'foo@firebaseio.com' + ); expect(config()).to.have.property('foo', 'bar'); }); }); diff --git a/spec/fixtures/credential/key.d.ts b/spec/fixtures/credential/key.d.ts index fc5556fa8..1c1e4dbe7 100644 --- a/spec/fixtures/credential/key.d.ts +++ b/spec/fixtures/credential/key.d.ts @@ -1,5 +1,5 @@ /* tslint:disable */ -declare module "*key.json" { +declare module '*key.json' { const type: string; const user_id: string; const project_id: string; diff --git a/spec/fixtures/http.ts b/spec/fixtures/http.ts index d88a163c0..ae9545780 100644 --- a/spec/fixtures/http.ts +++ b/spec/fixtures/http.ts @@ -39,14 +39,15 @@ export function mockRCVariableFetch( data: any, token: string = 'thetoken' ): nock.Scope { - let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com') - .get(`/v1beta1/projects/${projectId}/configs/firebase/variables/${varName}`); + let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com').get( + `/v1beta1/projects/${projectId}/configs/firebase/variables/${varName}` + ); if (token) { mock = mock.matchHeader('Authorization', `Bearer ${token}`); } - return mock.reply(200, {text: JSON.stringify(data)}); + return mock.reply(200, { text: JSON.stringify(data) }); } export function mockMetaVariableWatch( @@ -55,8 +56,9 @@ export function mockMetaVariableWatch( token: string = 'thetoken', updateTime: string = new Date().toISOString() ): nock.Scope { - let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com') - .post(`/v1beta1/projects/${projectId}/configs/firebase/variables/meta:watch`); + let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com').post( + `/v1beta1/projects/${projectId}/configs/firebase/variables/meta:watch` + ); if (token) { mock = mock.matchHeader('Authorization', `Bearer ${token}`); @@ -69,9 +71,14 @@ export function mockMetaVariableWatch( }); } -export function mockMetaVariableWatchTimeout(projectId: string, delay: number, token?: string): nock.Scope { - let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com') - .post(`/v1beta1/projects/${projectId}/configs/firebase/variables/meta:watch`); +export function mockMetaVariableWatchTimeout( + projectId: string, + delay: number, + token?: string +): nock.Scope { + let mock: nock.Scope = nock('https://runtimeconfig.googleapis.com').post( + `/v1beta1/projects/${projectId}/configs/firebase/variables/meta:watch` + ); if (token) { mock = mock.matchHeader('Authorization', `Bearer ${token}`); @@ -80,18 +87,29 @@ export function mockMetaVariableWatchTimeout(projectId: string, delay: number, t return mock.delay(delay).reply(502); } -export function mockCreateToken(token: AccessToken = {access_token: 'aToken', expires_in: 3600}): nock.Scope { - let mock: nock.Scope = nock('https://accounts.google.com').post('/o/oauth2/token'); +export function mockCreateToken( + token: AccessToken = { access_token: 'aToken', expires_in: 3600 } +): nock.Scope { + let mock: nock.Scope = nock('https://accounts.google.com').post( + '/o/oauth2/token' + ); return mock.reply(200, token); } -export function mockRefreshToken(token: AccessToken = {access_token: 'aToken', expires_in: 3600}): nock.Scope { - let mock: nock.Scope = nock('https://www.googleapis.com').post('/oauth2/v4/token'); +export function mockRefreshToken( + token: AccessToken = { access_token: 'aToken', expires_in: 3600 } +): nock.Scope { + let mock: nock.Scope = nock('https://www.googleapis.com').post( + '/oauth2/v4/token' + ); return mock.reply(200, token); } -export function mockMetadataServiceToken(token: AccessToken = {access_token: 'aToken', expires_in: 3600}): nock.Scope { - let mock: nock.Scope = nock('http://metadata.google.internal') - .get('/computeMetadata/v1beta1/instance/service-accounts/default/token'); +export function mockMetadataServiceToken( + token: AccessToken = { access_token: 'aToken', expires_in: 3600 } +): nock.Scope { + let mock: nock.Scope = nock('http://metadata.google.internal').get( + '/computeMetadata/v1beta1/instance/service-accounts/default/token' + ); return mock.reply(200, token); } diff --git a/spec/providers/analytics.spec.ts b/spec/providers/analytics.spec.ts index cef1d8328..e2a58081d 100644 --- a/spec/providers/analytics.spec.ts +++ b/spec/providers/analytics.spec.ts @@ -40,7 +40,8 @@ describe('Analytics Functions', () => { const cloudFunction = analytics.event('first_open').onLog(() => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { - eventType: 'providers/google.firebase.analytics/eventTypes/event.log', + eventType: + 'providers/google.firebase.analytics/eventTypes/event.log', resource: 'projects/project1/events/first_open', service: 'app-measurement.com', }, @@ -50,7 +51,9 @@ describe('Analytics Functions', () => { describe('#dataConstructor', () => { it('should handle an event with the appropriate fields', () => { - const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + const cloudFunction = analytics + .event('first_open') + .onLog((data: analytics.AnalyticsEvent) => data); // The event data delivered over the wire will be the JSON for an AnalyticsEvent: // https://firebase.google.com/docs/auth/admin/manage-users#retrieve_user_data @@ -75,15 +78,16 @@ describe('Analytics Functions', () => { }); it('should remove xValues', () => { - const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + const cloudFunction = analytics + .event('first_open') + .onLog((data: analytics.AnalyticsEvent) => data); // Incoming events will have four kinds of "xValue" fields: "intValue", // "stringValue", "doubleValue" and "floatValue". We expect those to get // flattened away, leaving just their values. let event: LegacyEvent = { data: { - eventDim: - [ + eventDim: [ { date: '20170202', name: 'Loaded_In_Background', @@ -135,12 +139,13 @@ describe('Analytics Functions', () => { }); it('should change microsecond timestamps to ISO strings, and offsets to millis', () => { - const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + const cloudFunction = analytics + .event('first_open') + .onLog((data: analytics.AnalyticsEvent) => data); let event: LegacyEvent = { data: { - eventDim: - [ + eventDim: [ { date: '20170202', name: 'Loaded_In_Background', @@ -183,7 +188,9 @@ describe('Analytics Functions', () => { }); it('should populate currency fields', () => { - const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + const cloudFunction = analytics + .event('first_open') + .onLog((data: analytics.AnalyticsEvent) => data); // Incoming events will have four kinds of "xValue" fields: "intValue", // "stringValue", "doubleValue" and "floatValue". We expect those to get @@ -196,8 +203,7 @@ describe('Analytics Functions', () => { // like to rename and scale down to milliseconds. let event: LegacyEvent = { data: { - eventDim: - [ + eventDim: [ { date: '20170202', name: 'Loaded_In_Background', @@ -211,26 +217,33 @@ describe('Analytics Functions', () => { reportingDate: '20170202', name: 'Loaded_In_Background', params: {}, - valueInUSD: 123.4, // Field renamed Usd -> USD. + valueInUSD: 123.4, // Field renamed Usd -> USD. }); }); it('should recognize all the fields the payload can contain', () => { - const cloudFunction = analytics.event('first_open').onLog((data: analytics.AnalyticsEvent) => data); + const cloudFunction = analytics + .event('first_open') + .onLog((data: analytics.AnalyticsEvent) => data); // The payload in analytics_spec_input contains all possible fields at least once. - return expect(cloudFunction(analytics_spec_input.fullPayload)) - .to.eventually.deep.equal(analytics_spec_input.data); + return expect( + cloudFunction(analytics_spec_input.fullPayload) + ).to.eventually.deep.equal(analytics_spec_input.data); }); }); }); describe('process.env.GCLOUD_PROJECT not set', () => { it('should not throw if __trigger is not accessed', () => { - expect(() => analytics.event('event').onLog(() => null)).to.not.throw(Error); + expect(() => analytics.event('event').onLog(() => null)).to.not.throw( + Error + ); }); it('should throw when trigger is accessed', () => { - expect(() => analytics.event('event').onLog(() => null).__trigger).to.throw(Error); + expect( + () => analytics.event('event').onLog(() => null).__trigger + ).to.throw(Error); }); it('should not throw when #run is called', () => { diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index 989f4cf22..603b0e00e 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -69,8 +69,12 @@ describe('Auth Functions', () => { let event: any; before(() => { - cloudFunctionCreate = auth.user().onCreate((data: firebase.auth.UserRecord) => data); - cloudFunctionDelete = auth.user().onDelete((data: firebase.auth.UserRecord) => data); + cloudFunctionCreate = auth + .user() + .onCreate((data: firebase.auth.UserRecord) => data); + cloudFunctionDelete = auth + .user() + .onDelete((data: firebase.auth.UserRecord) => data); event = { data: { metadata: { @@ -84,12 +88,20 @@ describe('Auth Functions', () => { it('should transform wire format for UserRecord into v5.0.0 format', () => { return Promise.all([ cloudFunctionCreate(event).then((data: any) => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + expect(data.metadata.creationTime).to.equal( + '2016-12-15T19:37:37.059Z' + ); + expect(data.metadata.lastSignInTime).to.equal( + '2017-01-01T00:00:00.000Z' + ); }), cloudFunctionDelete(event).then((data: any) => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + expect(data.metadata.creationTime).to.equal( + '2016-12-15T19:37:37.059Z' + ); + expect(data.metadata.lastSignInTime).to.equal( + '2017-01-01T00:00:00.000Z' + ); }), ]); }); @@ -106,12 +118,20 @@ describe('Auth Functions', () => { return Promise.all([ cloudFunctionCreate(newEvent).then((data: any) => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + expect(data.metadata.creationTime).to.equal( + '2016-12-15T19:37:37.059Z' + ); + expect(data.metadata.lastSignInTime).to.equal( + '2017-01-01T00:00:00.000Z' + ); }), cloudFunctionDelete(newEvent).then((data: any) => { - expect(data.metadata.creationTime).to.equal('2016-12-15T19:37:37.059Z'); - expect(data.metadata.lastSignInTime).to.equal('2017-01-01T00:00:00.000Z'); + expect(data.metadata.creationTime).to.equal( + '2016-12-15T19:37:37.059Z' + ); + expect(data.metadata.lastSignInTime).to.equal( + '2017-01-01T00:00:00.000Z' + ); }), ]); }); @@ -120,7 +140,7 @@ describe('Auth Functions', () => { describe('userRecordConstructor', () => { it('will provide falsey values for fields that are not in raw wire data', () => { - const record = auth.userRecordConstructor({ uid: '123'}); + const record = auth.userRecordConstructor({ uid: '123' }); expect(record.toJSON()).to.deep.equal({ uid: '123', email: null, diff --git a/spec/providers/crashlytics.spec.ts b/spec/providers/crashlytics.spec.ts index 2b678eefb..517324590 100644 --- a/spec/providers/crashlytics.spec.ts +++ b/spec/providers/crashlytics.spec.ts @@ -54,7 +54,8 @@ describe('Crashlytics Functions', () => { const cloudFunction = crashlytics.issue().onRegressed(data => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.regressed', + eventType: + 'providers/firebase.crashlytics/eventTypes/issue.regressed', resource: 'projects/project1', service: 'fabric.io', }, @@ -67,7 +68,8 @@ describe('Crashlytics Functions', () => { const cloudFunction = crashlytics.issue().onVelocityAlert(data => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.velocityAlert', + eventType: + 'providers/firebase.crashlytics/eventTypes/issue.velocityAlert', resource: 'projects/project1', service: 'fabric.io', }, @@ -82,7 +84,9 @@ describe('Crashlytics Functions', () => { }); it('should throw if __trigger is accessed', () => { - expect(() => crashlytics.issue().onNew(() => null).__trigger).to.throw(Error); + expect(() => crashlytics.issue().onNew(() => null).__trigger).to.throw( + Error + ); }); it('should not throw when #run is called', () => { diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index d0cc20f9e..55f8c2b4d 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -21,12 +21,11 @@ // SOFTWARE. import * as database from '../../src/providers/database'; -import { expect as expect } from 'chai'; +import { expect } from 'chai'; import { apps as appsNamespace } from '../../src/apps'; import { applyChange } from '../../src/utils'; describe('Database Functions', () => { - describe('DatabaseBuilder', () => { // TODO add tests for building a data or change based on the type of operation @@ -44,17 +43,24 @@ describe('Database Functions', () => { describe('#onWrite()', () => { it('should return "ref.write" as the event type', () => { - let eventType = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.write'); + let eventType = database.ref('foo').onWrite(() => null).__trigger + .eventTrigger.eventType; + expect(eventType).to.eq( + 'providers/google.firebase.database/eventTypes/ref.write' + ); }); it('should construct a proper resource path', () => { - let resource = database.ref('foo').onWrite(() => null).__trigger.eventTrigger.resource; + let resource = database.ref('foo').onWrite(() => null).__trigger + .eventTrigger.resource; expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); }); it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onWrite(() => null); + let func = database + .instance('custom') + .ref('foo') + .onWrite(() => null); let resource = func.__trigger.eventTrigger.resource; expect(resource).to.eq('projects/_/instances/custom/refs/foo'); }); @@ -77,17 +83,24 @@ describe('Database Functions', () => { describe('#onCreate()', () => { it('should return "ref.create" as the event type', () => { - let eventType = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.create'); + let eventType = database.ref('foo').onCreate(() => null).__trigger + .eventTrigger.eventType; + expect(eventType).to.eq( + 'providers/google.firebase.database/eventTypes/ref.create' + ); }); it('should construct a proper resource path', () => { - let resource = database.ref('foo').onCreate(() => null).__trigger.eventTrigger.resource; + let resource = database.ref('foo').onCreate(() => null).__trigger + .eventTrigger.resource; expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); }); it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onCreate(() => null); + let func = database + .instance('custom') + .ref('foo') + .onCreate(() => null); let resource = func.__trigger.eventTrigger.resource; expect(resource).to.eq('projects/_/instances/custom/refs/foo'); }); @@ -110,17 +123,24 @@ describe('Database Functions', () => { describe('#onUpdate()', () => { it('should return "ref.update" as the event type', () => { - let eventType = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.update'); + let eventType = database.ref('foo').onUpdate(() => null).__trigger + .eventTrigger.eventType; + expect(eventType).to.eq( + 'providers/google.firebase.database/eventTypes/ref.update' + ); }); it('should construct a proper resource path', () => { - let resource = database.ref('foo').onUpdate(() => null).__trigger.eventTrigger.resource; + let resource = database.ref('foo').onUpdate(() => null).__trigger + .eventTrigger.resource; expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); }); it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onUpdate(() => null); + let func = database + .instance('custom') + .ref('foo') + .onUpdate(() => null); let resource = func.__trigger.eventTrigger.resource; expect(resource).to.eq('projects/_/instances/custom/refs/foo'); }); @@ -143,17 +163,24 @@ describe('Database Functions', () => { describe('#onDelete()', () => { it('should return "ref.delete" as the event type', () => { - let eventType = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq('providers/google.firebase.database/eventTypes/ref.delete'); + let eventType = database.ref('foo').onDelete(() => null).__trigger + .eventTrigger.eventType; + expect(eventType).to.eq( + 'providers/google.firebase.database/eventTypes/ref.delete' + ); }); it('should construct a proper resource path', () => { - let resource = database.ref('foo').onDelete(() => null).__trigger.eventTrigger.resource; + let resource = database.ref('foo').onDelete(() => null).__trigger + .eventTrigger.resource; expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); }); it('should let developers choose a database instance', () => { - let func = database.instance('custom').ref('foo').onDelete(() => null); + let func = database + .instance('custom') + .ref('foo') + .onDelete(() => null); let resource = func.__trigger.eventTrigger.resource; expect(resource).to.eq('projects/_/instances/custom/refs/foo'); }); @@ -173,16 +200,19 @@ describe('Database Functions', () => { }); }); }); - }); describe('process.env.FIREBASE_CONFIG not set', () => { it('should not throw if __trigger is not accessed', () => { - expect(() => database.ref('/path').onWrite(() => null)).to.not.throw(Error); + expect(() => database.ref('/path').onWrite(() => null)).to.not.throw( + Error + ); }); it('should throw when trigger is accessed', () => { - expect(() => database.ref('/path').onWrite(() => null).__trigger).to.throw(Error); + expect( + () => database.ref('/path').onWrite(() => null).__trigger + ).to.throw(Error); }); it('should not throw when #run is called', () => { @@ -193,7 +223,9 @@ describe('Database Functions', () => { describe('resourceToInstanceAndPath', () => { it('should return the correct instance and path strings', () => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/foo/refs/bar'); + let [instance, path] = database.resourceToInstanceAndPath( + 'projects/_/instances/foo/refs/bar' + ); expect(instance).to.equal('https://foo.firebaseio.com'); expect(path).to.equal('/bar'); }); @@ -204,19 +236,18 @@ describe('Database Functions', () => { const apps = new appsNamespace.Apps(); let populate = (data: any) => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/other-subdomain/refs/foo'); - subject = new database.DataSnapshot( - data, - path, - apps.admin, - instance + let [instance, path] = database.resourceToInstanceAndPath( + 'projects/_/instances/other-subdomain/refs/foo' ); + subject = new database.DataSnapshot(data, path, apps.admin, instance); }; describe('#ref: firebase.database.Reference', () => { it('should return a ref for correct instance, not the default instance', () => { populate({}); - expect(subject.ref.toJSON()).to.equal('https://other-subdomain.firebaseio.com/foo'); + expect(subject.ref.toJSON()).to.equal( + 'https://other-subdomain.firebaseio.com/foo' + ); }); }); @@ -244,7 +275,7 @@ describe('Database Functions', () => { expect(subject.val()).to.deep.equal(['a', 'b', { c: 'd' }]); populate({ 0: 'a', 2: 'b', 3: { c: 'd' } }); expect(subject.val()).to.deep.equal(['a', , 'b', { c: 'd' }]); - populate({ 'foo': { 0: 'a', 1: 'b' } }); + populate({ foo: { 0: 'a', 1: 'b' } }); expect(subject.val()).to.deep.equal({ foo: ['a', 'b'] }); }); @@ -262,15 +293,20 @@ describe('Database Functions', () => { // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995) it('should return correct values when data has "length" property', () => { - populate({ length: 3, foo: 'bar' }); - expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar'}); + populate({ length: 3, foo: 'bar' }); + expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar' }); }); }); describe('#child(): DataSnapshot', () => { it('should work with multiple calls', () => { populate({ a: { b: { c: 'd' } } }); - expect(subject.child('a').child('b/c').val()).to.equal('d'); + expect( + subject + .child('a') + .child('b/c') + .val() + ).to.equal('d'); }); }); @@ -391,7 +427,9 @@ describe('Database Functions', () => { }); it('should return null for the root', () => { - let [instance, path] = database.resourceToInstanceAndPath('projects/_/instances/foo/refs/'); + let [instance, path] = database.resourceToInstanceAndPath( + 'projects/_/instances/foo/refs/' + ); const snapshot = new database.DataSnapshot( null, path, diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index a8a44c1fa..cdd9d4c0e 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -26,10 +26,10 @@ import { expect } from 'chai'; describe('Firestore Functions', () => { let constructValue = (fields: any) => { return { - 'fields': fields, - 'name': 'projects/pid/databases/(default)/documents/collection/123', - 'createTime': '2017-06-02T18:48:58.920638Z', - 'updateTime': '2017-07-02T18:48:58.920638Z', + fields: fields, + name: 'projects/pid/databases/(default)/documents/collection/123', + createTime: '2017-06-02T18:48:58.920638Z', + updateTime: '2017-07-02T18:48:58.920638Z', }; }; @@ -53,55 +53,92 @@ describe('Firestore Functions', () => { }); it('should allow terse constructors', () => { - let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; + let resource = + 'projects/project1/databases/(default)/documents/users/{uid}'; let cloudFunction = firestore.document('users/{uid}').onWrite(() => null); - expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger(resource, 'document.write')); + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(resource, 'document.write') + ); }); it('should allow custom namespaces', () => { - let resource = 'projects/project1/databases/(default)/documents@v2/users/{uid}'; - let cloudFunction = firestore.namespace('v2').document('users/{uid}').onWrite(() => null); - expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger(resource, 'document.write')); + let resource = + 'projects/project1/databases/(default)/documents@v2/users/{uid}'; + let cloudFunction = firestore + .namespace('v2') + .document('users/{uid}') + .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(resource, 'document.write') + ); }); it('should allow custom databases', () => { let resource = 'projects/project1/databases/myDB/documents/users/{uid}'; - let cloudFunction = firestore.database('myDB').document('users/{uid}').onWrite(() => null); - expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger(resource, 'document.write')); + let cloudFunction = firestore + .database('myDB') + .document('users/{uid}') + .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(resource, 'document.write') + ); }); it('should allow both custom database and namespace', () => { - let resource = 'projects/project1/databases/myDB/documents@v2/users/{uid}'; - let cloudFunction = firestore.database('myDB').namespace('v2').document('users/{uid}').onWrite(() => null); - expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger(resource, 'document.write')); + let resource = + 'projects/project1/databases/myDB/documents@v2/users/{uid}'; + let cloudFunction = firestore + .database('myDB') + .namespace('v2') + .document('users/{uid}') + .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(resource, 'document.write') + ); }); it('onCreate should have the "document.create" eventType', () => { - let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; - let eventType = firestore.document('users/{uid}').onCreate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq(expectedTrigger(resource, 'document.create').eventTrigger.eventType); + let resource = + 'projects/project1/databases/(default)/documents/users/{uid}'; + let eventType = firestore.document('users/{uid}').onCreate(() => null) + .__trigger.eventTrigger.eventType; + expect(eventType).to.eq( + expectedTrigger(resource, 'document.create').eventTrigger.eventType + ); }); it('onUpdate should have the "document.update" eventType', () => { - let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; - let eventType = firestore.document('users/{uid}').onUpdate(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq(expectedTrigger(resource, 'document.update').eventTrigger.eventType); + let resource = + 'projects/project1/databases/(default)/documents/users/{uid}'; + let eventType = firestore.document('users/{uid}').onUpdate(() => null) + .__trigger.eventTrigger.eventType; + expect(eventType).to.eq( + expectedTrigger(resource, 'document.update').eventTrigger.eventType + ); }); it('onDelete should have the "document.delete" eventType', () => { - let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; - let eventType = firestore.document('users/{uid}').onDelete(() => null).__trigger.eventTrigger.eventType; - expect(eventType).to.eq(expectedTrigger(resource, 'document.delete').eventTrigger.eventType); + let resource = + 'projects/project1/databases/(default)/documents/users/{uid}'; + let eventType = firestore.document('users/{uid}').onDelete(() => null) + .__trigger.eventTrigger.eventType; + expect(eventType).to.eq( + expectedTrigger(resource, 'document.delete').eventTrigger.eventType + ); }); }); describe('process.env.GCLOUD_PROJECT not set', () => { it('should not throw if __trigger is not accessed', () => { - expect(() => firestore.document('input').onCreate(() => null)).to.not.throw(Error); + expect(() => + firestore.document('input').onCreate(() => null) + ).to.not.throw(Error); }); it('should throw when trigger is accessed', () => { - expect(() => firestore.document('input').onCreate(() => null).__trigger).to.throw(Error); + expect( + () => firestore.document('input').onCreate(() => null).__trigger + ).to.throw(Error); }); it('should not throw when #run is called', () => { @@ -111,53 +148,61 @@ describe('Firestore Functions', () => { }); describe('dataConstructor', () => { - function constructEvent(oldValue: object, value: object, eventType: string) { + function constructEvent( + oldValue: object, + value: object, + eventType: string + ) { return { - 'data': { - 'oldValue': oldValue, - 'value': value, + data: { + oldValue: oldValue, + value: value, }, - 'context': {}, + context: {}, }; } function createOldValue() { return constructValue({ - 'key1': { - 'booleanValue': false, + key1: { + booleanValue: false, }, - 'key2': { - 'integerValue': '111', + key2: { + integerValue: '111', }, }); } function createValue() { return constructValue({ - 'key1': { - 'booleanValue': true, + key1: { + booleanValue: true, }, - 'key2': { - 'integerValue': '123', + key2: { + integerValue: '123', }, }); } it('constructs appropriate fields and getters for event.data on "document.write" events', () => { - let testFunction = firestore.document('path').onWrite((change) => { - expect(change.before.data()).to.deep.equal({key1: false, key2: 111}); + let testFunction = firestore.document('path').onWrite(change => { + expect(change.before.data()).to.deep.equal({ key1: false, key2: 111 }); expect(change.before.get('key1')).to.equal(false); - expect(change.after.data()).to.deep.equal({key1: true, key2: 123}); + expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 }); expect(change.after.get('key1')).to.equal(true); return true; // otherwise will get warning about returning undefined }); - let data = constructEvent(createOldValue(), createValue(), 'document.write'); + let data = constructEvent( + createOldValue(), + createValue(), + 'document.write' + ); return testFunction(data); }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.create" events', () => { - let testFunction = firestore.document('path').onCreate((data) => { - expect(data.data()).to.deep.equal({key1: true, key2: 123}); + let testFunction = firestore.document('path').onCreate(data => { + expect(data.data()).to.deep.equal({ key1: true, key2: 123 }); expect(data.get('key1')).to.equal(true); return true; // otherwise will get warning about returning undefined }); @@ -166,20 +211,24 @@ describe('Firestore Functions', () => { }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.update" events', () => { - let testFunction = firestore.document('path').onUpdate((change) => { - expect(change.before.data()).to.deep.equal({key1: false, key2: 111}); + let testFunction = firestore.document('path').onUpdate(change => { + expect(change.before.data()).to.deep.equal({ key1: false, key2: 111 }); expect(change.before.get('key1')).to.equal(false); - expect(change.after.data()).to.deep.equal({key1: true, key2: 123}); + expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 }); expect(change.after.get('key1')).to.equal(true); return true; // otherwise will get warning about returning undefined }); - let data = constructEvent(createOldValue(), createValue(), 'document.update'); + let data = constructEvent( + createOldValue(), + createValue(), + 'document.update' + ); return testFunction(data); }).timeout(5000); it('constructs appropriate fields and getters for event.data on "document.delete" events', () => { - let testFunction = firestore.document('path').onDelete((data) => { - expect(data.data()).to.deep.equal({key1: false, key2: 111}); + let testFunction = firestore.document('path').onDelete(data => { + expect(data.data()).to.deep.equal({ key1: false, key2: 111 }); expect(data.get('key1')).to.equal(false); return true; // otherwise will get warning about returning undefined }); @@ -193,75 +242,72 @@ describe('Firestore Functions', () => { it('should parse int values', () => { let snapshot = firestore.snapshotConstructor({ data: { - value: constructValue({'key': {'integerValue': '123'}}), + value: constructValue({ key: { integerValue: '123' } }), }, }); - expect(snapshot.data()).to.deep.equal({'key': 123}); + expect(snapshot.data()).to.deep.equal({ key: 123 }); }); it('should parse double values', () => { let snapshot = firestore.snapshotConstructor({ data: { - value: constructValue({'key': {'doubleValue': 12.34}}), + value: constructValue({ key: { doubleValue: 12.34 } }), }, }); - expect(snapshot.data()).to.deep.equal({'key': 12.34}); + expect(snapshot.data()).to.deep.equal({ key: 12.34 }); }); it('should parse null values', () => { let snapshot = firestore.snapshotConstructor({ data: { - value: constructValue({'key': {'nullValue': null}}), + value: constructValue({ key: { nullValue: null } }), }, }); - expect(snapshot.data()).to.deep.equal({'key': null}); + expect(snapshot.data()).to.deep.equal({ key: null }); }); it('should parse boolean values', () => { let snapshot = firestore.snapshotConstructor({ data: { - value: constructValue({'key': {'booleanValue': true}}), + value: constructValue({ key: { booleanValue: true } }), }, }); - expect(snapshot.data()).to.deep.equal({'key': true}); + expect(snapshot.data()).to.deep.equal({ key: true }); }); it('should parse string values', () => { let snapshot = firestore.snapshotConstructor({ data: { - value: constructValue({'key': {'stringValue': 'foo'}}), + value: constructValue({ key: { stringValue: 'foo' } }), }, }); - expect(snapshot.data()).to.deep.equal({'key': 'foo'}); + expect(snapshot.data()).to.deep.equal({ key: 'foo' }); }); it('should parse array values', () => { let raw = constructValue({ - 'key': { - 'arrayValue': { - 'values': [ - { 'integerValue': '1' }, - { 'integerValue': '2' }, - ], + key: { + arrayValue: { + values: [{ integerValue: '1' }, { integerValue: '2' }], }, }, }); let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'key': [1, 2]}); + expect(snapshot.data()).to.deep.equal({ key: [1, 2] }); }); it('should parse object values', () => { let raw = constructValue({ - 'keyParent': { - 'mapValue': { - 'fields': { - 'key1': { - 'stringValue': 'val1', + keyParent: { + mapValue: { + fields: { + key1: { + stringValue: 'val1', }, - 'key2': { - 'stringValue': 'val2', + key2: { + stringValue: 'val2', }, }, }, @@ -270,19 +316,21 @@ describe('Firestore Functions', () => { let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'keyParent': {'key1':'val1', 'key2':'val2'}}); + expect(snapshot.data()).to.deep.equal({ + keyParent: { key1: 'val1', key2: 'val2' }, + }); }); it('should parse GeoPoint values', () => { let raw = constructValue({ - 'geoPointValue': { - 'mapValue': { - 'fields': { - 'latitude': { - 'doubleValue': 40.73, + geoPointValue: { + mapValue: { + fields: { + latitude: { + doubleValue: 40.73, }, - 'longitude': { - 'doubleValue': -73.93, + longitude: { + doubleValue: -73.93, }, }, }, @@ -291,16 +339,19 @@ describe('Firestore Functions', () => { let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'geoPointValue': { - 'latitude': 40.73, - 'longitude': -73.93, - }}); + expect(snapshot.data()).to.deep.equal({ + geoPointValue: { + latitude: 40.73, + longitude: -73.93, + }, + }); }); it('should parse reference values', () => { let raw = constructValue({ - 'referenceVal': { - 'referenceValue': 'projects/proj1/databases/(default)/documents/doc1/id', + referenceVal: { + referenceValue: + 'projects/proj1/databases/(default)/documents/doc1/id', }, }); let snapshot = firestore.snapshotConstructor({ @@ -311,40 +362,45 @@ describe('Firestore Functions', () => { it('should parse timestamp values with precision to the millisecond', () => { let raw = constructValue({ - 'timestampVal': { - 'timestampValue': '2017-06-13T00:58:40.349Z', + timestampVal: { + timestampValue: '2017-06-13T00:58:40.349Z', }, }); let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'timestampVal': new Date('2017-06-13T00:58:40.349Z')}); + expect(snapshot.data()).to.deep.equal({ + timestampVal: new Date('2017-06-13T00:58:40.349Z'), + }); }); it('should parse timestamp values with precision to the second', () => { let raw = constructValue({ - 'timestampVal': { - 'timestampValue': '2017-06-13T00:58:40Z', + timestampVal: { + timestampValue: '2017-06-13T00:58:40Z', }, }); let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'timestampVal': new Date('2017-06-13T00:58:40Z')}); - + expect(snapshot.data()).to.deep.equal({ + timestampVal: new Date('2017-06-13T00:58:40Z'), + }); }); it('should parse binary values', () => { // Format defined in https://developers.google.com/discovery/v1/type-format let raw = constructValue({ - 'binaryVal': { - 'bytesValue': 'Zm9vYmFy', + binaryVal: { + bytesValue: 'Zm9vYmFy', }, }); let snapshot = firestore.snapshotConstructor({ data: { value: raw }, }); - expect(snapshot.data()).to.deep.equal({'binaryVal': new Buffer('foobar')}); + expect(snapshot.data()).to.deep.equal({ + binaryVal: new Buffer('foobar'), + }); }); }); @@ -353,13 +409,13 @@ describe('Firestore Functions', () => { before(() => { snapshot = firestore.snapshotConstructor({ - 'data': { - 'value': { - 'fields': {'key': {'integerValue': '1'}}, - 'createTime': '2017-06-17T14:45:17.876479Z', - 'updateTime': '2017-08-31T18:05:26.928527Z', - 'readTime': '2017-07-31T18:23:26.928527Z', - 'name': 'projects/pid/databases/(default)/documents/collection/123', + data: { + value: { + fields: { key: { integerValue: '1' } }, + createTime: '2017-06-17T14:45:17.876479Z', + updateTime: '2017-08-31T18:05:26.928527Z', + readTime: '2017-07-31T18:23:26.928527Z', + name: 'projects/pid/databases/(default)/documents/collection/123', }, }, }); @@ -370,7 +426,10 @@ describe('Firestore Functions', () => { }); it('should support #ref', () => { - expect(Object.keys(snapshot.ref)).to.deep.equal(['_firestore', '_referencePath']); + expect(Object.keys(snapshot.ref)).to.deep.equal([ + '_firestore', + '_referencePath', + ]); expect(snapshot.ref.path).to.equal('collection/123'); }); @@ -379,25 +438,31 @@ describe('Firestore Functions', () => { }); it('should support #createTime', () => { - expect(Date.parse(snapshot.createTime)).to.equal(Date.parse('2017-06-17T14:45:17.876479Z')); + expect(Date.parse(snapshot.createTime)).to.equal( + Date.parse('2017-06-17T14:45:17.876479Z') + ); }); it('should support #updateTime', () => { - expect(Date.parse(snapshot.updateTime)).to.equal(Date.parse('2017-08-31T18:05:26.928527Z')); + expect(Date.parse(snapshot.updateTime)).to.equal( + Date.parse('2017-08-31T18:05:26.928527Z') + ); }); it('should support #readTime', () => { - expect(Date.parse(snapshot.readTime)).to.equal(Date.parse('2017-07-31T18:23:26.928527Z')); + expect(Date.parse(snapshot.readTime)).to.equal( + Date.parse('2017-07-31T18:23:26.928527Z') + ); }); }); describe('Handle empty and non-existent documents', () => { it('constructs non-existent DocumentSnapshot when whole document deleted', () => { let snapshot = firestore.snapshotConstructor({ - 'data': { - 'value': {}, // value is empty when the whole document is deleted + data: { + value: {}, // value is empty when the whole document is deleted }, - 'resource': 'projects/pid/databases/(default)/documents/collection/123', + resource: 'projects/pid/databases/(default)/documents/collection/123', }); expect(snapshot.exists).to.be.false; expect(snapshot.ref.path).to.equal('collection/123'); @@ -405,11 +470,12 @@ describe('Firestore Functions', () => { it('constructs existent DocumentSnapshot with empty data when all fields of document deleted', () => { let snapshot = firestore.snapshotConstructor({ - 'data': { - 'value': { // value is not empty when document still exists - 'createTime': '2017-06-02T18:48:58.920638Z', - 'updateTime': '2017-07-02T18:48:58.920638Z', - 'name': 'projects/pid/databases/(default)/documents/collection/123', + data: { + value: { + // value is not empty when document still exists + createTime: '2017-06-02T18:48:58.920638Z', + updateTime: '2017-07-02T18:48:58.920638Z', + name: 'projects/pid/databases/(default)/documents/collection/123', }, }, }); diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index 6e3a89032..cc20c1cb0 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -36,7 +36,7 @@ describe('CloudHttpsBuilder', () => { let result = https.onRequest((req, resp) => { resp.send(200); }); - expect(result.__trigger).to.deep.equal({httpsTrigger: {}}); + expect(result.__trigger).to.deep.equal({ httpsTrigger: {} }); }); }); }); @@ -46,7 +46,7 @@ describe('CloudHttpsBuilder', () => { */ interface RunHandlerResult { status: number; - headers: {[name: string]: string}; + headers: { [name: string]: string }; body: any; } @@ -73,13 +73,16 @@ interface CallTest { * Runs an express handler with a given request asynchronously and returns the * data populated into the response. */ -function runHandler(handler: express.Handler, request: express.Request): Promise { +function runHandler( + handler: express.Handler, + request: express.Request +): Promise { return new Promise((resolve, reject) => { // MockResponse mocks an express.Response. // This class lives here so it can reference resolve and reject. class MockResponse { private statusCode = 0; - private headers: {[name: string]: string} = {}; + private headers: { [name: string]: string } = {}; public status(code: number) { this.statusCode = code; @@ -129,9 +132,12 @@ async function runTest(test: CallTest): Promise { // MockRequest mocks an express.Request. class MockRequest { - public method: 'POST'|'GET'|'OPTIONS' = 'POST'; + public method: 'POST' | 'GET' | 'OPTIONS' = 'POST'; - constructor(readonly body: any, readonly headers: {[name: string]: string}) { + constructor( + readonly body: any, + readonly headers: { [name: string]: string } + ) { // This block intentionally left blank. } @@ -142,12 +148,13 @@ class MockRequest { // Creates a mock request with the given data and content-type. function request( - data: any, - contentType: string = 'application/json', - context: { - authorization?: string; - instanceIdToken?: string; - } = {}) { + data: any, + contentType: string = 'application/json', + context: { + authorization?: string; + instanceIdToken?: string; + } = {} +) { const body: any = {}; if (!_.isUndefined(data)) { body.data = data; @@ -155,9 +162,9 @@ function request( const headers = { 'content-type': contentType, - 'authorization': context.authorization, + authorization: context.authorization, 'firebase-instance-id-token': context.instanceIdToken, - 'origin': 'example.com', + origin: 'example.com', }; return new MockRequest(body, headers); @@ -173,9 +180,10 @@ const expectedResponseHeaders = { * verifying an id token. */ function mockFetchPublicKeys(): nock.Scope { - let mock: nock.Scope = nock('https://www.googleapis.com:443') - .get('/robot/v1/metadata/x509/securetoken@system.gserviceaccount.com'); - const mockedResponse = {[mocks.key_id]: mocks.public_key}; + let mock: nock.Scope = nock('https://www.googleapis.com:443').get( + '/robot/v1/metadata/x509/securetoken@system.gserviceaccount.com' + ); + const mockedResponse = { [mocks.key_id]: mocks.public_key }; const headers = { 'cache-control': 'public, max-age=1, must-revalidate, no-transform', }; @@ -189,7 +197,7 @@ export function generateIdToken(projectId: string): string { const claims = {}; const options = { audience: projectId, - expiresIn: 60 * 60, // 1 hour in seconds + expiresIn: 60 * 60, // 1 hour in seconds issuer: 'https://securetoken.google.com/' + projectId, subject: mocks.user_id, algorithm: 'RS256', @@ -231,7 +239,7 @@ describe('callable.FunctionBuilder', () => { describe('#onCall', () => { it('should return a Trigger with appropriate values', () => { - const result = https.onCall((data) => { + const result = https.onCall(data => { return 'response'; }); expect(result.__trigger).to.deep.equal({ @@ -242,13 +250,13 @@ describe('callable.FunctionBuilder', () => { it('should handle success', () => { return runTest({ - httpRequest: request({foo: 'bar'}), - expectedData: {foo: 'bar'}, - callableFunction: (data, context) => ({baz: 'qux'}), + httpRequest: request({ foo: 'bar' }), + expectedData: { foo: 'bar' }, + callableFunction: (data, context) => ({ baz: 'qux' }), expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: {baz: 'qux'}}, + body: { result: { baz: 'qux' } }, }, }); }); @@ -261,7 +269,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); }); @@ -270,11 +278,13 @@ describe('callable.FunctionBuilder', () => { return runTest({ httpRequest: request(null), expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); }); @@ -285,11 +295,15 @@ describe('callable.FunctionBuilder', () => { return runTest({ httpRequest: req, expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, - body: {error: {status: 'INVALID_ARGUMENT', message: 'Bad Request'}}, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, }, }); }); @@ -298,11 +312,13 @@ describe('callable.FunctionBuilder', () => { return runTest({ httpRequest: request(null, 'application/json; charset=utf-8'), expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); }); @@ -311,11 +327,15 @@ describe('callable.FunctionBuilder', () => { return runTest({ httpRequest: request(null, 'text/plain'), expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, - body: {error: {status: 'INVALID_ARGUMENT', message: 'Bad Request'}}, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, }, }); }); @@ -326,11 +346,15 @@ describe('callable.FunctionBuilder', () => { return runTest({ httpRequest: req, expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, - body: {error: {status: 'INVALID_ARGUMENT', message: 'Bad Request'}}, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, }, }); }); @@ -345,7 +369,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 500, headers: expectedResponseHeaders, - body: {error: {status: 'INTERNAL', message: 'INTERNAL'}}, + body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, }, }); }); @@ -360,7 +384,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 500, headers: expectedResponseHeaders, - body: {error: {status: 'INTERNAL', message: 'INTERNAL'}}, + body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, }, }); }); @@ -375,7 +399,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 404, headers: expectedResponseHeaders, - body: {error: {status: 'NOT_FOUND', message: 'i am error'}}, + body: { error: { status: 'NOT_FOUND', message: 'i am error' } }, }, }); }); @@ -402,7 +426,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); mock.done(); @@ -414,7 +438,9 @@ describe('callable.FunctionBuilder', () => { authorization: 'Bearer FAKE', }), expectedData: null, - callableFunction: (data, context) => { return; }, + callableFunction: (data, context) => { + return; + }, expectedHttpResponse: { status: 401, headers: expectedResponseHeaders, @@ -442,7 +468,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); }); @@ -460,7 +486,7 @@ describe('callable.FunctionBuilder', () => { expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, - body: {result: null}, + body: { result: null }, }, }); }); @@ -473,11 +499,14 @@ describe('callable CORS', () => { throw "This shouldn't have gotten called for an OPTIONS preflight."; }); - const request = new MockRequest({}, { - 'Access-Control-Request-Method': 'POST', - 'Access-Control-Request-Headers': 'origin', - Origin: 'example.com', - }); + const request = new MockRequest( + {}, + { + 'Access-Control-Request-Method': 'POST', + 'Access-Control-Request-Headers': 'origin', + Origin: 'example.com', + } + ); request.method = 'OPTIONS'; const response = await runHandler(func, request as any); @@ -512,15 +541,16 @@ describe('callable', () => { }); it('encodes long', () => { - expect(https.encode(-9223372036854775000)).to.equal( - -9223372036854775000); + expect(https.encode(-9223372036854775000)).to.equal(-9223372036854775000); }); it('decodes long', () => { - expect(https.decode({ - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - 'value': '-9223372036854775000', - })).to.equal(-9223372036854775000); + expect( + https.decode({ + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + value: '-9223372036854775000', + }) + ).to.equal(-9223372036854775000); }); it('encodes unsigned long', () => { @@ -528,10 +558,12 @@ describe('callable', () => { }); it('decodes unsigned long', () => { - expect(https.decode({ - '@type': 'type.googleapis.com/google.protobuf.UInt64Value', - 'value': '9223372036854800000', - })).to.equal(9223372036854800000); + expect( + https.decode({ + '@type': 'type.googleapis.com/google.protobuf.UInt64Value', + value: '9223372036854800000', + }) + ).to.equal(9223372036854800000); }); it('encodes double', () => { @@ -557,21 +589,31 @@ describe('callable', () => { }); it('decodes array', () => { - expect(https.decode( - [1, '2', [3, { - value: '1099511627776', - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - }]])).to.deep.equal([1, '2', [3, 1099511627776]]); + expect( + https.decode([ + 1, + '2', + [ + 3, + { + value: '1099511627776', + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + }, + ], + ]) + ).to.deep.equal([1, '2', [3, 1099511627776]]); }); it('encodes object', () => { // TODO(klimt): Make this test more interesting once there's some type // that needs encoding that can be created from JavaScript. - expect(https.encode({ - foo: 1, - bar: 'hello', - baz: [1, 2, 3], - })).to.deep.equal({ + expect( + https.encode({ + foo: 1, + bar: 'hello', + baz: [1, 2, 3], + }) + ).to.deep.equal({ foo: 1, bar: 'hello', baz: [1, 2, 3], @@ -579,14 +621,20 @@ describe('callable', () => { }); it('decodes object', () => { - expect(https.decode({ - foo: 1, - bar: 'hello', - baz: [1, 2, { - value: '1099511627776', - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - }], - })).to.deep.equal({ + expect( + https.decode({ + foo: 1, + bar: 'hello', + baz: [ + 1, + 2, + { + value: '1099511627776', + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + }, + ], + }) + ).to.deep.equal({ foo: 1, bar: 'hello', baz: [1, 2, 1099511627776], diff --git a/spec/providers/pubsub.spec.ts b/spec/providers/pubsub.spec.ts index e4330bff8..83df21ab0 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/providers/pubsub.spec.ts @@ -37,7 +37,7 @@ describe('Pubsub Functions', () => { it('should preserve passed in json', () => { let message = new pubsub.Message({ data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'), - json: {goodbye: 'world'}, + json: { goodbye: 'world' }, }); expect(message.json.goodbye).to.equal('world'); @@ -46,7 +46,9 @@ describe('Pubsub Functions', () => { describe('#toJSON', () => { it('should be JSON stringify-able', () => { - let encoded = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); + let encoded = new Buffer('{"hello":"world"}', 'utf8').toString( + 'base64' + ); let message = new pubsub.Message({ data: encoded, }); @@ -60,7 +62,6 @@ describe('Pubsub Functions', () => { }); describe('pubsub.FunctionBuilder', () => { - before(() => { process.env.GCLOUD_PROJECT = 'project1'; }); @@ -82,7 +83,7 @@ describe('Pubsub Functions', () => { }); }); - it ('should throw with improperly formatted topics', () => { + it('should throw with improperly formatted topics', () => { expect(() => pubsub.topic('bad/topic/format')).to.throw(Error); }); @@ -107,8 +108,8 @@ describe('Pubsub Functions', () => { return expect(result(event)).to.eventually.deep.equal({ raw, - json: {hello: 'world'}, - attributes: {foo: 'bar'}, + json: { hello: 'world' }, + attributes: { foo: 'bar' }, }); }); }); @@ -116,11 +117,15 @@ describe('Pubsub Functions', () => { describe('process.env.GCLOUD_PROJECT not set', () => { it('should not throw if __trigger is not accessed', () => { - expect(() => pubsub.topic('toppy').onPublish(() => null)).to.not.throw(Error); + expect(() => pubsub.topic('toppy').onPublish(() => null)).to.not.throw( + Error + ); }); it('should throw when trigger is accessed', () => { - expect(() => pubsub.topic('toppy').onPublish(() => null).__trigger).to.throw(Error); + expect( + () => pubsub.topic('toppy').onPublish(() => null).__trigger + ).to.throw(Error); }); it('should not throw when #run is called', () => { diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index c6946082f..befea8be9 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import * as storage from '../../src/providers/storage'; -import { expect as expect } from 'chai'; +import { expect } from 'chai'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { @@ -37,7 +37,10 @@ describe('Storage Functions', () => { describe('#onArchive', () => { it('should return a TriggerDefinition with appropriate values', () => { - let cloudFunction = storage.bucket('bucky').object().onArchive(() => null); + let cloudFunction = storage + .bucket('bucky') + .object() + .onArchive(() => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { eventType: 'google.storage.object.archive', @@ -59,7 +62,9 @@ describe('Storage Functions', () => { }); it('should allow fully qualified bucket names', () => { - let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let subjectQualified = new storage.ObjectBuilder( + () => 'projects/_/buckets/bucky' + ); let result = subjectQualified.onArchive(() => null); expect(result.__trigger).to.deep.equal({ eventTrigger: { @@ -71,8 +76,13 @@ describe('Storage Functions', () => { }); it('should throw with improperly formatted buckets', () => { - expect(() => storage.bucket('bad/bucket/format').object().onArchive(() => null).__trigger) - .to.throw(Error); + expect( + () => + storage + .bucket('bad/bucket/format') + .object() + .onArchive(() => null).__trigger + ).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -81,8 +91,9 @@ describe('Storage Functions', () => { }); let goodMediaLinkEvent = { data: { - mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' - + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + mediaLink: + 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; return cloudFunction(goodMediaLinkEvent).then((result: any) => { @@ -93,7 +104,10 @@ describe('Storage Functions', () => { describe('#onDelete', () => { it('should return a TriggerDefinition with appropriate values', () => { - let cloudFunction = storage.bucket('bucky').object().onDelete(() => null); + let cloudFunction = storage + .bucket('bucky') + .object() + .onDelete(() => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { eventType: 'google.storage.object.delete', @@ -115,7 +129,9 @@ describe('Storage Functions', () => { }); it('should allow fully qualified bucket names', () => { - let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let subjectQualified = new storage.ObjectBuilder( + () => 'projects/_/buckets/bucky' + ); let result = subjectQualified.onDelete(() => null); expect(result.__trigger).to.deep.equal({ eventTrigger: { @@ -127,8 +143,13 @@ describe('Storage Functions', () => { }); it('should throw with improperly formatted buckets', () => { - expect(() => storage.bucket('bad/bucket/format').object().onDelete(() => null).__trigger) - .to.throw(Error); + expect( + () => + storage + .bucket('bad/bucket/format') + .object() + .onDelete(() => null).__trigger + ).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -137,8 +158,9 @@ describe('Storage Functions', () => { }); let goodMediaLinkEvent = { data: { - mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' - + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + mediaLink: + 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; return cloudFunction(goodMediaLinkEvent).then((result: any) => { @@ -149,7 +171,10 @@ describe('Storage Functions', () => { describe('#onFinalize', () => { it('should return a TriggerDefinition with appropriate values', () => { - let cloudFunction = storage.bucket('bucky').object().onFinalize(() => null); + let cloudFunction = storage + .bucket('bucky') + .object() + .onFinalize(() => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { eventType: 'google.storage.object.finalize', @@ -171,7 +196,9 @@ describe('Storage Functions', () => { }); it('should allow fully qualified bucket names', () => { - let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let subjectQualified = new storage.ObjectBuilder( + () => 'projects/_/buckets/bucky' + ); let result = subjectQualified.onFinalize(() => null); expect(result.__trigger).to.deep.equal({ eventTrigger: { @@ -183,8 +210,13 @@ describe('Storage Functions', () => { }); it('should throw with improperly formatted buckets', () => { - expect(() => storage.bucket('bad/bucket/format').object().onFinalize(() => null).__trigger) - .to.throw(Error); + expect( + () => + storage + .bucket('bad/bucket/format') + .object() + .onFinalize(() => null).__trigger + ).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -193,8 +225,9 @@ describe('Storage Functions', () => { }); let goodMediaLinkEvent = { data: { - mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' - + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + mediaLink: + 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; return cloudFunction(goodMediaLinkEvent).then((result: any) => { @@ -205,7 +238,10 @@ describe('Storage Functions', () => { describe('#onMetadataUpdate', () => { it('should return a TriggerDefinition with appropriate values', () => { - let cloudFunction = storage.bucket('bucky').object().onMetadataUpdate(() => null); + let cloudFunction = storage + .bucket('bucky') + .object() + .onMetadataUpdate(() => null); expect(cloudFunction.__trigger).to.deep.equal({ eventTrigger: { eventType: 'google.storage.object.metadataUpdate', @@ -227,7 +263,9 @@ describe('Storage Functions', () => { }); it('should allow fully qualified bucket names', () => { - let subjectQualified = new storage.ObjectBuilder(() => 'projects/_/buckets/bucky'); + let subjectQualified = new storage.ObjectBuilder( + () => 'projects/_/buckets/bucky' + ); let result = subjectQualified.onMetadataUpdate(() => null); expect(result.__trigger).to.deep.equal({ eventTrigger: { @@ -239,8 +277,13 @@ describe('Storage Functions', () => { }); it('should throw with improperly formatted buckets', () => { - expect(() => storage.bucket('bad/bucket/format').object().onMetadataUpdate(() => null).__trigger) - .to.throw(Error); + expect( + () => + storage + .bucket('bad/bucket/format') + .object() + .onMetadataUpdate(() => null).__trigger + ).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -249,8 +292,9 @@ describe('Storage Functions', () => { }); let goodMediaLinkEvent = { data: { - mediaLink: 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' - + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', + mediaLink: + 'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' + + '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media', }, }; return cloudFunction(goodMediaLinkEvent).then((result: any) => { @@ -266,7 +310,9 @@ describe('Storage Functions', () => { }); it('should throw when trigger is accessed', () => { - expect(() => storage.object().onArchive(() => null).__trigger).to.throw(Error); + expect(() => storage.object().onArchive(() => null).__trigger).to.throw( + Error + ); }); it('should not throw when #run is called', () => { diff --git a/spec/testing.spec.ts b/spec/testing.spec.ts index 83254e881..4df5362df 100644 --- a/spec/testing.spec.ts +++ b/spec/testing.spec.ts @@ -26,7 +26,7 @@ import * as testing from '../src/testing'; // TODO(rjh): As actual testing methods become available, replace this with actual tests. describe('testing', () => { - it('should be accessible through the entrypoint', function () { + it('should be accessible through the entrypoint', function() { expect(testing.whereAreTheBugs()).to.not.equal('Earth'); }); }); diff --git a/spec/utils.spec.ts b/spec/utils.spec.ts index 1a2ad54c1..cedf43597 100644 --- a/spec/utils.spec.ts +++ b/spec/utils.spec.ts @@ -23,7 +23,7 @@ import { normalizePath, pathParts, valAt, applyChange } from '../src/utils'; import { expect } from 'chai'; -describe ('utils', () => { +describe('utils', () => { describe('.normalizePath(path: string)', () => { it('should strip leading and trailing slash', () => { expect(normalizePath('/my/path/is/{rad}/')).to.eq('my/path/is/{rad}'); @@ -46,34 +46,34 @@ describe ('utils', () => { it('should be null if null along any point in the path', () => { expect(valAt(null)).to.be.null; expect(valAt(null, '/foo')).to.be.null; - expect(valAt({a: {b: null}}, '/a/b/c')).to.be.null; + expect(valAt({ a: { b: null } }, '/a/b/c')).to.be.null; }); it('should be null if accessing a path past a leaf value', () => { - expect(valAt({a: 2}, '/a/b')).to.be.null; + expect(valAt({ a: 2 }, '/a/b')).to.be.null; }); it('should be the leaf value if one is present', () => { - expect(valAt({a: {b: 23}}, '/a/b')).to.eq(23); - expect(valAt({a: {b: 23}}, '/a')).to.deep.equal({b: 23}); + expect(valAt({ a: { b: 23 } }, '/a/b')).to.eq(23); + expect(valAt({ a: { b: 23 } }, '/a')).to.deep.equal({ b: 23 }); }); it('should be undefined if in unexplored territory', () => { - expect(valAt({a: 23}, '/b')).to.be.undefined; + expect(valAt({ a: 23 }, '/b')).to.be.undefined; }); }); describe('.applyChange(from: any, to: any): any', () => { it('should return the to value for non-object values of from and to', () => { - expect(applyChange({a: 'b'}, null)).to.eq(null); - expect(applyChange(null, {a: 'b'})).to.deep.equal({a: 'b'}); + expect(applyChange({ a: 'b' }, null)).to.eq(null); + expect(applyChange(null, { a: 'b' })).to.deep.equal({ a: 'b' }); expect(applyChange(23, null)).to.be.null; }); it('should return the merged value of two objects', () => { - let from = {a: {b: 'foo', c: 23, d: 444}, d: {e: 42}}; - let to: any = {a: {b: 'bar', c: null}, d: null, e: {f: 'g'}}; - let result = {a: {b: 'bar', d: 444}, e: {f: 'g'}}; + let from = { a: { b: 'foo', c: 23, d: 444 }, d: { e: 42 } }; + let to: any = { a: { b: 'bar', c: null }, d: null, e: { f: 'g' } }; + let result = { a: { b: 'bar', d: 444 }, e: { f: 'g' } }; expect(applyChange(from, to)).to.deep.equal(result); }); }); diff --git a/src/apps.ts b/src/apps.ts index 37d7febbc..15caff41c 100644 --- a/src/apps.ts +++ b/src/apps.ts @@ -46,7 +46,7 @@ export namespace apps { export let singleton: apps.Apps; - export let init = () => singleton = new Apps(); + export let init = () => (singleton = new Apps()); export interface AuthMode { admin: boolean; @@ -79,7 +79,10 @@ export namespace apps { if (!this._appAlive(appName)) { return; } - firebase.app(appName).delete().catch(_.noop); + firebase + .app(appName) + .delete() + .catch(_.noop); } retain() { @@ -112,7 +115,9 @@ export namespace apps { } private get firebaseArgs() { - return _.assign({}, firebaseConfig(), {credential: firebase.credential.applicationDefault()}); + return _.assign({}, firebaseConfig(), { + credential: firebase.credential.applicationDefault(), + }); } } } diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 3717f8ca1..bf36b3dce 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -79,8 +79,8 @@ export interface EventContext { * for database functions. */ auth?: { - uid: string, - token: object, + uid: string; + token: object; }; } @@ -88,10 +88,7 @@ export interface EventContext { * to the event, "after" represents the state after the event. */ export class Change { - constructor( - public before?: T, - public after?: T, - ) {}; + constructor(public before?: T, public after?: T) {} } /** ChangeJson is the JSON format used to construct a Change object. */ @@ -107,7 +104,9 @@ export interface ChangeJson { } export namespace Change { - function reinterpretCast(x: any) { return x as T; } + function reinterpretCast(x: any) { + return x as T; + } /** Factory method for creating a Change from a `before` object and an `after` object. */ export function fromObjects(before: T, after: T) { @@ -117,16 +116,26 @@ export namespace Change { /** Factory method for creating a Change from a JSON and an optional customizer function to be * applied to both the `before` and the `after` fields. */ - export function fromJSON(json: ChangeJson, customizer: (x: any) => T = reinterpretCast): Change { + export function fromJSON( + json: ChangeJson, + customizer: (x: any) => T = reinterpretCast + ): Change { let before = _.assign({}, json.before); if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); } - return Change.fromObjects(customizer(before || {}), customizer(json.after || {})); + return Change.fromObjects( + customizer(before || {}), + customizer(json.after || {}) + ); } /** @internal */ - export function applyFieldMask(sparseBefore: any, after: any, fieldMask: string) { + export function applyFieldMask( + sparseBefore: any, + after: any, + fieldMask: string + ) { let before = _.assign({}, after); let masks = fieldMask.split(','); _.forEach(masks, mask => { @@ -154,13 +163,13 @@ export interface Resource { /** TriggerAnnotated is used internally by the firebase CLI to understand what type of Cloud Function to deploy. */ export interface TriggerAnnotated { __trigger: { - httpsTrigger?: {}, + httpsTrigger?: {}; eventTrigger?: { eventType: string; resource: string; service: string; - }, - labels?: { [key: string]: string } + }; + labels?: { [key: string]: string }; }; } @@ -173,13 +182,16 @@ export interface Runnable { * An HttpsFunction is both an object that exports its trigger definitions at __trigger and * can be called as a function that takes an express.js Request and Response object. */ -export type HttpsFunction = TriggerAnnotated & ((req: Request, resp: Response) => void); +export type HttpsFunction = TriggerAnnotated & + ((req: Request, resp: Response) => void); /** * A CloudFunction is both an object that exports its trigger definitions at __trigger and * can be called as a function using the raw JS API for Google Cloud Functions. */ -export type CloudFunction = Runnable & TriggerAnnotated & ((input: any) => PromiseLike | any); +export type CloudFunction = Runnable & + TriggerAnnotated & + ((input: any) => PromiseLike | any); /** @internal */ export interface MakeCloudFunctionArgs { @@ -204,23 +216,31 @@ export function makeCloudFunction({ service, dataConstructor = (raw: Event | LegacyEvent) => raw.data, handler, - before = () => { return; }, - after = () => { return; }, + before = () => { + return; + }, + after = () => { + return; + }, legacyEventType, }: MakeCloudFunctionArgs): CloudFunction { let cloudFunction: any = async (event: Event | LegacyEvent) => { if (!_.has(event, 'data')) { - throw Error('Cloud function needs to be called with an event parameter.' + - 'If you are writing unit tests, please use the Node module firebase-functions-fake.'); + throw Error( + 'Cloud function needs to be called with an event parameter.' + + 'If you are writing unit tests, please use the Node module firebase-functions-fake.' + ); } try { before(event); let dataOrChange = dataConstructor(event); let context: any; - if (isEvent(event)) { // new event format + if (isEvent(event)) { + // new event format context = _.cloneDeep(event.context); - } else { // legacy event format + } else { + // legacy event format context = { eventId: event.eventId, timestamp: event.timestamp, @@ -268,11 +288,16 @@ function isEvent(event: Event | LegacyEvent): event is Event { return _.has(event, 'context'); } -function _makeParams(context: EventContext, triggerResourceGetter: () => string): { [option: string]: any } { - if (context.params) { // In unit testing, user may directly provide `context.params`. +function _makeParams( + context: EventContext, + triggerResourceGetter: () => string +): { [option: string]: any } { + if (context.params) { + // In unit testing, user may directly provide `context.params`. return context.params; } - if (!context.resource) { // In unit testing, `resource` may be unpopulated for a test event. + if (!context.resource) { + // In unit testing, `resource` may be unpopulated for a test event. return {}; } let triggerResource = triggerResourceGetter(); @@ -282,7 +307,7 @@ function _makeParams(context: EventContext, triggerResourceGetter: () => string) let triggerResourceParts = _.split(triggerResource, '/'); let eventResourceParts = _.split(context.resource.name, '/'); _.forEach(wildcards, wildcard => { - let wildcardNoBraces = wildcard.slice(1,-1); + let wildcardNoBraces = wildcard.slice(1, -1); let position = _.indexOf(triggerResourceParts, wildcard); params[wildcardNoBraces] = eventResourceParts[position]; }); diff --git a/src/config.ts b/src/config.ts index a1cfc7090..2ff026d2a 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,4 +1,3 @@ - // The MIT License (MIT) // // Copyright (c) 2017 Firebase @@ -41,7 +40,6 @@ export namespace config { /* @internal */ export function firebaseConfig(): firebase.AppOptions | null { - // The FIREBASE_PROJECT environment variable was introduced to help local emulation with `firebase-tools` 3.18 // Unfortunately, API review decided that the name should be FIREBASE_CONFIG to avoid confusions that Firebase has // a separate project from Google Cloud. This accepts both versions, preferring the documented name. @@ -62,7 +60,8 @@ export function firebaseConfig(): firebase.AppOptions | null { // Could have Runtime Config with Firebase in it as an ENV location or default. try { - const path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; + const path = + process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; const config = require(path); if (config.firebase) { return config.firebase; @@ -85,7 +84,8 @@ function init() { } try { - let path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; + let path = + process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; const parsed = require(path); delete parsed.firebase; config.singleton = parsed; diff --git a/src/encoder.ts b/src/encoder.ts index dfa010a0b..ddc7a4c55 100644 --- a/src/encoder.ts +++ b/src/encoder.ts @@ -33,4 +33,4 @@ export function dateToTimestampProto(timeString?: string) { nanos = parseInt(nanoString, 10) * Math.pow(10, trailingZeroes); } return { seconds, nanos }; -}; +} diff --git a/src/index.ts b/src/index.ts index f5ebbb6d7..ccc0470f4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,7 +30,16 @@ import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import { firebaseConfig } from './config'; -export { analytics, auth, crashlytics, database, firestore, https, pubsub, storage }; +export { + analytics, + auth, + crashlytics, + database, + firestore, + https, + pubsub, + storage, +}; // Exported root types: export * from './config'; @@ -40,18 +49,21 @@ export * from './cloud-functions'; // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what // we can deduce. if (!process.env.FIREBASE_CONFIG) { - const cfg = firebaseConfig(); + const cfg = firebaseConfig(); if (cfg) { process.env.FIREBASE_CONFIG = JSON.stringify(cfg); - } else if (process.env.GCLOUD_PROJECT) { - console.warn('Warning, estimating Firebase Config based on GCLOUD_PROJECT. Intializing firebase-admin may fail'); + console.warn( + 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Intializing firebase-admin may fail' + ); process.env.FIREBASE_CONFIG = JSON.stringify({ databaseURL: `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, storageBucket: `${process.env.GCLOUD_PROJECT}.appspot.com`, projectId: process.env.GCLOUD_PROJECT, }); } else { - console.warn('Warning, FIREBASE_CONFIG environment variable is missing. Initializing firebase-admin will fail'); + console.warn( + 'Warning, FIREBASE_CONFIG environment variable is missing. Initializing firebase-admin will fail' + ); } } diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 322b0d6e7..c3836cec2 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -20,7 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, Event, EventContext } from '../cloud-functions'; +import { + makeCloudFunction, + CloudFunction, + Event, + EventContext, +} from '../cloud-functions'; import * as _ from 'lodash'; /** @internal */ @@ -42,7 +47,9 @@ export function event(analyticsEventType: string) { if (!process.env.GCLOUD_PROJECT) { throw new Error('process.env.GCLOUD_PROJECT is not set.'); } - return 'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType; + return ( + 'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType + ); }); } @@ -53,7 +60,7 @@ export function event(analyticsEventType: string) { */ export class AnalyticsEventBuilder { /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** * Event handler that fires every time a Firebase Analytics event occurs. @@ -66,7 +73,11 @@ export class AnalyticsEventBuilder { * Cloud Function you can export. */ onLog( - handler: (event: AnalyticsEvent, context: EventContext) => PromiseLike | any): CloudFunction { + handler: ( + event: AnalyticsEvent, + context: EventContext + ) => PromiseLike | any + ): CloudFunction { const dataConstructor = (raw: Event) => { return new AnalyticsEvent(raw.data); }; @@ -118,7 +129,7 @@ export class AnalyticsEvent { /** @internal */ constructor(wireFormat: any) { - this.params = {}; // In case of absent field, show empty (not absent) map. + this.params = {}; // In case of absent field, show empty (not absent) map. if (wireFormat.eventDim && wireFormat.eventDim.length > 0) { // If there's an eventDim, there'll always be exactly one. let eventDim = wireFormat.eventDim[0]; @@ -127,9 +138,20 @@ export class AnalyticsEvent { copyFieldTo(eventDim, this, 'valueInUsd', 'valueInUSD'); copyFieldTo(eventDim, this, 'date', 'reportingDate'); copyTimestampToString(eventDim, this, 'timestampMicros', 'logTime'); - copyTimestampToString(eventDim, this, 'previousTimestampMicros', 'previousLogTime'); + copyTimestampToString( + eventDim, + this, + 'previousTimestampMicros', + 'previousLogTime' + ); } - copyFieldTo(wireFormat, this, 'userDim', 'user', dim => new UserDimensions(dim)); + copyFieldTo( + wireFormat, + this, + 'userDim', + 'user', + dim => new UserDimensions(dim) + ); } } @@ -172,12 +194,24 @@ export class UserDimensions { /** @internal */ constructor(wireFormat: any) { // These are interfaces or primitives, no transformation needed. - copyFields(wireFormat, this, ['userId', 'deviceInfo', 'geoInfo', 'appInfo']); + copyFields(wireFormat, this, [ + 'userId', + 'deviceInfo', + 'geoInfo', + 'appInfo', + ]); // The following fields do need transformations of some sort. - copyTimestampToString(wireFormat, this, 'firstOpenTimestampMicros', 'firstOpenTime'); - this.userProperties = {}; // With no entries in the wire format, present an empty (as opposed to absent) map. - copyField(wireFormat, this, 'userProperties', r => _.mapValues(r, p => new UserPropertyValue(p))); + copyTimestampToString( + wireFormat, + this, + 'firstOpenTimestampMicros', + 'firstOpenTime' + ); + this.userProperties = {}; // With no entries in the wire format, present an empty (as opposed to absent) map. + copyField(wireFormat, this, 'userProperties', r => + _.mapValues(r, p => new UserPropertyValue(p)) + ); copyField(wireFormat, this, 'bundleInfo', r => new ExportBundleInfo(r)); // BUG(36000368) Remove when no longer necessary @@ -341,18 +375,33 @@ export class ExportBundleInfo { /** @internal */ constructor(wireFormat: any) { copyField(wireFormat, this, 'bundleSequenceId'); - copyTimestampToMillis(wireFormat, this, 'serverTimestampOffsetMicros', 'serverTimestampOffset'); + copyTimestampToMillis( + wireFormat, + this, + 'serverTimestampOffsetMicros', + 'serverTimestampOffset' + ); } } function copyFieldTo( - from: any, to: T, fromField: string, toField: K, transform: (val: any) => T[K] = _.identity): void { + from: any, + to: T, + fromField: string, + toField: K, + transform: (val: any) => T[K] = _.identity +): void { if (from[fromField] !== undefined) { to[toField] = transform(from[fromField]); } } -function copyField(from: any, to: T, field: K, transform: (val: any) => T[K] = _.identity): void { +function copyField( + from: any, + to: T, + field: K, + transform: (val: any) => T[K] = _.identity +): void { copyFieldTo(from, to, field, field, transform); } @@ -418,7 +467,12 @@ function unwrapValue(wrapped: any): any { // The JSON payload delivers timestamp fields as strings of timestamps denoted in microseconds. // The JavaScript convention is to use numbers denoted in milliseconds. This method // makes it easy to convert a field of one type into the other. -function copyTimestampToMillis(from: any, to: T, fromName: string, toName: K) { +function copyTimestampToMillis( + from: any, + to: T, + fromName: string, + toName: K +) { if (from[fromName] !== undefined) { to[toName] = _.round(from[fromName] / 1000); } @@ -427,8 +481,13 @@ function copyTimestampToMillis(from: any, to: T, fromName: // The JSON payload delivers timestamp fields as strings of timestamps denoted in microseconds. // In our SDK, we'd like to present timestamp as ISO-format strings. This method makes it easy // to convert a field of one type into the other. -function copyTimestampToString(from: any, to: T, fromName: string, toName: K) { +function copyTimestampToString( + from: any, + to: T, + fromName: string, + toName: K +) { if (from[fromName] !== undefined) { - to[toName] = (new Date(from[fromName] / 1000)).toISOString(); + to[toName] = new Date(from[fromName] / 1000).toISOString(); } } diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 813a69ab9..47b5c0ece 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -20,7 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, EventContext, LegacyEvent } from '../cloud-functions'; +import { + makeCloudFunction, + CloudFunction, + EventContext, + LegacyEvent, +} from '../cloud-functions'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; @@ -40,8 +45,7 @@ export function user() { } export class UserRecordMetadata implements firebase.auth.UserMetadata { - - constructor(public creationTime: string, public lastSignInTime: string) { }; + constructor(public creationTime: string, public lastSignInTime: string) {} /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */ toJSON() { @@ -59,20 +63,27 @@ export class UserBuilder { } /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** Respond to the creation of a Firebase Auth user. */ - onCreate(handler: (user: UserRecord, context: EventContext) => PromiseLike | any): CloudFunction { + onCreate( + handler: (user: UserRecord, context: EventContext) => PromiseLike | any + ): CloudFunction { return this.onOperation(handler, 'user.create'); } /** Respond to the deletion of a Firebase Auth user. */ - onDelete(handler: (user: UserRecord, context: EventContext) => PromiseLike | any): CloudFunction { + onDelete( + handler: (user: UserRecord, context: EventContext) => PromiseLike | any + ): CloudFunction { return this.onOperation(handler, 'user.delete'); } private onOperation( - handler: (user: UserRecord, context: EventContext) => PromiseLike | any, + handler: ( + user: UserRecord, + context: EventContext + ) => PromiseLike | any, eventType: string ): CloudFunction { return makeCloudFunction({ @@ -93,7 +104,9 @@ export class UserBuilder { */ export type UserRecord = firebase.auth.UserRecord; -export function userRecordConstructor(wireData: Object): firebase.auth.UserRecord { +export function userRecordConstructor( + wireData: Object +): firebase.auth.UserRecord { // Falsey values from the wire format proto get lost when converted to JSON, this adds them back. let falseyValues: any = { email: null, @@ -112,11 +125,15 @@ export function userRecordConstructor(wireData: Object): firebase.auth.UserRecor let meta = _.get(record, 'metadata'); if (meta) { - _.set(record, 'metadata', new UserRecordMetadata( - // Transform payload to firebase-admin v5.0.0 format because wire format is different (BUG 63167395) - meta.createdAt || meta.creationTime, - meta.lastSignedInAt || meta.lastSignInTime, - )); + _.set( + record, + 'metadata', + new UserRecordMetadata( + // Transform payload to firebase-admin v5.0.0 format because wire format is different (BUG 63167395) + meta.createdAt || meta.creationTime, + meta.lastSignedInAt || meta.lastSignInTime + ) + ); } else { _.set(record, 'metadata', new UserRecordMetadata(null, null)); } @@ -126,8 +143,18 @@ export function userRecordConstructor(wireData: Object): firebase.auth.UserRecor }); }); _.set(record, 'toJSON', () => { - const json: any = _.pick(record, ['uid', 'email', 'emailVerified', 'displayName', - 'photoURL', 'phoneNumber', 'disabled', 'passwordHash', 'passwordSalt', 'tokensValidAfterTime']); + const json: any = _.pick(record, [ + 'uid', + 'email', + 'emailVerified', + 'displayName', + 'photoURL', + 'phoneNumber', + 'disabled', + 'passwordHash', + 'passwordSalt', + 'tokensValidAfterTime', + ]); json.metadata = _.get(record, 'metadata').toJSON(); json.customClaims = _.cloneDeep(record.customClaims); json.providerData = _.map(record.providerData, entry => entry.toJSON()); diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index 418936e14..f4dda117b 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -20,15 +20,19 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { makeCloudFunction, CloudFunction, EventContext } from '../cloud-functions'; +import { + makeCloudFunction, + CloudFunction, + EventContext, +} from '../cloud-functions'; /** @internal */ export const provider = 'google.firebase.crashlytics'; /** @internal */ export const service = 'fabric.io'; -/** - * Handle events related to Crashlytics issues. An issue in Crashlytics is an +/** + * Handle events related to Crashlytics issues. An issue in Crashlytics is an * aggregation of crashes which have a shared root cause. */ export function issue() { @@ -43,7 +47,7 @@ export function issue() { /** Builder used to create Cloud Functions for Crashlytics issue events. */ export class IssueBuilder { /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** @internal */ onNewDetected(handler: any): Error { @@ -51,17 +55,23 @@ export class IssueBuilder { } /** Handle Crashlytics New Issue events. */ - onNew(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { + onNew( + handler: (issue: Issue, context: EventContext) => PromiseLike | any + ): CloudFunction { return this.onEvent(handler, 'issue.new'); } /** Handle Crashlytics Regressed Issue events. */ - onRegressed(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { + onRegressed( + handler: (issue: Issue, context: EventContext) => PromiseLike | any + ): CloudFunction { return this.onEvent(handler, 'issue.regressed'); } /** Handle Crashlytics Velocity Alert events. */ - onVelocityAlert(handler: (issue: Issue, context: EventContext) => PromiseLike | any): CloudFunction { + onVelocityAlert( + handler: (issue: Issue, context: EventContext) => PromiseLike | any + ): CloudFunction { return this.onEvent(handler, 'issue.velocityAlert'); } diff --git a/src/providers/database.ts b/src/providers/database.ts index d21ac2409..e3788f899 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -22,7 +22,14 @@ import * as _ from 'lodash'; import { apps } from '../apps'; -import { LegacyEvent, CloudFunction, makeCloudFunction, Event, EventContext, Change } from '../cloud-functions'; +import { + LegacyEvent, + CloudFunction, + makeCloudFunction, + Event, + EventContext, + Change, +} from '../cloud-functions'; import { normalizePath, applyChange, pathParts, joinPath } from '../utils'; import * as firebase from 'firebase-admin'; import { firebaseConfig } from '../config'; @@ -48,7 +55,10 @@ export class InstanceBuilder { ref(path: string): RefBuilder { const normalized = normalizePath(path); - return new RefBuilder(apps(), () => `projects/_/instances/${this.instance}/refs/${normalized}`); + return new RefBuilder( + apps(), + () => `projects/_/instances/${this.instance}/refs/${normalized}` + ); } } @@ -80,13 +90,18 @@ export function ref(path: string): RefBuilder { const normalized = normalizePath(path); const databaseURL = firebaseConfig().databaseURL; if (!databaseURL) { - throw new Error('Missing expected firebase config value databaseURL, ' + - 'config is actually' + JSON.stringify(firebaseConfig()) + - '\n If you are unit testing, please set process.env.FIREBASE_CONFIG'); + throw new Error( + 'Missing expected firebase config value databaseURL, ' + + 'config is actually' + + JSON.stringify(firebaseConfig()) + + '\n If you are unit testing, please set process.env.FIREBASE_CONFIG' + ); } const match = databaseURL.match(databaseURLRegex); if (!match) { - throw new Error('Invalid value for config firebase.databaseURL: ' + databaseURL); + throw new Error( + 'Invalid value for config firebase.databaseURL: ' + databaseURL + ); } const subdomain = match[1]; return `projects/_/instances/${subdomain}/refs/${normalized}`; @@ -98,28 +113,34 @@ export function ref(path: string): RefBuilder { /** Builder used to create Cloud Functions for Firebase Realtime Database References. */ export class RefBuilder { /** @internal */ - constructor(private apps: apps.Apps, private triggerResource: () => string) { } + constructor(private apps: apps.Apps, private triggerResource: () => string) {} /** Respond to any write that affects a ref. */ - onWrite(handler: ( - change: Change, - context: EventContext) => PromiseLike | any, + onWrite( + handler: ( + change: Change, + context: EventContext + ) => PromiseLike | any ): CloudFunction> { return this.onOperation(handler, 'ref.write', this.changeConstructor); } /** Respond to update on a ref. */ - onUpdate(handler: ( - change: Change, - context: EventContext) => PromiseLike | any, + onUpdate( + handler: ( + change: Change, + context: EventContext + ) => PromiseLike | any ): CloudFunction> { return this.onOperation(handler, 'ref.update', this.changeConstructor); } /** Respond to new data on a ref. */ - onCreate(handler: ( - snapshot: DataSnapshot, - context: EventContext) => PromiseLike | any, + onCreate( + handler: ( + snapshot: DataSnapshot, + context: EventContext + ) => PromiseLike | any ): CloudFunction { let dataConstructor = (raw: LegacyEvent) => { let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); @@ -134,18 +155,15 @@ export class RefBuilder { } /** Respond to all data being deleted from a ref. */ - onDelete(handler: ( - snapshot: DataSnapshot, - context: EventContext) => PromiseLike | any, + onDelete( + handler: ( + snapshot: DataSnapshot, + context: EventContext + ) => PromiseLike | any ): CloudFunction { let dataConstructor = (raw: LegacyEvent) => { let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); - return new DataSnapshot( - raw.data.data, - path, - this.apps.admin, - dbInstance - ); + return new DataSnapshot(raw.data.data, path, this.apps.admin, dbInstance); }; return this.onOperation(handler, 'ref.delete', dataConstructor); } @@ -153,8 +171,8 @@ export class RefBuilder { private onOperation( handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, - dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { - + dataConstructor: (raw: Event | LegacyEvent) => any + ): CloudFunction { return makeCloudFunction({ handler, provider, @@ -163,8 +181,8 @@ export class RefBuilder { legacyEventType: `providers/${provider}/eventTypes/${eventType}`, triggerResource: this.triggerResource, dataConstructor: dataConstructor, - before: (event) => this.apps.retain(), - after: (event) => this.apps.release(), + before: event => this.apps.retain(), + after: event => this.apps.release(), }); } @@ -195,12 +213,16 @@ export function resourceToInstanceAndPath(resource: string) { let resourceRegex = `projects/([^/]+)/instances/([^/]+)/refs(/.+)?`; let match = resource.match(new RegExp(resourceRegex)); if (!match) { - throw new Error(`Unexpected resource string for Firebase Realtime Database event: ${resource}. ` + - 'Expected string in the format of "projects/_/instances/{firebaseioSubdomain}/refs/{ref=**}"'); + throw new Error( + `Unexpected resource string for Firebase Realtime Database event: ${resource}. ` + + 'Expected string in the format of "projects/_/instances/{firebaseioSubdomain}/refs/{ref=**}"' + ); } let [, project, dbInstanceName, path] = match; if (project !== '_') { - throw new Error(`Expect project to be '_' in a Firebase Realtime Database event`); + throw new Error( + `Expect project to be '_' in a Firebase Realtime Database event` + ); } let dbInstance = 'https://' + dbInstanceName + '.firebaseio.com'; return [dbInstance, path]; @@ -217,14 +239,16 @@ export class DataSnapshot { data: any, path?: string, // path will be undefined for the database root private app?: firebase.app.App, - instance?: string, + instance?: string ) { - if (instance) { // SDK always supplies instance, but user's unit tests may not + if (instance) { + // SDK always supplies instance, but user's unit tests may not this.instance = instance; } else if (app) { this.instance = app.options.databaseURL; } else if (process.env.GCLOUD_PROJECT) { - this.instance = 'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com'; + this.instance = + 'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com'; } this._path = path; @@ -233,9 +257,12 @@ export class DataSnapshot { /** Ref returns a reference to the database with full admin access. */ get ref(): firebase.database.Reference { - if (!this.app) { // may be unpopulated in user's unit tests - throw new Error('Please supply a Firebase app in the constructor for DataSnapshot' + - ' in order to use the .ref method.'); + if (!this.app) { + // may be unpopulated in user's unit tests + throw new Error( + 'Please supply a Firebase app in the constructor for DataSnapshot' + + ' in order to use the .ref method.' + ); } if (!this._ref) { this._ref = this.app.database(this.instance).ref(this._fullPath()); @@ -245,7 +272,7 @@ export class DataSnapshot { get key(): string { let last = _.last(pathParts(this._fullPath())); - return (!last || last === '') ? null : last; + return !last || last === '' ? null : last; } val(): any { @@ -256,10 +283,12 @@ export class DataSnapshot { } // TODO(inlined): figure out what to do here - exportVal(): any { return this.val(); } + exportVal(): any { + return this.val(); + } // TODO(inlined): figure out what to do here - getPriority(): string|number|null { + getPriority(): string | number | null { return 0; } @@ -277,7 +306,10 @@ export class DataSnapshot { forEach(action: (a: DataSnapshot) => boolean): boolean { let val = this.val(); if (_.isPlainObject(val)) { - return _.some(val, (value, key: string) => action(this.child(key)) === true); + return _.some( + val, + (value, key: string) => action(this.child(key)) === true + ); } return false; } @@ -317,7 +349,9 @@ export class DataSnapshot { let maxKey = 0; let allIntegerKeys = true; for (let key in node) { - if (!node.hasOwnProperty(key)) { continue; } + if (!node.hasOwnProperty(key)) { + continue; + } let childNode = node[key]; obj[key] = this._checkAndConvertToArray(childNode); numKeys++; diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index c9dec2795..426caa650 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -24,8 +24,14 @@ import { posix } from 'path'; import * as _ from 'lodash'; import * as firebase from 'firebase-admin'; import { apps } from '../apps'; -import { makeCloudFunction, CloudFunction, LegacyEvent, Change, - Event, EventContext } from '../cloud-functions'; +import { + makeCloudFunction, + CloudFunction, + LegacyEvent, + Change, + Event, + EventContext, +} from '../cloud-functions'; import { dateToTimestampProto } from '../encoder'; /** @internal */ @@ -56,7 +62,7 @@ export function document(path: string) { export class DatabaseBuilder { /** @internal */ - constructor(private database: string) { } + constructor(private database: string) {} namespace(namespace: string) { return new NamespaceBuilder(this.database, namespace); @@ -69,18 +75,24 @@ export class DatabaseBuilder { export class NamespaceBuilder { /** @internal */ - constructor(private database: string, private namespace?: string) { } + constructor(private database: string, private namespace?: string) {} document(path: string) { return new DocumentBuilder(() => { if (!process.env.GCLOUD_PROJECT) { throw new Error('process.env.GCLOUD_PROJECT is not set.'); } - let database = posix.join('projects', process.env.GCLOUD_PROJECT, 'databases', this.database); + let database = posix.join( + 'projects', + process.env.GCLOUD_PROJECT, + 'databases', + this.database + ); return posix.join( database, this.namespace ? `documents@${this.namespace}` : 'documents', - path); + path + ); }); } } @@ -92,12 +104,16 @@ function _getValueProto(data: any, resource: string, valueFieldName: string) { } let proto = { fields: _.get(data, [valueFieldName, 'fields'], {}), - createTime: dateToTimestampProto(_.get(data, [valueFieldName, 'createTime'])), - updateTime: dateToTimestampProto(_.get(data, [valueFieldName, 'updateTime'])), + createTime: dateToTimestampProto( + _.get(data, [valueFieldName, 'createTime']) + ), + updateTime: dateToTimestampProto( + _.get(data, [valueFieldName, 'updateTime']) + ), name: _.get(data, [valueFieldName, 'name'], resource), }; return proto; -}; +} /** @internal */ export function snapshotConstructor(event: LegacyEvent): DocumentSnapshot { @@ -107,16 +123,20 @@ export function snapshotConstructor(event: LegacyEvent): DocumentSnapshot { let valueProto = _getValueProto(event.data, event.resource, 'value'); let readTime = dateToTimestampProto(_.get(event, 'data.value.readTime')); return firestoreInstance.snapshot_(valueProto, readTime, 'json'); -}; +} /** @internal */ // TODO remove this function when wire format changes to new format -export function beforeSnapshotConstructor(event: LegacyEvent): DocumentSnapshot { +export function beforeSnapshotConstructor( + event: LegacyEvent +): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); } let oldValueProto = _getValueProto(event.data, event.resource, 'oldValue'); - let oldReadTime = dateToTimestampProto(_.get(event, 'data.oldValue.readTime')); + let oldReadTime = dateToTimestampProto( + _.get(event, 'data.oldValue.readTime') + ); return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json'); } @@ -134,41 +154,54 @@ export class DocumentBuilder { } /** Respond to all document writes (creates, updates, or deletes). */ - onWrite(handler: ( - change: Change, - context: EventContext) => PromiseLike | any, + onWrite( + handler: ( + change: Change, + context: EventContext + ) => PromiseLike | any ): CloudFunction> { return this.onOperation(handler, 'document.write', changeConstructor); - }; + } /** Respond only to document updates. */ - onUpdate(handler: ( - change: Change, - context: EventContext) => PromiseLike | any, + onUpdate( + handler: ( + change: Change, + context: EventContext + ) => PromiseLike | any ): CloudFunction> { return this.onOperation(handler, 'document.update', changeConstructor); } /** Respond only to document creations. */ - onCreate(handler: ( - snapshot: DocumentSnapshot, - context: EventContext) => PromiseLike | any, + onCreate( + handler: ( + snapshot: DocumentSnapshot, + context: EventContext + ) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'document.create', snapshotConstructor); } /** Respond only to document deletions. */ - onDelete(handler: ( - snapshot: DocumentSnapshot, - context: EventContext) => PromiseLike | any, + onDelete( + handler: ( + snapshot: DocumentSnapshot, + context: EventContext + ) => PromiseLike | any ): CloudFunction { - return this.onOperation(handler, 'document.delete', beforeSnapshotConstructor); + return this.onOperation( + handler, + 'document.delete', + beforeSnapshotConstructor + ); } private onOperation( handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, - dataConstructor: (raw: Event | LegacyEvent) => any): CloudFunction { + dataConstructor: (raw: Event | LegacyEvent) => any + ): CloudFunction { return makeCloudFunction({ handler, provider, diff --git a/src/providers/https.ts b/src/providers/https.ts index 82f5c56ba..f647d6f1f 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -27,10 +27,14 @@ import { apps } from '../apps'; import * as _ from 'lodash'; import * as cors from 'cors'; -export function onRequest(handler: (req: express.Request, resp: express.Response) => void): HttpsFunction { +export function onRequest( + handler: (req: express.Request, resp: express.Response) => void +): HttpsFunction { // lets us add __trigger without altering handler: - let cloudFunction: any = (req: express.Request, res: express.Response) => { handler(req, res); }; - cloudFunction.__trigger = {httpsTrigger: {}}; + let cloudFunction: any = (req: express.Request, res: express.Response) => { + handler(req, res); + }; + cloudFunction.__trigger = { httpsTrigger: {} }; return cloudFunction; } @@ -101,22 +105,22 @@ export type FunctionsErrorCode = * to the HTTP format error code string, and make sure it's in the supported set. */ const errorCodeMap: { [name: string]: string } = { - 'ok': 'OK', - 'cancelled': 'CANCELLED', - 'unknown': 'UNKNOWN', + ok: 'OK', + cancelled: 'CANCELLED', + unknown: 'UNKNOWN', 'invalid-argument': 'INVALID_ARGUMENT', 'deadline-exceeded': 'DEADLINE_EXCEEDED', 'not-found': 'NOT_FOUND', 'already-exists': 'ALREADY_EXISTS', 'permission-denied': 'PERMISSION_DENIED', - 'unauthenticated': 'UNAUTHENTICATED', + unauthenticated: 'UNAUTHENTICATED', 'resource-exhausted': 'RESOURCE_EXHAUSTED', 'failed-precondition': 'FAILED_PRECONDITION', - 'aborted': 'ABORTED', + aborted: 'ABORTED', 'out-of-range': 'OUT_OF_RANGE', - 'unimplemented': 'UNIMPLEMENTED', - 'internal': 'INTERNAL', - 'unavailable': 'UNAVAILABLE', + unimplemented: 'UNIMPLEMENTED', + internal: 'INTERNAL', + unavailable: 'UNAVAILABLE', 'data-loss': 'DATA_LOSS', }; @@ -166,25 +170,43 @@ export class HttpsError extends Error { */ get httpStatus(): number { switch (this.code) { - case 'ok': return 200; - case 'cancelled': return 499; - case 'unknown': return 500; - case 'invalid-argument': return 400; - case 'deadline-exceeded': return 504; - case 'not-found': return 404; - case 'already-exists': return 409; - case 'permission-denied': return 403; - case 'unauthenticated': return 401; - case 'resource-exhausted': return 429; - case 'failed-precondition': return 400; - case 'aborted': return 409; - case 'out-of-range': return 400; - case 'unimplemented': return 501; - case 'internal': return 500; - case 'unavailable': return 503; - case 'data-loss': return 500; + case 'ok': + return 200; + case 'cancelled': + return 499; + case 'unknown': + return 500; + case 'invalid-argument': + return 400; + case 'deadline-exceeded': + return 504; + case 'not-found': + return 404; + case 'already-exists': + return 409; + case 'permission-denied': + return 403; + case 'unauthenticated': + return 401; + case 'resource-exhausted': + return 429; + case 'failed-precondition': + return 400; + case 'aborted': + return 409; + case 'out-of-range': + return 400; + case 'unimplemented': + return 501; + case 'internal': + return 500; + case 'unavailable': + return 503; + case 'data-loss': + return 500; // This should never happen as long as the type system is doing its job. - default: throw 'Invalid error code: ' + this.code; + default: + throw 'Invalid error code: ' + this.code; } } @@ -229,13 +251,13 @@ interface HttpRequest extends express.Request { body: { data: any; }; -}; +} // The format for the http body response to a callable function. interface HttpResponseBody { result?: any; error?: HttpsError; -}; +} // Returns true if req is a properly formatted callable request. function isValidRequest(req: express.Request): req is HttpRequest { @@ -333,7 +355,7 @@ export function decode(data: any): any { if (data['@type']) { switch (data['@type']) { case LONG_TYPE: - // Fall through and handle this the same as unsigned. + // Fall through and handle this the same as unsigned. case UNSIGNED_LONG_TYPE: { // Technically, this could work return a valid number for malformed // data if there was a number followed by garbage. But it's just not @@ -370,7 +392,8 @@ const corsHandler = cors({ origin: true, methods: 'POST' }); * @param handler A method that takes a data and context and returns a value. */ export function onCall( - handler: (data: any, context: CallableContext) => any | Promise): HttpsFunction { + handler: (data: any, context: CallableContext) => any | Promise +): HttpsFunction { const func = async (req: express.Request, res: express.Response) => { try { if (!isValidRequest(req)) { @@ -388,7 +411,9 @@ export function onCall( } const idToken = match[1]; try { - const authToken = await apps().admin.auth().verifyIdToken(idToken); + const authToken = await apps() + .admin.auth() + .verifyIdToken(idToken); context.auth = { uid: authToken.uid, token: authToken, @@ -416,7 +441,6 @@ export function onCall( // If there was some result, encode it in the body. const responseBody: HttpResponseBody = { result }; res.status(200).send(responseBody); - } catch (error) { if (!(error instanceof HttpsError)) { // This doesn't count as an 'explicit' error. diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index c2359b73c..842d662e5 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -20,7 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { CloudFunction, makeCloudFunction, EventContext } from '../cloud-functions'; +import { + CloudFunction, + makeCloudFunction, + EventContext, +} from '../cloud-functions'; /** @internal */ export const provider = 'google.pubsub'; @@ -43,19 +47,20 @@ export function topic(topic: string): TopicBuilder { /** Builder used to create Cloud Functions for Google Pub/Sub topics. */ export class TopicBuilder { - /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** Handle a Pub/Sub message that was published to a Cloud Pub/Sub topic */ - onPublish(handler: (message: Message, context: EventContext) => PromiseLike | any): CloudFunction { + onPublish( + handler: (message: Message, context: EventContext) => PromiseLike | any + ): CloudFunction { return makeCloudFunction({ handler, provider, service, triggerResource: this.triggerResource, eventType: 'topic.publish', - dataConstructor: (raw) => new Message(raw.data), + dataConstructor: raw => new Message(raw.data), }); } } @@ -69,19 +74,20 @@ export class TopicBuilder { */ export class Message { readonly data: string; - readonly attributes: {[key: string]: string }; + readonly attributes: { [key: string]: string }; private _json: any; constructor(data: any) { - [this.data, this.attributes, this._json] = - [data.data, data.attributes || {}, data.json]; + [this.data, this.attributes, this._json] = [ + data.data, + data.attributes || {}, + data.json, + ]; } get json(): any { if (typeof this._json === 'undefined') { - this._json = JSON.parse( - new Buffer(this.data, 'base64').toString('utf8') - ); + this._json = JSON.parse(new Buffer(this.data, 'base64').toString('utf8')); } return this._json; diff --git a/src/providers/storage.ts b/src/providers/storage.ts index 6650a304b..d7bd4a995 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -20,7 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { CloudFunction, EventContext, makeCloudFunction } from '../cloud-functions'; +import { + CloudFunction, + EventContext, + makeCloudFunction, +} from '../cloud-functions'; import { firebaseConfig } from '../config'; /** @internal */ @@ -37,8 +41,10 @@ export function bucket(bucket?: string): BucketBuilder { const resourceGetter = () => { bucket = bucket || firebaseConfig().storageBucket; if (!bucket) { - throw new Error('Missing bucket name. If you are unit testing, please provide a bucket name' + - ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.'); + throw new Error( + 'Missing bucket name. If you are unit testing, please provide a bucket name' + + ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.' + ); } if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) { throw new Error(`Invalid bucket name ${bucket}`); @@ -54,7 +60,7 @@ export function object(): ObjectBuilder { export class BucketBuilder { /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** Handle events for objects in this bucket. */ object() { @@ -64,49 +70,63 @@ export class BucketBuilder { export class ObjectBuilder { /** @internal */ - constructor(private triggerResource: () => string) { } + constructor(private triggerResource: () => string) {} /** @internal */ onChange(handler: any): Error { - throw new Error('"onChange" is now deprecated, please use "onArchive", "onDelete", ' + - '"onFinalize", or "onMetadataUpdate".'); + throw new Error( + '"onChange" is now deprecated, please use "onArchive", "onDelete", ' + + '"onFinalize", or "onMetadataUpdate".' + ); } /** Respond to archiving of an object, this is only for buckets that enabled object versioning. */ - onArchive(handler: ( - object: ObjectMetadata, - context: EventContext) => PromiseLike | any, + onArchive( + handler: ( + object: ObjectMetadata, + context: EventContext + ) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'object.archive'); } /** Respond to the deletion of an object (not to archiving, if object versioning is enabled). */ - onDelete(handler: ( - object: ObjectMetadata, - context: EventContext) => PromiseLike | any, + onDelete( + handler: ( + object: ObjectMetadata, + context: EventContext + ) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'object.delete'); } /** Respond to the successful creation of an object. */ - onFinalize(handler: ( - object: ObjectMetadata, - context: EventContext) => PromiseLike | any, + onFinalize( + handler: ( + object: ObjectMetadata, + context: EventContext + ) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'object.finalize'); } /** Respond to metadata updates of existing objects. */ - onMetadataUpdate(handler: ( - object: ObjectMetadata, - context: EventContext) => PromiseLike | any, + onMetadataUpdate( + handler: ( + object: ObjectMetadata, + context: EventContext + ) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'object.metadataUpdate'); } private onOperation( - handler: (object: ObjectMetadata, context: EventContext) => PromiseLike | any, - eventType: string): CloudFunction { + handler: ( + object: ObjectMetadata, + context: EventContext + ) => PromiseLike | any, + eventType: string + ): CloudFunction { return makeCloudFunction({ handler, provider, @@ -143,33 +163,33 @@ export interface ObjectMetadata { }; acl?: [ { - kind?: string, - id?: string, - selfLink?: string, - bucket?: string, - object?: string, - generation?: string, - entity?: string, - role?: string, - email?: string, - entityId?: string, - domain?: string, + kind?: string; + id?: string; + selfLink?: string; + bucket?: string; + object?: string; + generation?: string; + entity?: string; + role?: string; + email?: string; + entityId?: string; + domain?: string; projectTeam?: { - projectNumber?: string, - team?: string - }, - etag?: string + projectNumber?: string; + team?: string; + }; + etag?: string; } ]; owner?: { - entity?: string, - entityId?: string + entity?: string; + entityId?: string; }; crc32c?: string; componentCount?: string; etag?: string; customerEncryption?: { - encryptionAlgorithm?: string, - keySha256?: string, + encryptionAlgorithm?: string; + keySha256?: string; }; } diff --git a/src/utils.ts b/src/utils.ts index 522dadb9f..d483f0697 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -26,7 +26,7 @@ export function normalizePath(path: string): string { if (!path) { return ''; } - return path.replace(/^\//,'').replace(/\/$/, ''); + return path.replace(/^\//, '').replace(/\/$/, ''); } export function pathParts(path: string): string[] { @@ -37,7 +37,9 @@ export function pathParts(path: string): string[] { } export function joinPath(base: string, child: string) { - return pathParts(base).concat(pathParts(child)).join('/'); + return pathParts(base) + .concat(pathParts(child)) + .join('/'); } export function applyChange(src: any, dest: any) { From 65047d003ece50f9cad01fb7d44ccf37bdfbaf07 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 11 Jul 2018 14:11:53 -0700 Subject: [PATCH 039/705] Support Node 8 Google Cloud Functions Runtime (#203) --- integration_test/functions/package.json | 12 +- integration_test/functions/src/index.ts | 14 +- integration_test/functions/tsconfig.json | 2 +- package.json | 6 +- spec/cloud-functions.spec.ts | 68 +++++++-- spec/providers/firestore.spec.ts | 169 +++++++++++++++-------- src/cloud-functions.ts | 99 +++++++------ src/providers/auth.ts | 4 +- src/providers/database.ts | 21 +-- src/providers/firestore.ts | 23 +-- 10 files changed, 277 insertions(+), 141 deletions(-) diff --git a/integration_test/functions/package.json b/integration_test/functions/package.json index 746d9526d..1250f39a5 100644 --- a/integration_test/functions/package.json +++ b/integration_test/functions/package.json @@ -5,16 +5,20 @@ "build": "./node_modules/.bin/tsc" }, "dependencies": { - "@google-cloud/pubsub": "^0.6.0", - "@types/lodash": "^4.14.41", - "firebase": "^4.9.1", + "@google-cloud/pubsub": "~0.19.0", + "@types/google-cloud__pubsub": "^0.18.0", + "@types/lodash": "~4.14.41", + "firebase": "~5.2.0", "firebase-admin": "~5.12.1", "firebase-functions": "./firebase-functions.tgz", - "lodash": "^4.17.2" + "lodash": "~4.17.2" }, "main": "lib/index.js", "devDependencies": { "typescript": "~2.8.3" }, + "engines": { + "node": "8" + }, "private": true } diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 42626dbec..4ea9c7b59 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -4,6 +4,9 @@ import * as https from 'https'; import * as admin from 'firebase-admin'; import { Request, Response } from 'express'; +import * as PubSub from '@google-cloud/pubsub'; +const pubsub = PubSub(); + export * from './pubsub-tests'; export * from './database-tests'; export * from './auth-tests'; @@ -14,7 +17,6 @@ const numTests = Object.keys(exports).length; // Assumption: every exported func import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); firebase.initializeApp(firebaseConfig); -console.log('initializing admin'); admin.initializeApp(); // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. @@ -45,22 +47,22 @@ function callHttpsTrigger(name: string, data: any) { export const integrationTests: any = functions.https.onRequest( (req: Request, resp: Response) => { - let pubsub: any = require('@google-cloud/pubsub')(); - const testId = firebase .database() .ref() .push().key; return Promise.all([ // A database write to trigger the Firebase Realtime Database tests. - // The database write happens without admin privileges, so that the triggered function's "event.data.ref" also - // doesn't have admin privileges. + // The database write happens without admin privileges. firebase .database() .ref(`dbTests/${testId}/start`) .set({ '.sv': 'timestamp' }), // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. - pubsub.topic('pubsubTests').publish({ testId }), + pubsub + .topic('pubsubTests') + .publisher() + .publish(Buffer.from(JSON.stringify({ testId }))), // A user creation to trigger the Firebase Auth user creation tests. admin .auth() diff --git a/integration_test/functions/tsconfig.json b/integration_test/functions/tsconfig.json index 554bd3a6b..a8e9362db 100644 --- a/integration_test/functions/tsconfig.json +++ b/integration_test/functions/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "lib": ["es6"], + "lib": ["es6", "dom"], "module": "commonjs", "target": "es6", "noImplicitAny": false, diff --git a/package.json b/package.json index 316ef0422..0ad4d32ce 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,11 @@ "build": "node_modules/.bin/tsc -p tsconfig.release.json", "build:pack": "rm -rf lib && npm install && node_modules/.bin/tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install typescript firebase-admin && node_modules/.bin/tsc -p tsconfig.release.json", - "lint": "node_modules/.bin/tslint src/{**/*,*}.ts spec/{**/*,*}.ts integration_test/functions/src/{**/*,*}.ts", "format": "prettier --write '**/*.ts'", "pretest": "node_modules/.bin/tsc && cp -r spec/fixtures .tmp/spec", "test": "npm run mocha", "mocha": "mocha .tmp/spec/index.spec.js", - "posttest": "npm run lint && rm -rf .tmp", + "posttest": "npm run format && rm -rf .tmp", "postinstall": "node ./upgrade-warning" }, "repository": { @@ -48,8 +47,7 @@ "nock": "^9.0.0", "prettier": "^1.13.7", "sinon": "^1.17.4", - "typescript": "~2.8.3", - "tslint": "^3.15.1" + "typescript": "~2.8.3" }, "peerDependencies": { "firebase-admin": "~5.12.1" diff --git a/spec/cloud-functions.spec.ts b/spec/cloud-functions.spec.ts index 7f3564339..cde9db5a9 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/cloud-functions.spec.ts @@ -38,10 +38,17 @@ describe('makeCloudFunction', () => { service: 'service', triggerResource: () => 'resource', handler: () => null, + legacyEventType: 'providers/provider/eventTypes/event', }; it('should put a __trigger on the returned CloudFunction', () => { - let cf = makeCloudFunction(cloudFunctionArgs); + let cf = makeCloudFunction({ + provider: 'mock.provider', + eventType: 'mock.event', + service: 'service', + triggerResource: () => 'resource', + handler: () => null, + }); expect(cf.__trigger).to.deep.equal({ eventTrigger: { eventType: 'mock.provider.mock.event', @@ -51,6 +58,17 @@ describe('makeCloudFunction', () => { }); }); + it('should have legacy event type in __trigger if provided', () => { + let cf = makeCloudFunction(cloudFunctionArgs); + expect(cf.__trigger).to.deep.equal({ + eventTrigger: { + eventType: 'providers/provider/eventTypes/event', + resource: 'resource', + service: 'service', + }, + }); + }); + it('should construct the right context for legacy event format', () => { let args: any = _.assign({}, cloudFunctionArgs, { handler: (data: any, context: EventContext) => context, @@ -105,6 +123,39 @@ describe('makeCloudFunction', () => { params: {}, }); }); + + it('should handle Node 8 function signature', () => { + let args: any = _.assign({}, cloudFunctionArgs, { + handler: (data: any, context: EventContext) => { + return { data, context }; + }, + }); + let cf = makeCloudFunction(args); + let testContext = { + eventId: '00000', + timestamp: '2016-11-04T21:29:03.496Z', + eventType: 'provider.event', + resource: { + service: 'provider', + name: 'resource', + }, + }; + let testData = 'data'; + + return expect(cf(testData, testContext)).to.eventually.deep.equal({ + data: 'data', + context: { + eventId: '00000', + timestamp: '2016-11-04T21:29:03.496Z', + eventType: 'provider.event', + resource: { + service: 'provider', + name: 'resource', + }, + params: {}, + }, + }); + }); }); describe('makeParams', () => { @@ -114,13 +165,14 @@ describe('makeParams', () => { service: 'service', triggerResource: () => 'projects/_/instances/pid/ref/{foo}/nested/{bar}', handler: (data, context) => context.params, + legacyEventType: 'legacyEvent', }; const cf = makeCloudFunction(args); it('should construct params from the event resource of legacy events', () => { const testEvent: LegacyEvent = { resource: 'projects/_/instances/pid/ref/a/nested/b', - eventType: 'event', + eventType: 'legacyEvent', data: 'data', }; @@ -160,14 +212,14 @@ describe('makeAuth and makeAuthType', () => { handler: (data, context) => { return { auth: context.auth, - authMode: context.authType, + authType: context.authType, }; }, }; let cf = makeCloudFunction(args); it('should construct correct auth and authType for admin user', () => { - const testEvent: LegacyEvent = { + const testEvent = { data: 'data', auth: { admin: true, @@ -176,12 +228,12 @@ describe('makeAuth and makeAuthType', () => { return expect(cf(testEvent)).to.eventually.deep.equal({ auth: undefined, - authMode: 'ADMIN', + authType: 'ADMIN', }); }); it('should construct correct auth and authType for unauthenticated user', () => { - const testEvent: LegacyEvent = { + const testEvent = { data: 'data', auth: { admin: false, @@ -190,7 +242,7 @@ describe('makeAuth and makeAuthType', () => { return expect(cf(testEvent)).to.eventually.deep.equal({ auth: null, - authMode: 'UNAUTHENTICATED', + authType: 'UNAUTHENTICATED', }); }); @@ -216,7 +268,7 @@ describe('makeAuth and makeAuthType', () => { sub: 'user', }, }, - authMode: 'USER', + authType: 'USER', }); }); }); diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index cdd9d4c0e..16a1f41fd 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -21,17 +21,37 @@ // SOFTWARE. import * as firestore from '../../src/providers/firestore'; +import * as _ from 'lodash'; import { expect } from 'chai'; describe('Firestore Functions', () => { - let constructValue = (fields: any) => { + function constructValue(fields: any) { return { fields: fields, name: 'projects/pid/databases/(default)/documents/collection/123', createTime: '2017-06-02T18:48:58.920638Z', updateTime: '2017-07-02T18:48:58.920638Z', }; - }; + } + + function makeEvent(data: any, context?: { [key: string]: any }) { + context = context || {}; + return { + data: data, + context: _.merge( + { + eventId: '123', + timestamp: '2018-07-03T00:49:04.264Z', + eventType: 'google.firestore.document.create', + resource: { + name: 'projects/myproj/databases/(default)/documents/tests/test1', + service: 'service', + }, + }, + context + ), + }; + } describe('document builders and event types', () => { function expectedTrigger(resource: string, eventType: string) { @@ -158,7 +178,11 @@ describe('Firestore Functions', () => { oldValue: oldValue, value: value, }, - context: {}, + context: { + resource: { + name: 'resource', + }, + }, }; } @@ -184,6 +208,14 @@ describe('Firestore Functions', () => { }); } + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + it('constructs appropriate fields and getters for event.data on "document.write" events', () => { let testFunction = firestore.document('path').onWrite(change => { expect(change.before.data()).to.deep.equal({ key1: false, key2: 111 }); @@ -240,47 +272,47 @@ describe('Firestore Functions', () => { describe('SnapshotConstructor', () => { describe('#data()', () => { it('should parse int values', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: constructValue({ key: { integerValue: '123' } }), - }, - }); + }) + ); expect(snapshot.data()).to.deep.equal({ key: 123 }); }); it('should parse double values', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: constructValue({ key: { doubleValue: 12.34 } }), - }, - }); + }) + ); expect(snapshot.data()).to.deep.equal({ key: 12.34 }); }); it('should parse null values', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: constructValue({ key: { nullValue: null } }), - }, - }); + }) + ); expect(snapshot.data()).to.deep.equal({ key: null }); }); it('should parse boolean values', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: constructValue({ key: { booleanValue: true } }), - }, - }); + }) + ); expect(snapshot.data()).to.deep.equal({ key: true }); }); it('should parse string values', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: constructValue({ key: { stringValue: 'foo' } }), - }, - }); + }) + ); expect(snapshot.data()).to.deep.equal({ key: 'foo' }); }); @@ -292,9 +324,11 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ key: [1, 2] }); }); @@ -313,9 +347,11 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ keyParent: { key1: 'val1', key2: 'val2' }, }); @@ -336,9 +372,11 @@ describe('Firestore Functions', () => { }, }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ geoPointValue: { latitude: 40.73, @@ -354,9 +392,11 @@ describe('Firestore Functions', () => { 'projects/proj1/databases/(default)/documents/doc1/id', }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()['referenceVal'].path).to.equal('doc1/id'); }); @@ -366,9 +406,11 @@ describe('Firestore Functions', () => { timestampValue: '2017-06-13T00:58:40.349Z', }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ timestampVal: new Date('2017-06-13T00:58:40.349Z'), }); @@ -380,9 +422,11 @@ describe('Firestore Functions', () => { timestampValue: '2017-06-13T00:58:40Z', }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ timestampVal: new Date('2017-06-13T00:58:40Z'), }); @@ -395,9 +439,11 @@ describe('Firestore Functions', () => { bytesValue: 'Zm9vYmFy', }, }); - let snapshot = firestore.snapshotConstructor({ - data: { value: raw }, - }); + let snapshot = firestore.snapshotConstructor( + makeEvent({ + value: raw, + }) + ); expect(snapshot.data()).to.deep.equal({ binaryVal: new Buffer('foobar'), }); @@ -408,8 +454,8 @@ describe('Firestore Functions', () => { let snapshot: FirebaseFirestore.DocumentSnapshot; before(() => { - snapshot = firestore.snapshotConstructor({ - data: { + snapshot = firestore.snapshotConstructor( + makeEvent({ value: { fields: { key: { integerValue: '1' } }, createTime: '2017-06-17T14:45:17.876479Z', @@ -417,8 +463,8 @@ describe('Firestore Functions', () => { readTime: '2017-07-31T18:23:26.928527Z', name: 'projects/pid/databases/(default)/documents/collection/123', }, - }, - }); + }) + ); }); it('should support #exists', () => { @@ -458,27 +504,34 @@ describe('Firestore Functions', () => { describe('Handle empty and non-existent documents', () => { it('constructs non-existent DocumentSnapshot when whole document deleted', () => { - let snapshot = firestore.snapshotConstructor({ - data: { - value: {}, // value is empty when the whole document is deleted - }, - resource: 'projects/pid/databases/(default)/documents/collection/123', - }); + let snapshot = firestore.snapshotConstructor( + makeEvent( + { + value: {}, // value is empty when the whole document is deleted + }, + { + resource: { + name: + 'projects/pid/databases/(default)/documents/collection/123', + }, + } + ) + ); expect(snapshot.exists).to.be.false; expect(snapshot.ref.path).to.equal('collection/123'); }); it('constructs existent DocumentSnapshot with empty data when all fields of document deleted', () => { - let snapshot = firestore.snapshotConstructor({ - data: { + let snapshot = firestore.snapshotConstructor( + makeEvent({ value: { // value is not empty when document still exists createTime: '2017-06-02T18:48:58.920638Z', updateTime: '2017-07-02T18:48:58.920638Z', name: 'projects/pid/databases/(default)/documents/collection/123', }, - }, - }); + }) + ); expect(snapshot.exists).to.be.true; expect(snapshot.ref.path).to.equal('collection/123'); expect(snapshot.data()).to.deep.equal({}); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index bf36b3dce..2f873f9b7 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -191,7 +191,7 @@ export type HttpsFunction = TriggerAnnotated & */ export type CloudFunction = Runnable & TriggerAnnotated & - ((input: any) => PromiseLike | any); + ((input: any, context?: any) => PromiseLike | any); /** @internal */ export interface MakeCloudFunctionArgs { @@ -201,10 +201,10 @@ export interface MakeCloudFunctionArgs { eventType: string; triggerResource: () => string; service: string; - dataConstructor?: (raw: Event | LegacyEvent) => EventData; + dataConstructor?: (raw: Event) => EventData; handler: (data: EventData, context: EventContext) => PromiseLike | any; - before?: (raw: Event | LegacyEvent) => void; - after?: (raw: Event | LegacyEvent) => void; + before?: (raw: Event) => void; + after?: (raw: Event) => void; legacyEventType?: string; } @@ -214,7 +214,7 @@ export function makeCloudFunction({ eventType, triggerResource, service, - dataConstructor = (raw: Event | LegacyEvent) => raw.data, + dataConstructor = (raw: Event) => raw.data, handler, before = () => { return; @@ -224,42 +224,55 @@ export function makeCloudFunction({ }, legacyEventType, }: MakeCloudFunctionArgs): CloudFunction { - let cloudFunction: any = async (event: Event | LegacyEvent) => { - if (!_.has(event, 'data')) { - throw Error( - 'Cloud function needs to be called with an event parameter.' + - 'If you are writing unit tests, please use the Node module firebase-functions-fake.' - ); + let cloudFunction: any = async (eventOrData: any, context?: any) => { + let data: any; + if (isContext(context)) { + // In Node 8 runtime, function called with 2 params: data & context + data = eventOrData; + } else { + // In Node 6 runtime, function called with single event param + data = _.get(eventOrData, 'data'); + if (isEvent(eventOrData)) { + // new eventflow v1beta2 format + context = _.cloneDeep(eventOrData.context); + } else { + // eventflow v1beta1 format + context = _.omit(eventOrData, 'data'); + } } - try { - before(event); - let dataOrChange = dataConstructor(event); - let context: any; - if (isEvent(event)) { - // new event format - context = _.cloneDeep(event.context); + if (legacyEventType && context.eventType === legacyEventType) { + // v1beta1 event flow has different format for context, transform them to new format. + context = { + eventId: context.eventId, + timestamp: context.timestamp, + eventType: provider + '.' + eventType, + resource: { + service: service, + name: context.resource, + }, + }; + } + + let event: Event = { + data, + context, + }; + + if (provider === 'google.firebase.database') { + context.authType = _detectAuthType(event); + if (context.authType !== 'ADMIN') { + context.auth = _makeAuth(event, context.authType); } else { - // legacy event format - context = { - eventId: event.eventId, - timestamp: event.timestamp, - eventType: provider + '.' + eventType, - resource: { - service: service, - name: event.resource, - }, - }; - if (provider === 'google.firebase.database') { - context.authType = _detectAuthType(event); - if (context.authType !== 'ADMIN') { - context.auth = _makeAuth(event, context.authType); - } - } + delete context.auth; } + } + context.params = context.params || _makeParams(context, triggerResource); - context.params = _makeParams(context, triggerResource); + try { + before(event); + let dataOrChange = dataConstructor(event); let promise = handler(dataOrChange, context); if (typeof promise === 'undefined') { console.warn('Function returned undefined, expected Promise or value'); @@ -288,6 +301,10 @@ function isEvent(event: Event | LegacyEvent): event is Event { return _.has(event, 'context'); } +function isContext(context: EventContext | any): context is EventContext { + return _.has(context, 'eventId'); +} + function _makeParams( context: EventContext, triggerResourceGetter: () => string @@ -315,21 +332,21 @@ function _makeParams( return params; } -function _makeAuth(event: LegacyEvent, authType: string) { +function _makeAuth(event: Event, authType: string) { if (authType === 'UNAUTHENTICATED') { return null; } return { - uid: _.get(event, 'auth.variable.uid'), - token: _.get(event, 'auth.variable.token'), + uid: _.get(event, 'context.auth.variable.uid'), + token: _.get(event, 'context.auth.variable.token'), }; } -function _detectAuthType(event: LegacyEvent) { - if (_.get(event, 'auth.admin')) { +function _detectAuthType(event: Event) { + if (_.get(event, 'context.auth.admin')) { return 'ADMIN'; } - if (_.has(event, 'auth.variable')) { + if (_.has(event, 'context.auth.variable')) { return 'USER'; } return 'UNAUTHENTICATED'; diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 47b5c0ece..b35a9491c 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -24,7 +24,7 @@ import { makeCloudFunction, CloudFunction, EventContext, - LegacyEvent, + Event, } from '../cloud-functions'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; @@ -58,7 +58,7 @@ export class UserRecordMetadata implements firebase.auth.UserMetadata { /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */ export class UserBuilder { - private static dataConstructor(raw: LegacyEvent): firebase.auth.UserRecord { + private static dataConstructor(raw: Event): firebase.auth.UserRecord { return userRecordConstructor(raw.data); } diff --git a/src/providers/database.ts b/src/providers/database.ts index e3788f899..5bb8ca3e8 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -23,7 +23,6 @@ import * as _ from 'lodash'; import { apps } from '../apps'; import { - LegacyEvent, CloudFunction, makeCloudFunction, Event, @@ -142,8 +141,10 @@ export class RefBuilder { context: EventContext ) => PromiseLike | any ): CloudFunction { - let dataConstructor = (raw: LegacyEvent) => { - let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); + let dataConstructor = (raw: Event) => { + let [dbInstance, path] = resourceToInstanceAndPath( + raw.context.resource.name + ); return new DataSnapshot( raw.data.delta, path, @@ -161,8 +162,10 @@ export class RefBuilder { context: EventContext ) => PromiseLike | any ): CloudFunction { - let dataConstructor = (raw: LegacyEvent) => { - let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); + let dataConstructor = (raw: Event) => { + let [dbInstance, path] = resourceToInstanceAndPath( + raw.context.resource.name + ); return new DataSnapshot(raw.data.data, path, this.apps.admin, dbInstance); }; return this.onOperation(handler, 'ref.delete', dataConstructor); @@ -171,7 +174,7 @@ export class RefBuilder { private onOperation( handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, - dataConstructor: (raw: Event | LegacyEvent) => any + dataConstructor: (raw: Event | Event) => any ): CloudFunction { return makeCloudFunction({ handler, @@ -186,8 +189,10 @@ export class RefBuilder { }); } - private changeConstructor = (raw: LegacyEvent): Change => { - let [dbInstance, path] = resourceToInstanceAndPath(raw.resource); + private changeConstructor = (raw: Event): Change => { + let [dbInstance, path] = resourceToInstanceAndPath( + raw.context.resource.name + ); let before = new DataSnapshot( raw.data.data, path, diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 426caa650..6de8dd970 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -27,7 +27,6 @@ import { apps } from '../apps'; import { makeCloudFunction, CloudFunction, - LegacyEvent, Change, Event, EventContext, @@ -116,31 +115,37 @@ function _getValueProto(data: any, resource: string, valueFieldName: string) { } /** @internal */ -export function snapshotConstructor(event: LegacyEvent): DocumentSnapshot { +export function snapshotConstructor(event: Event): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); } - let valueProto = _getValueProto(event.data, event.resource, 'value'); + let valueProto = _getValueProto( + event.data, + event.context.resource.name, + 'value' + ); let readTime = dateToTimestampProto(_.get(event, 'data.value.readTime')); return firestoreInstance.snapshot_(valueProto, readTime, 'json'); } /** @internal */ // TODO remove this function when wire format changes to new format -export function beforeSnapshotConstructor( - event: LegacyEvent -): DocumentSnapshot { +export function beforeSnapshotConstructor(event: Event): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); } - let oldValueProto = _getValueProto(event.data, event.resource, 'oldValue'); + let oldValueProto = _getValueProto( + event.data, + event.context.resource.name, + 'oldValue' + ); let oldReadTime = dateToTimestampProto( _.get(event, 'data.oldValue.readTime') ); return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json'); } -function changeConstructor(raw: LegacyEvent) { +function changeConstructor(raw: Event) { return Change.fromObjects( beforeSnapshotConstructor(raw), snapshotConstructor(raw) @@ -200,7 +205,7 @@ export class DocumentBuilder { private onOperation( handler: (data: T, context: EventContext) => PromiseLike | any, eventType: string, - dataConstructor: (raw: Event | LegacyEvent) => any + dataConstructor: (raw: Event) => any ): CloudFunction { return makeCloudFunction({ handler, From 6d156d1f7a2e359acabe831361a2b72039d83cb8 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 13 Jul 2018 10:29:25 -0700 Subject: [PATCH 040/705] Allow selection of region, timeout and memory allocation (#202) --- .../functions/src/firestore-tests.ts | 7 +- integration_test/functions/src/index.ts | 12 +- spec/function-builder.spec.ts | 113 ++++++++ spec/index.spec.ts | 1 + spec/providers/analytics.spec.ts | 16 ++ spec/providers/auth.spec.ts | 20 +- spec/providers/crashlytics.spec.ts | 19 +- spec/providers/database.spec.ts | 16 ++ spec/providers/firestore.spec.ts | 16 ++ spec/providers/https.spec.ts | 31 ++- spec/providers/pubsub.spec.ts | 18 +- spec/providers/storage.spec.ts | 30 ++- src/cloud-functions.ts | 35 ++- src/function-builder.ts | 250 ++++++++++++++++++ src/index.ts | 5 +- src/providers/analytics.ts | 29 +- src/providers/auth.ts | 18 +- src/providers/crashlytics.ts | 14 +- src/providers/database.ts | 75 ++++-- src/providers/firestore.ts | 61 +++-- src/providers/https.ts | 46 +++- src/providers/pubsub.ts | 23 +- src/providers/storage.ts | 43 ++- 23 files changed, 799 insertions(+), 99 deletions(-) create mode 100644 spec/function-builder.spec.ts create mode 100644 src/function-builder.ts diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index 26def7fff..1a9dd1d7e 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -5,8 +5,11 @@ import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; -export const firestoreTests: any = functions.firestore - .document('tests/{documentId}') +export const firestoreTests: any = functions + .runWith({ + timeoutSeconds: 540, + }) + .firestore.document('tests/{documentId}') .onCreate((s, c) => { return new TestSuite('firestore document onWrite') diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 4ea9c7b59..64e3aca5a 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -45,8 +45,13 @@ function callHttpsTrigger(name: string, data: any) { }); } -export const integrationTests: any = functions.https.onRequest( - (req: Request, resp: Response) => { +export const integrationTests: any = functions + .runWith({ + timeoutSeconds: 540, + }) + .https.onRequest((req: Request, resp: Response) => { + let pubsub: any = require('@google-cloud/pubsub')(); + const testId = firebase .database() .ref() @@ -134,5 +139,4 @@ export const integrationTests: any = functions.https.onRequest( }.firebaseio.com/testRuns/${testId}` ); }); - } -); + }); diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts new file mode 100644 index 000000000..a1733fb1d --- /dev/null +++ b/spec/function-builder.spec.ts @@ -0,0 +1,113 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + +import { expect } from 'chai'; + +import * as functions from '../src/index'; + +describe('FunctionBuilder', () => { + before(() => { + process.env.GCLOUD_PROJECT = 'not-a-project'; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should allow region to be set', () => { + let fn = functions + .region('my-region') + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + }); + + it('should allow multiple regions to be set', () => { + let fn = functions + .region('my-region', 'my-other-region') + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.regions).to.deep.equal([ + 'my-region', + 'my-other-region', + ]); + }); + + it('should allow runtime options to be set', () => { + let fn = functions + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + + it('should allow both region and runtime options to be set (reverse order)', () => { + let fn = functions + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .region('my-region') + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + + it('should throw an error if user chooses an unsupported memory allocation', () => { + expect(() => { + return functions.runWith({ + memory: 'unsupported', + } as any); + }).to.throw(Error); + + expect(() => { + return functions.region('some-region').runWith({ + memory: 'unsupported', + } as any); + }).to.throw(Error); + }); +}); diff --git a/spec/index.spec.ts b/spec/index.spec.ts index 918ca80d1..6c64e5cba 100644 --- a/spec/index.spec.ts +++ b/spec/index.spec.ts @@ -33,6 +33,7 @@ import './apps.spec'; import './cloud-functions.spec'; import './config.spec'; import './testing.spec'; +import './function-builder.spec'; import './providers/analytics.spec'; import './providers/auth.spec'; import './providers/database.spec'; diff --git a/spec/providers/analytics.spec.ts b/spec/providers/analytics.spec.ts index e2a58081d..e56e354f6 100644 --- a/spec/providers/analytics.spec.ts +++ b/spec/providers/analytics.spec.ts @@ -24,6 +24,7 @@ import * as analytics from '../../src/providers/analytics'; import { expect } from 'chai'; import { LegacyEvent } from '../../src/cloud-functions'; import * as analytics_spec_input from './analytics.spec.input'; +import * as functions from '../../src/index'; describe('Analytics Functions', () => { describe('EventBuilder', () => { @@ -35,6 +36,21 @@ describe('Analytics Functions', () => { delete process.env.GCLOUD_PROJECT; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .analytics.event('event') + .onLog(event => event); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onLog', () => { it('should return a TriggerDefinition with appropriate values', () => { const cloudFunction = analytics.event('first_open').onLog(() => null); diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index 603b0e00e..f63840f2d 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -20,10 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as auth from '../../src/providers/auth'; import { expect } from 'chai'; import * as firebase from 'firebase-admin'; -import { CloudFunction } from '../../src'; +import * as auth from '../../src/providers/auth'; +import { CloudFunction } from '../../src/cloud-functions'; +import * as functions from '../../src/index'; describe('Auth Functions', () => { describe('AuthBuilder', () => { @@ -37,6 +38,21 @@ describe('Auth Functions', () => { delete process.env.GCLOUD_PROJECT; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .auth.user() + .onCreate(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onCreate', () => { it('should return a TriggerDefinition with appropriate values', () => { const cloudFunction = auth.user().onCreate(() => null); diff --git a/spec/providers/crashlytics.spec.ts b/spec/providers/crashlytics.spec.ts index 517324590..391ae016a 100644 --- a/spec/providers/crashlytics.spec.ts +++ b/spec/providers/crashlytics.spec.ts @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { expect } from 'chai'; + import * as crashlytics from '../../src/providers/crashlytics'; import { apps as appsNamespace } from '../../src/apps'; -import { expect } from 'chai'; +import * as functions from '../../src/index'; describe('Crashlytics Functions', () => { describe('Issue Builder', () => { @@ -36,6 +38,21 @@ describe('Crashlytics Functions', () => { delete process.env.GCLOUD_PROJECT; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .crashlytics.issue() + .onNew(issue => issue); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onNew', () => { it('should return a TriggerDefinition with appropriate values', () => { const cloudFunction = crashlytics.issue().onNew(data => null); diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index 55f8c2b4d..87d502243 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -24,6 +24,7 @@ import * as database from '../../src/providers/database'; import { expect } from 'chai'; import { apps as appsNamespace } from '../../src/apps'; import { applyChange } from '../../src/utils'; +import * as functions from '../../src/index'; describe('Database Functions', () => { describe('DatabaseBuilder', () => { @@ -41,6 +42,21 @@ describe('Database Functions', () => { delete appsNamespace.singleton; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .database.ref('/') + .onCreate(snap => snap); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onWrite()', () => { it('should return "ref.write" as the event type', () => { let eventType = database.ref('foo').onWrite(() => null).__trigger diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 16a1f41fd..5a03c10d1 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -23,6 +23,7 @@ import * as firestore from '../../src/providers/firestore'; import * as _ from 'lodash'; import { expect } from 'chai'; +import * as functions from '../../src/index'; describe('Firestore Functions', () => { function constructValue(fields: any) { @@ -117,6 +118,21 @@ describe('Firestore Functions', () => { ); }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .firestore.document('doc') + .onCreate(snap => snap); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + it('onCreate should have the "document.create" eventType', () => { let resource = 'projects/project1/databases/(default)/documents/users/{uid}'; diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index cc20c1cb0..7c6deb458 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { expect } from 'chai'; import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as https from '../../src/providers/https'; @@ -28,7 +29,7 @@ import * as mocks from '../fixtures/credential/key.json'; import * as nock from 'nock'; import * as _ from 'lodash'; import { apps as appsNamespace } from '../../src/apps'; -import { expect } from 'chai'; +import * as functions from '../../src/index'; describe('CloudHttpsBuilder', () => { describe('#onRequest', () => { @@ -38,6 +39,20 @@ describe('CloudHttpsBuilder', () => { }); expect(result.__trigger).to.deep.equal({ httpsTrigger: {} }); }); + + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .https.onRequest(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); }); }); @@ -490,6 +505,20 @@ describe('callable.FunctionBuilder', () => { }, }); }); + + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .https.onCall(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); }); }); diff --git a/spec/providers/pubsub.spec.ts b/spec/providers/pubsub.spec.ts index 83df21ab0..1363955fb 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/providers/pubsub.spec.ts @@ -20,8 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as pubsub from '../../src/providers/pubsub'; import { expect } from 'chai'; +import * as pubsub from '../../src/providers/pubsub'; +import * as functions from '../../src/index'; describe('Pubsub Functions', () => { describe('pubsub.Message', () => { @@ -70,6 +71,21 @@ describe('Pubsub Functions', () => { delete process.env.GCLOUD_PROJECT; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .pubsub.topic('toppy') + .onPublish(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onPublish', () => { it('should return a TriggerDefinition with appropriate values', () => { // Pick up project from process.env.GCLOUD_PROJECT diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index befea8be9..5003db4e6 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -20,8 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as storage from '../../src/providers/storage'; import { expect } from 'chai'; +import * as storage from '../../src/providers/storage'; +import * as functions from '../../src/index'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { @@ -35,6 +36,21 @@ describe('Storage Functions', () => { delete process.env.FIREBASE_CONFIG; }); + it('should allow both region and runtime options to be set', () => { + let fn = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .storage.object() + .onArchive(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + describe('#onArchive', () => { it('should return a TriggerDefinition with appropriate values', () => { let cloudFunction = storage @@ -63,7 +79,8 @@ describe('Storage Functions', () => { it('should allow fully qualified bucket names', () => { let subjectQualified = new storage.ObjectBuilder( - () => 'projects/_/buckets/bucky' + () => 'projects/_/buckets/bucky', + {} ); let result = subjectQualified.onArchive(() => null); expect(result.__trigger).to.deep.equal({ @@ -130,7 +147,8 @@ describe('Storage Functions', () => { it('should allow fully qualified bucket names', () => { let subjectQualified = new storage.ObjectBuilder( - () => 'projects/_/buckets/bucky' + () => 'projects/_/buckets/bucky', + {} ); let result = subjectQualified.onDelete(() => null); expect(result.__trigger).to.deep.equal({ @@ -197,7 +215,8 @@ describe('Storage Functions', () => { it('should allow fully qualified bucket names', () => { let subjectQualified = new storage.ObjectBuilder( - () => 'projects/_/buckets/bucky' + () => 'projects/_/buckets/bucky', + {} ); let result = subjectQualified.onFinalize(() => null); expect(result.__trigger).to.deep.equal({ @@ -264,7 +283,8 @@ describe('Storage Functions', () => { it('should allow fully qualified bucket names', () => { let subjectQualified = new storage.ObjectBuilder( - () => 'projects/_/buckets/bucky' + () => 'projects/_/buckets/bucky', + {} ); let result = subjectQualified.onMetadataUpdate(() => null); expect(result.__trigger).to.deep.equal({ diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 2f873f9b7..23bbff189 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -23,7 +23,9 @@ import { apps } from './apps'; import * as _ from 'lodash'; import { Request, Response } from 'express'; +import { DeploymentOptions } from './function-builder'; export { Request, Response }; + const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); /** Legacy wire format for an event @@ -170,6 +172,9 @@ export interface TriggerAnnotated { service: string; }; labels?: { [key: string]: string }; + regions?: string[]; + timeout?: string; + availableMemoryMb?: number; }; } @@ -206,6 +211,7 @@ export interface MakeCloudFunctionArgs { before?: (raw: Event) => void; after?: (raw: Event) => void; legacyEventType?: string; + opts?: { [key: string]: any }; } /** @internal */ @@ -223,6 +229,7 @@ export function makeCloudFunction({ return; }, legacyEventType, + opts = {}, }: MakeCloudFunctionArgs): CloudFunction { let cloudFunction: any = async (eventOrData: any, context?: any) => { let data: any; @@ -284,15 +291,18 @@ export function makeCloudFunction({ }; Object.defineProperty(cloudFunction, '__trigger', { get: () => { - return { + let trigger: any = _.assign(optsToTrigger(opts), { eventTrigger: { resource: triggerResource(), eventType: legacyEventType || provider + '.' + eventType, service, }, - }; + }); + + return trigger; }, }); + cloudFunction.run = handler; return cloudFunction; } @@ -351,3 +361,24 @@ function _detectAuthType(event: Event) { } return 'UNAUTHENTICATED'; } + +export function optsToTrigger(opts: DeploymentOptions) { + let trigger: any = {}; + if (opts.regions) { + trigger.regions = opts.regions; + } + if (opts.timeoutSeconds) { + trigger.timeout = opts.timeoutSeconds.toString() + 's'; + } + if (opts.memory) { + const memoryLookup = { + '128MB': 128, + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, + }; + trigger.availableMemoryMb = _.get(memoryLookup, opts.memory); + } + return trigger; +} diff --git a/src/function-builder.ts b/src/function-builder.ts new file mode 100644 index 000000000..bee575a49 --- /dev/null +++ b/src/function-builder.ts @@ -0,0 +1,250 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + +import * as _ from 'lodash'; +import * as express from 'express'; + +import * as analytics from './providers/analytics'; +import * as auth from './providers/auth'; +import * as crashlytics from './providers/crashlytics'; +import * as database from './providers/database'; +import * as firestore from './providers/firestore'; +import * as https from './providers/https'; +import * as pubsub from './providers/pubsub'; +import * as storage from './providers/storage'; +import { HttpsFunction } from './cloud-functions'; + +/** + * Configure the regions that the function is deployed to. + * @param regions One or more parameters indicating the regions. + * For example: `functions.region('us-central1', 'us-east1')` + */ +export function region(...regions: string[]) { + return new FunctionBuilder({ regions }); +} + +/** + * Configure runtime options for the function. + * @param runtimeOptions Object with 2 optional fields: + * 1. `timeoutSeconds`: timeout for the function in seconds. + * 2. `memory`: amount of memory to allocate to the function, + * possible values are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + */ +export function runWith(runtimeOptions: { + timeoutSeconds?: number; + memory?: '128MB' | '256MB' | '512MB' | '1GB' | '2GB'; +}) { + if ( + runtimeOptions.memory && + !_.includes( + ['128MB', '256MB', '512MB', '1GB', '2GB'], + runtimeOptions.memory + ) + ) { + throw new Error( + "The only valid memory allocation values are: '128MB', '256MB', '512MB', '1GB', and '2GB'" + ); + } + return new FunctionBuilder(runtimeOptions); +} + +export interface DeploymentOptions { + regions?: string[]; + timeoutSeconds?: number; + memory?: string; +} + +export class FunctionBuilder { + constructor(private options: DeploymentOptions) {} + + /** + * Configure the regions that the function is deployed to. + * @param regions One or more parameters indicating the region. + * For example: `functions.region('us-central1', 'us-east1')` + */ + region = (...regions: string[]) => { + this.options.regions = regions; + return this; + }; + + /** + * Configure runtime options for the function. + * @param runtimeOptions Object with 2 optional fields: + * 1. timeoutSeconds: timeout for the function in seconds. + * 2. memory: amount of memory to allocate to the function, possible values are: + * '128MB', '256MB', '512MB', '1GB', and '2GB'. + */ + runWith = (runtimeOptions: { + timeoutSeconds?: number; + memory?: '128MB' | '256MB' | '512MB' | '1GB' | '2GB'; + }) => { + if ( + runtimeOptions.memory && + !_.includes( + ['128MB', '256MB', '512MB', '1GB', '2GB'], + runtimeOptions.memory + ) + ) { + throw new Error( + "The only valid memory allocation values are: '128MB', '256MB', '512MB', '1GB', and '2GB'" + ); + } + this.options = _.assign(this.options, runtimeOptions); + return this; + }; + + get https() { + return { + /** + * Handle HTTP requests. + * @param handler A function that takes a request and response object, + * same signature as an Express app. + */ + onRequest: ( + handler: (req: express.Request, resp: express.Response) => void + ) => https._onRequestWithOpts(handler, this.options) as HttpsFunction, + /** + * Declares a callable method for clients to call using a Firebase SDK. + * @param handler A method that takes a data and context and returns a value. + */ + onCall: ( + handler: ( + data: any, + context: https.CallableContext + ) => any | Promise + ) => https._onCallWithOpts(handler, this.options) as HttpsFunction, + }; + } + + get database() { + return { + /** + * Selects a database instance that will trigger the function. + * If omitted, will pick the default database for your project. + * @param instance The Realtime Database instance to use. + */ + instance: (instance: string) => + database._instanceWithOpts(instance, this.options), + /** + * Select Firebase Realtime Database Reference to listen to. + * + * This method behaves very similarly to the method of the same name in the + * client and Admin Firebase SDKs. Any change to the Database that affects the + * data at or below the provided `path` will fire an event in Cloud Functions. + * + * There are three important differences between listening to a Realtime + * Database event in Cloud Functions and using the Realtime Database in the + * client and Admin SDKs: + * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component + * in curly brackets (`{}`) is a wildcard that matches all strings. The value + * that matched a certain invocation of a Cloud Function is returned as part + * of the `context.params` object. For example, `ref("messages/{messageId}")` + * matches changes at `/messages/message1` or `/messages/message2`, resulting + * in `context.params.messageId` being set to `"message1"` or `"message2"`, + * respectively. + * 2. Cloud Functions do not fire an event for data that already existed before + * the Cloud Function was deployed. + * 3. Cloud Function events have access to more information, including information + * about the user who triggered the Cloud Function. + * @param ref Path of the database to listen to. + */ + ref: (path: string) => database._refWithOpts(path, this.options), + }; + } + + get firestore() { + return { + /** + * Select the Firestore document to listen to for events. + * @param path Full database path to listen to. This includes the name of + * the collection that the document is a part of. For example, if the + * collection is named "users" and the document is named "Ada", then the + * path is "/users/Ada". + */ + document: (path: string) => + firestore._documentWithOpts(path, this.options), + /** @internal */ + namespace: (namespace: string) => + firestore._namespaceWithOpts(namespace, this.options), + /** @internal */ + database: (database: string) => + firestore._databaseWithOpts(database, this.options), + }; + } + + get crashlytics() { + return { + /** + * Handle events related to Crashlytics issues. An issue in Crashlytics is an + * aggregation of crashes which have a shared root cause. + */ + issue: () => crashlytics._issueWithOpts(this.options), + }; + } + + get analytics() { + return { + /** + * Select analytics events to listen to for events. + * @param analyticsEventType Name of the analytics event type. + */ + event: (analyticsEventType: string) => + analytics._eventWithOpts(analyticsEventType, this.options), + }; + } + + get storage() { + return { + /** + * The optional bucket function allows you to choose which buckets' events to handle. + * This step can be bypassed by calling object() directly, which will use the default + * Cloud Storage for Firebase bucket. + * @param bucket Name of the Google Cloud Storage bucket to listen to. + */ + bucket: (bucket?: string) => + storage._bucketWithOpts(this.options, bucket), + + /** + * Handle events related to Cloud Storage objects. + */ + object: () => storage._objectWithOpts(this.options), + }; + } + + get pubsub() { + return { + /** Select Cloud Pub/Sub topic to listen to. + * @param topic Name of Pub/Sub topic, must belong to the same project as the function. + */ + topic: (topic: string) => pubsub._topicWithOpts(topic, this.options), + }; + } + + get auth() { + return { + /** + * Handle events related to Firebase authentication users. + */ + user: () => auth._userWithOpts(this.options), + }; + } +} diff --git a/src/index.ts b/src/index.ts index ccc0470f4..cbcdb7f4b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,6 +23,7 @@ // Providers: import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; + import * as crashlytics from './providers/crashlytics'; import * as database from './providers/database'; import * as firestore from './providers/firestore'; @@ -30,6 +31,7 @@ import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import { firebaseConfig } from './config'; + export { analytics, auth, @@ -41,9 +43,10 @@ export { storage, }; -// Exported root types: +// // Exported root types: export * from './config'; export * from './cloud-functions'; +export * from './function-builder'; // TEMPORARY WORKAROUND (BUG 63586213): // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index c3836cec2..6802e61a1 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -20,13 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import * as _ from 'lodash'; + import { makeCloudFunction, CloudFunction, Event, EventContext, } from '../cloud-functions'; -import * as _ from 'lodash'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.analytics'; @@ -34,15 +36,18 @@ export const provider = 'google.analytics'; export const service = 'app-measurement.com'; /** - * Registers a Cloud Function to handle analytics events. - * - * @param {string} analyticsEventType Name of the analytics event type to which - * this Cloud Function is scoped. - * - * @return {!functions.analytics.AnalyticsEventBuilder} Analytics event builder - * interface. + * Select analytics events to listen to for events. + * @param analyticsEventType Name of the analytics event type. */ export function event(analyticsEventType: string) { + return _eventWithOpts(analyticsEventType, {}); +} + +/** @internal */ +export function _eventWithOpts( + analyticsEventType: string, + opts: DeploymentOptions +) { return new AnalyticsEventBuilder(() => { if (!process.env.GCLOUD_PROJECT) { throw new Error('process.env.GCLOUD_PROJECT is not set.'); @@ -50,7 +55,7 @@ export function event(analyticsEventType: string) { return ( 'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType ); - }); + }, opts); } /** @@ -60,7 +65,10 @@ export function event(analyticsEventType: string) { */ export class AnalyticsEventBuilder { /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** * Event handler that fires every time a Firebase Analytics event occurs. @@ -89,6 +97,7 @@ export class AnalyticsEventBuilder { legacyEventType: `providers/google.firebase.analytics/eventTypes/event.log`, triggerResource: this.triggerResource, dataConstructor, + opts: this.opts, }); } } diff --git a/src/providers/auth.ts b/src/providers/auth.ts index b35a9491c..d271f2384 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -28,20 +28,28 @@ import { } from '../cloud-functions'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.firebase.auth'; /** @internal */ export const service = 'firebaseauth.googleapis.com'; -/** Handle events in the Firebase Auth user lifecycle. */ +/** + * Handle events related to Firebase authentication users. + */ export function user() { + return _userWithOpts({}); +} + +/** @internal */ +export function _userWithOpts(opts: DeploymentOptions) { return new UserBuilder(() => { if (!process.env.GCLOUD_PROJECT) { throw new Error('process.env.GCLOUD_PROJECT is not set.'); } return 'projects/' + process.env.GCLOUD_PROJECT; - }); + }, opts); } export class UserRecordMetadata implements firebase.auth.UserMetadata { @@ -63,7 +71,10 @@ export class UserBuilder { } /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts?: DeploymentOptions + ) {} /** Respond to the creation of a Firebase Auth user. */ onCreate( @@ -94,6 +105,7 @@ export class UserBuilder { triggerResource: this.triggerResource, dataConstructor: UserBuilder.dataConstructor, legacyEventType: `providers/firebase.auth/eventTypes/${eventType}`, + opts: this.opts, }); } } diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index f4dda117b..2ad1db6b3 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -25,6 +25,7 @@ import { CloudFunction, EventContext, } from '../cloud-functions'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.firebase.crashlytics'; @@ -36,18 +37,26 @@ export const service = 'fabric.io'; * aggregation of crashes which have a shared root cause. */ export function issue() { + return _issueWithOpts({}); +} + +/** @internal */ +export function _issueWithOpts(opts: DeploymentOptions) { return new IssueBuilder(() => { if (!process.env.GCLOUD_PROJECT) { throw new Error('process.env.GCLOUD_PROJECT is not set.'); } return 'projects/' + process.env.GCLOUD_PROJECT; - }); + }, opts); } /** Builder used to create Cloud Functions for Crashlytics issue events. */ export class IssueBuilder { /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** @internal */ onNewDetected(handler: any): Error { @@ -86,6 +95,7 @@ export class IssueBuilder { service, legacyEventType: `providers/firebase.crashlytics/eventTypes/${eventType}`, triggerResource: this.triggerResource, + opts: this.opts, }); } } diff --git a/src/providers/database.ts b/src/providers/database.ts index 5bb8ca3e8..ed0557294 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -32,6 +32,7 @@ import { import { normalizePath, applyChange, pathParts, joinPath } from '../utils'; import * as firebase from 'firebase-admin'; import { firebaseConfig } from '../config'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.firebase.database'; @@ -42,27 +43,16 @@ export const service = 'firebaseio.com'; const databaseURLRegex = new RegExp('https://([^.]+).firebaseio.com'); /** - * Pick the Realtime Database instance to use. If omitted, will pick the default database for your project. + * Selects a database instance that will trigger the function. + * If omitted, will pick the default database for your project. + * @param instance The Realtime Database instance to use. */ -export function instance(instance: string): InstanceBuilder { - return new InstanceBuilder(instance); -} - -export class InstanceBuilder { - /* @internal */ - constructor(private instance: string) {} - - ref(path: string): RefBuilder { - const normalized = normalizePath(path); - return new RefBuilder( - apps(), - () => `projects/_/instances/${this.instance}/refs/${normalized}` - ); - } +export function instance(instance: string) { + return _instanceWithOpts(instance, {}); } /** - * Handle events at a Firebase Realtime Database Reference. + * Select Firebase Realtime Database Reference to listen to. * * This method behaves very similarly to the method of the same name in the * client and Admin Firebase SDKs. Any change to the Database that affects the @@ -74,17 +64,47 @@ export class InstanceBuilder { * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component * in curly brackets (`{}`) is a wildcard that matches all strings. The value * that matched a certain invocation of a Cloud Function is returned as part - * of the `event.params` object. For example, `ref("messages/{messageId}")` + * of the `context.params` object. For example, `ref("messages/{messageId}")` * matches changes at `/messages/message1` or `/messages/message2`, resulting - * in `event.params.messageId` being set to `"message1"` or `"message2"`, + * in `context.params.messageId` being set to `"message1"` or `"message2"`, * respectively. * 2. Cloud Functions do not fire an event for data that already existed before * the Cloud Function was deployed. - * 3. Cloud Function events have access to more information, including a - * snapshot of the previous event data and information about the user who - * triggered the Cloud Function. + * 3. Cloud Function events have access to more information, including information + * about the user who triggered the Cloud Function. + * @param ref Path of the database to listen to. */ -export function ref(path: string): RefBuilder { +export function ref(path: string) { + return _refWithOpts(path, {}); +} + +/** @internal */ +export function _instanceWithOpts( + instance: string, + opts: DeploymentOptions +): InstanceBuilder { + return new InstanceBuilder(instance, opts); +} + +export class InstanceBuilder { + /* @internal */ + constructor(private instance: string, private opts: DeploymentOptions) {} + + ref(path: string): RefBuilder { + const normalized = normalizePath(path); + return new RefBuilder( + apps(), + () => `projects/_/instances/${this.instance}/refs/${normalized}`, + this.opts + ); + } +} + +/** @internal */ +export function _refWithOpts( + path: string, + opts: DeploymentOptions +): RefBuilder { const resourceGetter = () => { const normalized = normalizePath(path); const databaseURL = firebaseConfig().databaseURL; @@ -106,13 +126,17 @@ export function ref(path: string): RefBuilder { return `projects/_/instances/${subdomain}/refs/${normalized}`; }; - return new RefBuilder(apps(), resourceGetter); + return new RefBuilder(apps(), resourceGetter, opts); } /** Builder used to create Cloud Functions for Firebase Realtime Database References. */ export class RefBuilder { /** @internal */ - constructor(private apps: apps.Apps, private triggerResource: () => string) {} + constructor( + private apps: apps.Apps, + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** Respond to any write that affects a ref. */ onWrite( @@ -186,6 +210,7 @@ export class RefBuilder { dataConstructor: dataConstructor, before: event => this.apps.retain(), after: event => this.apps.release(), + opts: this.opts, }); } diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 6de8dd970..20dee281f 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -32,49 +32,76 @@ import { EventContext, } from '../cloud-functions'; import { dateToTimestampProto } from '../encoder'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.firestore'; /** @internal */ export const service = 'firestore.googleapis.com'; -export type DocumentSnapshot = firebase.firestore.DocumentSnapshot; - /** @internal */ export const defaultDatabase = '(default)'; let firestoreInstance: any; +export type DocumentSnapshot = firebase.firestore.DocumentSnapshot; +/** + * Select the Firestore document to listen to for events. + * @param path Full database path to listen to. This includes the name of + * the collection that the document is a part of. For example, if the + * collection is named "users" and the document is named "Ada", then the + * path is "/users/Ada". + */ +export function document(path: string) { + return _documentWithOpts(path, {}); +} +/** @internal */ +// Multiple namespaces are not yet supported by Firestore. +export function namespace(namespace: string) { + return _namespaceWithOpts(namespace, {}); +} /** @internal */ // Multiple databases are not yet supported by Firestore. -export function database(database: string = defaultDatabase) { - return new DatabaseBuilder(database); +export function database(database: string) { + return _databaseWithOpts(database, {}); } /** @internal */ -// Multiple databases are not yet supported by Firestore. -export function namespace(namespace: string) { - return database().namespace(namespace); +export function _databaseWithOpts( + database: string = defaultDatabase, + opts: DeploymentOptions +) { + return new DatabaseBuilder(database, opts); } -export function document(path: string) { - return database().document(path); +/** @internal */ +export function _namespaceWithOpts(namespace: string, opts: DeploymentOptions) { + return _databaseWithOpts(defaultDatabase, opts).namespace(namespace); +} + +/** @internal */ +export function _documentWithOpts(path: string, opts: DeploymentOptions) { + return _databaseWithOpts(defaultDatabase, opts).document(path); } export class DatabaseBuilder { /** @internal */ - constructor(private database: string) {} + constructor(private database: string, private opts: DeploymentOptions) {} namespace(namespace: string) { - return new NamespaceBuilder(this.database, namespace); + return new NamespaceBuilder(this.database, this.opts, namespace); } document(path: string) { - return new NamespaceBuilder(this.database).document(path); + return new NamespaceBuilder(this.database, this.opts).document(path); } } export class NamespaceBuilder { /** @internal */ - constructor(private database: string, private namespace?: string) {} + constructor( + private database: string, + private opts: DeploymentOptions, + private namespace?: string + ) {} document(path: string) { return new DocumentBuilder(() => { @@ -92,7 +119,7 @@ export class NamespaceBuilder { this.namespace ? `documents@${this.namespace}` : 'documents', path ); - }); + }, this.opts); } } @@ -154,7 +181,10 @@ function changeConstructor(raw: Event) { export class DocumentBuilder { /** @internal */ - constructor(private triggerResource: () => string) { + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) { // TODO what validation do we want to do here? } @@ -215,6 +245,7 @@ export class DocumentBuilder { triggerResource: this.triggerResource, legacyEventType: `providers/cloud.firestore/eventTypes/${eventType}`, dataConstructor, + opts: this.opts, }); } } diff --git a/src/providers/https.ts b/src/providers/https.ts index f647d6f1f..c4399541e 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -20,22 +20,46 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { HttpsFunction } from '../cloud-functions'; import * as express from 'express'; import * as firebase from 'firebase-admin'; -import { apps } from '../apps'; import * as _ from 'lodash'; import * as cors from 'cors'; +import { apps } from '../apps'; +import { HttpsFunction, optsToTrigger } from '../cloud-functions'; +import { DeploymentOptions } from '../function-builder'; +/** + * Handle HTTP requests. + * @param handler A function that takes a request and response object, + * same signature as an Express app. + */ export function onRequest( handler: (req: express.Request, resp: express.Response) => void +) { + return _onRequestWithOpts(handler, {}); +} + +/** + * Declares a callable method for clients to call using a Firebase SDK. + * @param handler A method that takes a data and context and returns a value. + */ +export function onCall( + handler: (data: any, context: CallableContext) => any | Promise +) { + return _onCallWithOpts(handler, {}); +} + +/** @internal */ +export function _onRequestWithOpts( + handler: (req: express.Request, resp: express.Response) => void, + opts: DeploymentOptions ): HttpsFunction { // lets us add __trigger without altering handler: let cloudFunction: any = (req: express.Request, res: express.Response) => { handler(req, res); }; - cloudFunction.__trigger = { httpsTrigger: {} }; - + cloudFunction.__trigger = _.assign(optsToTrigger(opts), { httpsTrigger: {} }); + // TODO parse the opts return cloudFunction; } @@ -387,12 +411,10 @@ export function decode(data: any): any { const corsHandler = cors({ origin: true, methods: 'POST' }); -/** - * Declares a callable method for clients to call using a Firebase SDK. - * @param handler A method that takes a data and context and returns a value. - */ -export function onCall( - handler: (data: any, context: CallableContext) => any | Promise +/** @internal */ +export function _onCallWithOpts( + handler: (data: any, context: CallableContext) => any | Promise, + opts: DeploymentOptions ): HttpsFunction { const func = async (req: express.Request, res: express.Response) => { try { @@ -459,10 +481,10 @@ export function onCall( return corsHandler(req, res, () => func(req, res)); }; - corsFunc.__trigger = { + corsFunc.__trigger = _.assign(optsToTrigger(opts), { httpsTrigger: {}, labels: { 'deployment-callable': 'true' }, - }; + }); return corsFunc; } diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index 842d662e5..43dad1fc1 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -25,14 +25,25 @@ import { makeCloudFunction, EventContext, } from '../cloud-functions'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.pubsub'; /** @internal */ export const service = 'pubsub.googleapis.com'; -/** Handle events on a Cloud Pub/Sub topic. */ -export function topic(topic: string): TopicBuilder { +/** Select Cloud Pub/Sub topic to listen to. + * @param topic Name of Pub/Sub topic, must belong to the same project as the function. + */ +export function topic(topic: string) { + return _topicWithOpts(topic, {}); +} + +/** @internal */ +export function _topicWithOpts( + topic: string, + opts: DeploymentOptions +): TopicBuilder { if (topic.indexOf('/') !== -1) { throw new Error('Topic name may not have a /'); } @@ -42,13 +53,16 @@ export function topic(topic: string): TopicBuilder { throw new Error('process.env.GCLOUD_PROJECT is not set.'); } return `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`; - }); + }, opts); } /** Builder used to create Cloud Functions for Google Pub/Sub topics. */ export class TopicBuilder { /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** Handle a Pub/Sub message that was published to a Cloud Pub/Sub topic */ onPublish( @@ -61,6 +75,7 @@ export class TopicBuilder { triggerResource: this.triggerResource, eventType: 'topic.publish', dataConstructor: raw => new Message(raw.data), + opts: this.opts, }); } } diff --git a/src/providers/storage.ts b/src/providers/storage.ts index d7bd4a995..eb7821b99 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -26,6 +26,7 @@ import { makeCloudFunction, } from '../cloud-functions'; import { firebaseConfig } from '../config'; +import { DeploymentOptions } from '../function-builder'; /** @internal */ export const provider = 'google.storage'; @@ -34,10 +35,26 @@ export const service = 'storage.googleapis.com'; /** * The optional bucket function allows you to choose which buckets' events to handle. - * This step can be bypassed by calling object() directly, which will use the bucket that - * the Firebase SDK for Cloud Storage uses. + * This step can be bypassed by calling object() directly, which will use the default + * Cloud Storage for Firebase bucket. + * @param bucket Name of the Google Cloud Storage bucket to listen to. */ -export function bucket(bucket?: string): BucketBuilder { +export function bucket(bucket?: string) { + return _bucketWithOpts({}, bucket); +} + +/** + * Handle events related to Cloud Storage objects. + */ +export function object() { + return _objectWithOpts({}); +} + +/** @internal */ +export function _bucketWithOpts( + opts: DeploymentOptions, + bucket?: string +): BucketBuilder { const resourceGetter = () => { bucket = bucket || firebaseConfig().storageBucket; if (!bucket) { @@ -51,26 +68,33 @@ export function bucket(bucket?: string): BucketBuilder { } return `projects/_/buckets/${bucket}`; }; - return new BucketBuilder(resourceGetter); + return new BucketBuilder(resourceGetter, opts); } -export function object(): ObjectBuilder { - return bucket().object(); +/** @internal */ +export function _objectWithOpts(opts: DeploymentOptions): ObjectBuilder { + return _bucketWithOpts(opts).object(); } export class BucketBuilder { /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** Handle events for objects in this bucket. */ object() { - return new ObjectBuilder(this.triggerResource); + return new ObjectBuilder(this.triggerResource, this.opts); } } export class ObjectBuilder { /** @internal */ - constructor(private triggerResource: () => string) {} + constructor( + private triggerResource: () => string, + private opts: DeploymentOptions + ) {} /** @internal */ onChange(handler: any): Error { @@ -133,6 +157,7 @@ export class ObjectBuilder { service, eventType, triggerResource: this.triggerResource, + opts: this.opts, }); } } From 1f0464321888cbe70256a617279108a00c317d40 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 16 Jul 2018 18:00:40 -0700 Subject: [PATCH 041/705] Add .run method to HTTPS callable functions (#206) --- spec/providers/https.spec.ts | 16 ++++++++++++++++ src/cloud-functions.ts | 2 +- src/providers/https.ts | 6 ++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index 7c6deb458..420953114 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -519,6 +519,22 @@ describe('callable.FunctionBuilder', () => { expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); + + it('has a .run method', () => { + const cf = https.onCall((data, context) => { + return { data, context }; + }); + + const data = 'data'; + const context = { + instanceIdToken: 'token', + auth: { + uid: 'abc', + token: 'token', + }, + }; + expect(cf.run(data, context)).to.deep.equal({ data, context }); + }); }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 23bbff189..9d8f38cd0 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -180,7 +180,7 @@ export interface TriggerAnnotated { /** A Runnable has a `run` method which directly invokes the user-defined function - useful for unit testing. */ export interface Runnable { - run: (data: T, context: EventContext) => PromiseLike | any; + run: (data: T, context: any) => PromiseLike | any; } /** diff --git a/src/providers/https.ts b/src/providers/https.ts index c4399541e..d8bc7517c 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -25,7 +25,7 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import * as cors from 'cors'; import { apps } from '../apps'; -import { HttpsFunction, optsToTrigger } from '../cloud-functions'; +import { HttpsFunction, optsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-builder'; /** @@ -415,7 +415,7 @@ const corsHandler = cors({ origin: true, methods: 'POST' }); export function _onCallWithOpts( handler: (data: any, context: CallableContext) => any | Promise, opts: DeploymentOptions -): HttpsFunction { +): HttpsFunction & Runnable { const func = async (req: express.Request, res: express.Response) => { try { if (!isValidRequest(req)) { @@ -486,5 +486,7 @@ export function _onCallWithOpts( labels: { 'deployment-callable': 'true' }, }); + corsFunc.run = handler; + return corsFunc; } From 4b8724a8c9d96196dc7cc25f624c79d3872dc66d Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 19 Jul 2018 11:28:09 -0700 Subject: [PATCH 042/705] Migrate to v5.13.0 firebase-admin & new Firestore timestamp format (#207) --- package.json | 4 ++-- spec/providers/firestore.spec.ts | 15 ++++++--------- src/providers/firestore.ts | 1 + src/providers/https.ts | 2 +- tsconfig.json | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 0ad4d32ce..25203f5ce 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@types/sinon": "^1.16.29", "chai": "^3.5.0", "chai-as-promised": "^5.2.0", - "firebase-admin": "~5.12.1", + "firebase-admin": "~5.13.0", "istanbul": "^0.4.2", "mocha": "^2.4.5", "mock-require": "^2.0.1", @@ -50,7 +50,7 @@ "typescript": "~2.8.3" }, "peerDependencies": { - "firebase-admin": "~5.12.1" + "firebase-admin": "~5.13.0" }, "dependencies": { "@types/cors": "^2.8.1", diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 5a03c10d1..59eae8e38 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -500,21 +500,18 @@ describe('Firestore Functions', () => { }); it('should support #createTime', () => { - expect(Date.parse(snapshot.createTime)).to.equal( - Date.parse('2017-06-17T14:45:17.876479Z') - ); + expect(snapshot.createTime.seconds).to.be.a('number'); + expect(snapshot.createTime.nanoseconds).to.be.a('number'); }); it('should support #updateTime', () => { - expect(Date.parse(snapshot.updateTime)).to.equal( - Date.parse('2017-08-31T18:05:26.928527Z') - ); + expect(snapshot.updateTime.seconds).to.be.a('number'); + expect(snapshot.updateTime.nanoseconds).to.be.a('number'); }); it('should support #readTime', () => { - expect(Date.parse(snapshot.readTime)).to.equal( - Date.parse('2017-07-31T18:23:26.928527Z') - ); + expect(snapshot.readTime.seconds).to.be.a('number'); + expect(snapshot.readTime.nanoseconds).to.be.a('number'); }); }); diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 20dee281f..1d295736a 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -145,6 +145,7 @@ function _getValueProto(data: any, resource: string, valueFieldName: string) { export function snapshotConstructor(event: Event): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); + firestoreInstance.settings({ timestampsInSnapshots: true }); } let valueProto = _getValueProto( event.data, diff --git a/src/providers/https.ts b/src/providers/https.ts index d8bc7517c..f6a5cddff 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -45,7 +45,7 @@ export function onRequest( */ export function onCall( handler: (data: any, context: CallableContext) => any | Promise -) { +): HttpsFunction & Runnable { return _onCallWithOpts(handler, {}); } diff --git a/tsconfig.json b/tsconfig.json index 573a354fe..04fc40239 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "lib": ["es6"], "module": "commonjs", - "noImplicitAny": true, + "noImplicitAny": false, "outDir": ".tmp", "sourceMap": true, "target": "es6", From 3fef83a86837f0e464fc64c0e61dc69f60813dc4 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 20 Jul 2018 14:01:15 -0700 Subject: [PATCH 043/705] Update integration test (#209) --- .gitignore | 1 + integration_test/functions/src/index.ts | 10 +++---- integration_test/functions/src/testing.ts | 28 +++++++++---------- integration_test/package.node6.json | 23 +++++++++++++++ .../package.json => package.node8.json} | 3 +- integration_test/run_tests.sh | 26 +++++++++++++---- 6 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 integration_test/package.node6.json rename integration_test/{functions/package.json => package.node8.json} (89%) diff --git a/.gitignore b/.gitignore index 543c4a073..d345a2f7a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ firebase-functions-*.tgz integration_test/.firebaserc integration_test/*.log integration_test/functions/firebase-functions.tgz +integration_test/functions/package.json lib node_modules npm-debug.log diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 64e3aca5a..7c4618cab 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,5 +1,4 @@ import * as functions from 'firebase-functions'; -import * as firebase from 'firebase'; import * as https from 'https'; import * as admin from 'firebase-admin'; import { Request, Response } from 'express'; @@ -16,8 +15,8 @@ const numTests = Object.keys(exports).length; // Assumption: every exported func import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); -firebase.initializeApp(firebaseConfig); admin.initializeApp(); +admin.firestore().settings({ timestampsInSnapshots: true }); // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. function callHttpsTrigger(name: string, data: any) { @@ -52,14 +51,15 @@ export const integrationTests: any = functions .https.onRequest((req: Request, resp: Response) => { let pubsub: any = require('@google-cloud/pubsub')(); - const testId = firebase + const testId = admin .database() .ref() .push().key; + console.log('testId is: ', testId); + return Promise.all([ // A database write to trigger the Firebase Realtime Database tests. - // The database write happens without admin privileges. - firebase + admin .database() .ref(`dbTests/${testId}/start`) .set({ '.sv': 'timestamp' }), diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 50eaa7966..3a34fd8a1 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -19,7 +19,7 @@ export class TestSuite { return this; } - run(testId: string, data: T, context?: EventContext): Promise { + run(testId: string, data: T, context?: EventContext): Promise { let running: Array> = []; for (let testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { @@ -41,20 +41,18 @@ export class TestSuite { ); running.push(run); } - return Promise.all(running) - .then(results => { - let sum = 0; - results.forEach(val => (sum = sum + val.passed)); - const summary = `passed ${sum} of ${running.length}`; - const passed = sum === running.length; - console.log(summary); - const result = { passed, summary, tests: results }; - return firebase - .database() - .ref(`testRuns/${testId}/${this.name}`) - .set(result); - }) - .then(() => null); + return Promise.all(running).then(results => { + let sum = 0; + results.forEach(val => (sum = sum + val.passed)); + const summary = `passed ${sum} of ${running.length}`; + const passed = sum === running.length; + console.log(summary); + const result = { passed, summary, tests: results }; + return firebase + .database() + .ref(`testRuns/${testId}/${this.name}`) + .set(result); + }); } } diff --git a/integration_test/package.node6.json b/integration_test/package.node6.json new file mode 100644 index 000000000..265627814 --- /dev/null +++ b/integration_test/package.node6.json @@ -0,0 +1,23 @@ +{ + "name": "functions", + "description": "Integration test for the Firebase SDK for Google Cloud Functions", + "scripts": { + "build": "./node_modules/.bin/tsc" + }, + "dependencies": { + "@google-cloud/pubsub": "~0.19.0", + "@types/google-cloud__pubsub": "^0.18.0", + "@types/lodash": "~4.14.41", + "firebase-admin": "~5.13.0", + "firebase-functions": "./firebase-functions.tgz", + "lodash": "~4.17.2" + }, + "main": "lib/index.js", + "devDependencies": { + "typescript": "~2.8.3" + }, + "engines": { + "node": "6" + }, + "private": true +} diff --git a/integration_test/functions/package.json b/integration_test/package.node8.json similarity index 89% rename from integration_test/functions/package.json rename to integration_test/package.node8.json index 1250f39a5..f89e0a8ba 100644 --- a/integration_test/functions/package.json +++ b/integration_test/package.node8.json @@ -8,8 +8,7 @@ "@google-cloud/pubsub": "~0.19.0", "@types/google-cloud__pubsub": "^0.18.0", "@types/lodash": "~4.14.41", - "firebase": "~5.2.0", - "firebase-admin": "~5.12.1", + "firebase-admin": "~5.13.0", "firebase-functions": "./firebase-functions.tgz", "lodash": "~4.17.2" }, diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index d37bb49b8..e63736a91 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -29,23 +29,33 @@ function build_sdk { mv firebase-functions-*.tgz integration_test/functions/firebase-functions.tgz } +function pick_node6 { + cd $DIR + cp package.node6.json functions/package.json +} + +function pick_node8 { + cd $DIR + cp package.node8.json functions/package.json +} + function install_deps { announce "Installing dependencies..." cd $DIR/functions + rm -rf node_modules/firebase-functions npm install } function delete_all_functions { - announce "Deploying empty index.js to project..." + announce "Deleting all functions in project..." cd $DIR - ./functions/node_modules/.bin/tsc -p functions/ # Make sure the functions/lib directory actually exists. - echo "" > functions/lib/index.js - firebase deploy --project=$PROJECT_ID --only functions + # Try to delete, if there are errors it is because the project is already empty, + # in that case do nothing. + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests --project=$PROJECT_ID -f || : announce "Project emptied." } function deploy { - announce "Deploying functions..." cd $DIR ./functions/node_modules/.bin/tsc -p functions/ # Deploy functions, and security rules for database and Firestore @@ -72,16 +82,20 @@ function cleanup { announce "Performing cleanup..." delete_all_functions rm $DIR/functions/firebase-functions.tgz + rm $DIR/functions/package.json rm -f $DIR/functions/firebase-debug.log rm -rf $DIR/functions/node_modules/firebase-functions } build_sdk +pick_node8 install_deps delete_all_functions +announce "Deploying functions to Node 8 runtime ..." deploy run_tests -announce "Re-deploying the same functions to make sure updates work..." +pick_node6 +announce "Re-deploying the same functions to Node 6 runtime ..." deploy run_tests cleanup From c7a09d5b5d7c34648d849c89df50f85d1cf0b5d4 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 23 Jul 2018 13:58:47 -0700 Subject: [PATCH 044/705] Allow one region per function (#211) --- spec/function-builder.spec.ts | 22 +++++++++++----------- src/function-builder.ts | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index a1733fb1d..972f865dc 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -42,17 +42,17 @@ describe('FunctionBuilder', () => { expect(fn.__trigger.regions).to.deep.equal(['my-region']); }); - it('should allow multiple regions to be set', () => { - let fn = functions - .region('my-region', 'my-other-region') - .auth.user() - .onCreate(user => user); - - expect(fn.__trigger.regions).to.deep.equal([ - 'my-region', - 'my-other-region', - ]); - }); + // it('should allow multiple regions to be set', () => { + // let fn = functions + // .region('my-region', 'my-other-region') + // .auth.user() + // .onCreate(user => user); + + // expect(fn.__trigger.regions).to.deep.equal([ + // 'my-region', + // 'my-other-region', + // ]); + // }); it('should allow runtime options to be set', () => { let fn = functions diff --git a/src/function-builder.ts b/src/function-builder.ts index bee575a49..099b71e3b 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -35,11 +35,11 @@ import { HttpsFunction } from './cloud-functions'; /** * Configure the regions that the function is deployed to. - * @param regions One or more parameters indicating the regions. - * For example: `functions.region('us-central1', 'us-east1')` + * @param region Region string. + * For example: `functions.region('us-east1')` */ -export function region(...regions: string[]) { - return new FunctionBuilder({ regions }); +export function region(region: string) { + return new FunctionBuilder({ regions: [region] }); } /** @@ -78,11 +78,11 @@ export class FunctionBuilder { /** * Configure the regions that the function is deployed to. - * @param regions One or more parameters indicating the region. - * For example: `functions.region('us-central1', 'us-east1')` + * @param region Region string. + * For example: `functions.region('us-east1')` */ - region = (...regions: string[]) => { - this.options.regions = regions; + region = (region: string) => { + this.options.regions = [region]; return this; }; From 28dd25c42f63b2baed82f7449d0729e859efbbf4 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Mon, 23 Jul 2018 16:25:13 -0700 Subject: [PATCH 045/705] Changelog for v2.0.0 (#212) --- changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..adc681988 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1,4 @@ +important - [breaking change] For Firestore-triggered functions, `snapshot.createTime`, `snapshot.updateTime`, `snapshot.readTime`, and any timestamp values in `snapshot.data()` are now [Firestore Timestamp](https://cloud.google.com/nodejs/docs/reference/firestore/0.15.x/Timestamp#properties) objects. +feature - Support Node.js 8 runtime. To deploy your functions to Node.js 8, add `"engines": {"node": "8"}` to `functions/package.json`. You will need `firebase-tools` >=v4.0.0. +feature - Support selection of regions for your functions through the `functions.region` method. Learn more in the [Firebase Documentation](https://firebase.google.com/docs/functions/locations). You will need `firebase-tools` >=v4.0.0. +feature - Support configuration of timeout and memory allocation through the `functions.runWith` method. Learn more in the [Firebase Documentation](https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation). You will need `firebase-tools` >=v4.0.0. From b2ec24d8c2941e9c0c5fe7c3b36ea2c9ca2535b9 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 24 Jul 2018 16:08:18 +0000 Subject: [PATCH 046/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25203f5ce..5ed070083 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "1.0.4", + "version": "2.0.0", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From f7b7b6f153176decc9eac1aa986daa9fa5c549e9 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 24 Jul 2018 16:08:32 +0000 Subject: [PATCH 047/705] [firebase-release] Removed change log and reset repo after 2.0.0 release --- changelog.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index adc681988..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +0,0 @@ -important - [breaking change] For Firestore-triggered functions, `snapshot.createTime`, `snapshot.updateTime`, `snapshot.readTime`, and any timestamp values in `snapshot.data()` are now [Firestore Timestamp](https://cloud.google.com/nodejs/docs/reference/firestore/0.15.x/Timestamp#properties) objects. -feature - Support Node.js 8 runtime. To deploy your functions to Node.js 8, add `"engines": {"node": "8"}` to `functions/package.json`. You will need `firebase-tools` >=v4.0.0. -feature - Support selection of regions for your functions through the `functions.region` method. Learn more in the [Firebase Documentation](https://firebase.google.com/docs/functions/locations). You will need `firebase-tools` >=v4.0.0. -feature - Support configuration of timeout and memory allocation through the `functions.runWith` method. Learn more in the [Firebase Documentation](https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation). You will need `firebase-tools` >=v4.0.0. From 69f1a49950c0e2bd57ecf251d5d60336db5ef678 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 25 Jul 2018 15:45:31 -0700 Subject: [PATCH 048/705] Fix error where Node 6 functions were timing out (#286) --- spec/cloud-functions.spec.ts | 2 ++ src/cloud-functions.ts | 65 +++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/spec/cloud-functions.spec.ts b/spec/cloud-functions.spec.ts index cde9db5a9..8bb213af5 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/cloud-functions.spec.ts @@ -130,7 +130,9 @@ describe('makeCloudFunction', () => { return { data, context }; }, }); + process.env.X_GOOGLE_NEW_FUNCTION_SIGNATURE = 'true'; let cf = makeCloudFunction(args); + delete process.env.X_GOOGLE_NEW_FUNCTION_SIGNATURE; let testContext = { eventId: '00000', timestamp: '2016-11-04T21:29:03.496Z', diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 9d8f38cd0..50c717446 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -231,23 +231,9 @@ export function makeCloudFunction({ legacyEventType, opts = {}, }: MakeCloudFunctionArgs): CloudFunction { - let cloudFunction: any = async (eventOrData: any, context?: any) => { - let data: any; - if (isContext(context)) { - // In Node 8 runtime, function called with 2 params: data & context - data = eventOrData; - } else { - // In Node 6 runtime, function called with single event param - data = _.get(eventOrData, 'data'); - if (isEvent(eventOrData)) { - // new eventflow v1beta2 format - context = _.cloneDeep(eventOrData.context); - } else { - // eventflow v1beta1 format - context = _.omit(eventOrData, 'data'); - } - } + let cloudFunction; + let cloudFunctionNewSignature: any = (data: any, context: any) => { if (legacyEventType && context.eventType === legacyEventType) { // v1beta1 event flow has different format for context, transform them to new format. context = { @@ -276,19 +262,42 @@ export function makeCloudFunction({ } context.params = context.params || _makeParams(context, triggerResource); - try { - before(event); + before(event); - let dataOrChange = dataConstructor(event); - let promise = handler(dataOrChange, context); - if (typeof promise === 'undefined') { - console.warn('Function returned undefined, expected Promise or value'); - } - return await promise; - } finally { - after(event); + let dataOrChange = dataConstructor(event); + let promise = handler(dataOrChange, context); + if (typeof promise === 'undefined') { + console.warn('Function returned undefined, expected Promise or value'); } + return Promise.resolve(promise) + .then(result => { + after(event); + return result; + }) + .catch(err => { + after(event); + return Promise.reject(err); + }); }; + + if (process.env.X_GOOGLE_NEW_FUNCTION_SIGNATURE === 'true') { + cloudFunction = cloudFunctionNewSignature; + } else { + cloudFunction = (raw: Event | LegacyEvent) => { + let context; + // In Node 6 runtime, function called with single event param + let data = _.get(raw, 'data'); + if (isEvent(raw)) { + // new eventflow v1beta2 format + context = _.cloneDeep(raw.context); + } else { + // eventflow v1beta1 format + context = _.omit(raw, 'data'); + } + return cloudFunctionNewSignature(data, context); + }; + } + Object.defineProperty(cloudFunction, '__trigger', { get: () => { let trigger: any = _.assign(optsToTrigger(opts), { @@ -311,10 +320,6 @@ function isEvent(event: Event | LegacyEvent): event is Event { return _.has(event, 'context'); } -function isContext(context: EventContext | any): context is EventContext { - return _.has(context, 'eventId'); -} - function _makeParams( context: EventContext, triggerResourceGetter: () => string From 75b0f6cc389b422b3b6a6ae30f27f46432769ac0 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 25 Jul 2018 15:45:45 -0700 Subject: [PATCH 049/705] Changelog for v1.0.1 (#287) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..7ccbc5083 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fix error where Node 6 functions experienced timeout errors. From 949eefd8ed97c4d0cb62f0f5dd8e45edf3c06436 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 25 Jul 2018 22:49:37 +0000 Subject: [PATCH 050/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ed070083..f82dedf4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.0", + "version": "2.0.1", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From b598d9afd4fe07797bc1b484e209b9a9f545d119 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 25 Jul 2018 22:49:47 +0000 Subject: [PATCH 051/705] [firebase-release] Removed change log and reset repo after 2.0.1 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 7ccbc5083..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fix error where Node 6 functions experienced timeout errors. From 944deecfc50ec3102612ce322329158c65af4ac5 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 26 Jul 2018 14:24:54 -0700 Subject: [PATCH 052/705] Fix bug where timestamp in change objects are still date objects (#290) --- spec/providers/firestore.spec.ts | 10 ++++++++-- src/providers/firestore.ts | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 59eae8e38..2c6d1a02d 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -20,6 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import * as admin from 'firebase-admin'; + import * as firestore from '../../src/providers/firestore'; import * as _ from 'lodash'; import { expect } from 'chai'; @@ -428,7 +430,9 @@ describe('Firestore Functions', () => { }) ); expect(snapshot.data()).to.deep.equal({ - timestampVal: new Date('2017-06-13T00:58:40.349Z'), + timestampVal: admin.firestore.Timestamp.fromDate( + new Date('2017-06-13T00:58:40.349Z') + ), }); }); @@ -444,7 +448,9 @@ describe('Firestore Functions', () => { }) ); expect(snapshot.data()).to.deep.equal({ - timestampVal: new Date('2017-06-13T00:58:40Z'), + timestampVal: admin.firestore.Timestamp.fromDate( + new Date('2017-06-13T00:58:40Z') + ), }); }); diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 1d295736a..7a2931618 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -161,6 +161,7 @@ export function snapshotConstructor(event: Event): DocumentSnapshot { export function beforeSnapshotConstructor(event: Event): DocumentSnapshot { if (!firestoreInstance) { firestoreInstance = firebase.firestore(apps().admin); + firestoreInstance.settings({ timestampsInSnapshots: true }); } let oldValueProto = _getValueProto( event.data, From e4ec4104c9d1931f56014324308623a2ae351eeb Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 26 Jul 2018 14:42:16 -0700 Subject: [PATCH 053/705] Changelog for v2.0.2 (#291) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..150151e2f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fixed issue in Firestore-triggered functions where timestamp values in Change objects for onUpdate and onWrite functions are Date objects instead of Timestamp objects. From 527889a1252861d383657888cb429cc27c3bded3 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 26 Jul 2018 21:43:56 +0000 Subject: [PATCH 054/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f82dedf4b..29780edd0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.1", + "version": "2.0.2", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From d5241ac7a51a63c55b4bcc6bd4d19ae071ae5259 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 26 Jul 2018 21:44:05 +0000 Subject: [PATCH 055/705] [firebase-release] Removed change log and reset repo after 2.0.2 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 150151e2f..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fixed issue in Firestore-triggered functions where timestamp values in Change objects for onUpdate and onWrite functions are Date objects instead of Timestamp objects. From 8b4df8d5c8789466173cff076291329d327daa6a Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 9 Aug 2018 13:35:26 -0700 Subject: [PATCH 056/705] Update firebase-admin dependency to v6 (#213) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 29780edd0..8a848d95f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@types/sinon": "^1.16.29", "chai": "^3.5.0", "chai-as-promised": "^5.2.0", - "firebase-admin": "~5.13.0", + "firebase-admin": "~6.0.0", "istanbul": "^0.4.2", "mocha": "^2.4.5", "mock-require": "^2.0.1", @@ -50,7 +50,7 @@ "typescript": "~2.8.3" }, "peerDependencies": { - "firebase-admin": "~5.13.0" + "firebase-admin": "~6.0.0" }, "dependencies": { "@types/cors": "^2.8.1", From 612eb310e0c7368d0ee6d3d5fda64788be8615ca Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 9 Aug 2018 13:35:42 -0700 Subject: [PATCH 057/705] Changelog for v2.03 (#214) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..cbf48579e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +changed - Updated firebase-admin peer dependency to v6.0.0. From b7e496b0ea584af4ddfa4064857e34ef51e1d10b Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 9 Aug 2018 20:38:35 +0000 Subject: [PATCH 058/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a848d95f..dfc4ab1da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.2", + "version": "2.0.3", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 960033f6563ef3f1b4fa345a1e14e37bd6607056 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 9 Aug 2018 20:38:46 +0000 Subject: [PATCH 059/705] [firebase-release] Removed change log and reset repo after 2.0.3 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index cbf48579e..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -changed - Updated firebase-admin peer dependency to v6.0.0. From 4e430281d349af5f26ea3c30bc4d828f6f03fd23 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 9 Aug 2018 16:48:22 -0700 Subject: [PATCH 060/705] Fix bug where auth info for database was getting lost (#304) --- integration_test/functions/src/database-tests.ts | 4 ++++ src/cloud-functions.ts | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index 183d3d785..bd3556b16 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -72,5 +72,9 @@ export const databaseTests: any = functions.database expectEq((context as any).action, undefined) ) + .it('should have admin authType', (change, context) => { + expectEq(context.authType, 'ADMIN'); + }) + .run(ctx.params[testIdFieldName], ch, ctx); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 50c717446..426c54bb8 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -236,14 +236,10 @@ export function makeCloudFunction({ let cloudFunctionNewSignature: any = (data: any, context: any) => { if (legacyEventType && context.eventType === legacyEventType) { // v1beta1 event flow has different format for context, transform them to new format. - context = { - eventId: context.eventId, - timestamp: context.timestamp, - eventType: provider + '.' + eventType, - resource: { - service: service, - name: context.resource, - }, + context.eventType = provider + '.' + eventType; + context.resource = { + service: service, + name: context.resource, }; } From 431076a595549565f1e79f31ed87808f8a9a9536 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 9 Aug 2018 16:48:51 -0700 Subject: [PATCH 061/705] Changelog for v2.0.4 (#305) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..d360960b9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fix bug in >v2.0.1 where `context.authType` is always `UNAUTHENTICATED` from a realtime database-triggered function. From 518a8c726295e739c63a9cd16c57af9747aa9047 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 9 Aug 2018 23:51:41 +0000 Subject: [PATCH 062/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dfc4ab1da..835848a71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.3", + "version": "2.0.4", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 2f5df0d935bb319823ef59c5b90176d610ce3516 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 9 Aug 2018 23:51:52 +0000 Subject: [PATCH 063/705] [firebase-release] Removed change log and reset repo after 2.0.4 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index d360960b9..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fix bug in >v2.0.1 where `context.authType` is always `UNAUTHENTICATED` from a realtime database-triggered function. From 273f1fda41282effc8aa7bf24f6ad0b2069dd169 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 14 Aug 2018 13:14:44 -0700 Subject: [PATCH 064/705] Fix syntax error in integration test (#306) --- integration_test/functions/src/database-tests.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index bd3556b16..e31dacf79 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -72,9 +72,9 @@ export const databaseTests: any = functions.database expectEq((context as any).action, undefined) ) - .it('should have admin authType', (change, context) => { - expectEq(context.authType, 'ADMIN'); - }) + .it('should have admin authType', (change, context) => + expectEq(context.authType, 'ADMIN') + ) .run(ctx.params[testIdFieldName], ch, ctx); }); From 9a1743f146bc521af71ffc4d3032dcd292cf3e59 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 14 Aug 2018 14:05:40 -0700 Subject: [PATCH 065/705] Changelog for v2.0.5 (#309) --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..d81bbeb6e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Fixed syntax error in integration test. From e12e39adf9b35fe14458810ef0bc1de53cd323eb Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 14 Aug 2018 21:07:25 +0000 Subject: [PATCH 066/705] [firebase-release] Updated SDK for Cloud Functions to 2.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 835848a71..1fcca59e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.4", + "version": "2.0.5", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 587127ad7855f4130e8b1dcb561c8eb8d834bfd0 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Tue, 14 Aug 2018 21:07:35 +0000 Subject: [PATCH 067/705] [firebase-release] Removed change log and reset repo after 2.0.5 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index d81bbeb6e..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -fixed - Fixed syntax error in integration test. From c11941b4b297d66c0f252cee75fe57049abe705b Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 19 Sep 2018 17:22:50 -0700 Subject: [PATCH 068/705] Fix failing unit test due to new Firestore SDK (#320) --- spec/providers/firestore.spec.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 2c6d1a02d..bd823210d 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -494,10 +494,6 @@ describe('Firestore Functions', () => { }); it('should support #ref', () => { - expect(Object.keys(snapshot.ref)).to.deep.equal([ - '_firestore', - '_referencePath', - ]); expect(snapshot.ref.path).to.equal('collection/123'); }); From 42ec44d8ade8004c5a3a9835afd11deb79a1a297 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Wed, 19 Sep 2018 17:23:11 -0700 Subject: [PATCH 069/705] Fix small typo (#322) --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index cbcdb7f4b..1998ce642 100644 --- a/src/index.ts +++ b/src/index.ts @@ -57,7 +57,7 @@ if (!process.env.FIREBASE_CONFIG) { process.env.FIREBASE_CONFIG = JSON.stringify(cfg); } else if (process.env.GCLOUD_PROJECT) { console.warn( - 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Intializing firebase-admin may fail' + 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' ); process.env.FIREBASE_CONFIG = JSON.stringify({ databaseURL: `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, From 5e5e160c8f02b866269f56e78dee27cc31a38f36 Mon Sep 17 00:00:00 2001 From: Maciej Kisiel Date: Wed, 26 Sep 2018 20:35:58 +0200 Subject: [PATCH 070/705] Update firebase-admin in integration tests to v6.0.0 (#325) --- integration_test/package.node6.json | 2 +- integration_test/package.node8.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test/package.node6.json b/integration_test/package.node6.json index 265627814..efc6380a8 100644 --- a/integration_test/package.node6.json +++ b/integration_test/package.node6.json @@ -8,7 +8,7 @@ "@google-cloud/pubsub": "~0.19.0", "@types/google-cloud__pubsub": "^0.18.0", "@types/lodash": "~4.14.41", - "firebase-admin": "~5.13.0", + "firebase-admin": "~6.0.0", "firebase-functions": "./firebase-functions.tgz", "lodash": "~4.17.2" }, diff --git a/integration_test/package.node8.json b/integration_test/package.node8.json index f89e0a8ba..0de718c2a 100644 --- a/integration_test/package.node8.json +++ b/integration_test/package.node8.json @@ -8,7 +8,7 @@ "@google-cloud/pubsub": "~0.19.0", "@types/google-cloud__pubsub": "^0.18.0", "@types/lodash": "~4.14.41", - "firebase-admin": "~5.13.0", + "firebase-admin": "~6.0.0", "firebase-functions": "./firebase-functions.tgz", "lodash": "~4.17.2" }, From 17beb774163130220f2463bc4ae1d83878b45711 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 9 Oct 2018 15:12:05 -0700 Subject: [PATCH 071/705] Update mocha dependency (#298) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1fcca59e9..f044e2f40 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@types/chai": "^3.4.32", "@types/chai-as-promised": "0.0.28", - "@types/mocha": "^2.2.31", + "@types/mocha": "^5.2.5", "@types/mock-require": "^1.3.3", "@types/nock": "^0.54.32", "@types/node": "^6.0.38", @@ -42,7 +42,7 @@ "chai-as-promised": "^5.2.0", "firebase-admin": "~6.0.0", "istanbul": "^0.4.2", - "mocha": "^2.4.5", + "mocha": "^5.2.0", "mock-require": "^2.0.1", "nock": "^9.0.0", "prettier": "^1.13.7", From 968be74a1f85229eaf840687c9c0dfa36716b0c1 Mon Sep 17 00:00:00 2001 From: Lucas Png Date: Wed, 10 Oct 2018 13:45:59 -0700 Subject: [PATCH 072/705] Firebase Remote Config Functions SDK Integration (#215) Adds a Remote Config event handler `firebase.remoteconfig.onUpdate()` that will be triggered whenever a Remote Config project is updated (i.e., when a publish or rollback occurs). The event handler takes in a `TemplateVersion` object as an argument, which contains metadata about the last update that affected a Remote Config project. The PR also contains corresponding unit test and integration tests. The integration test makes use of the Remote Config REST API: https://firebase.google.com/docs/remote-config/use-config-rest. --- integration_test/functions/src/index.ts | 21 +++ .../functions/src/remoteConfig-tests.ts | 29 ++++ integration_test/run_tests.sh | 2 +- spec/index.spec.ts | 1 + spec/providers/remoteConfig.spec.ts | 128 ++++++++++++++++++ src/function-builder.ts | 23 +++- src/index.ts | 2 + src/providers/remoteConfig.ts | 107 +++++++++++++++ 8 files changed, 311 insertions(+), 2 deletions(-) create mode 100644 integration_test/functions/src/remoteConfig-tests.ts create mode 100644 spec/providers/remoteConfig.spec.ts create mode 100644 src/providers/remoteConfig.ts diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 7c4618cab..c135b371c 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -11,6 +11,7 @@ export * from './database-tests'; export * from './auth-tests'; export * from './firestore-tests'; export * from './https-tests'; +export * from './remoteConfig-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) @@ -86,6 +87,26 @@ export const integrationTests: any = functions .collection('tests') .doc(testId) .set({ test: testId }), + // A Remote Config update to trigger the Remote Config tests. + admin.credential + .applicationDefault() + .getAccessToken() + .then((accessToken) => { + const options = { + hostname: 'firebaseremoteconfig.googleapis.com', + path: `/v1/projects/${firebaseConfig.projectId}/remoteConfig`, + method: 'PUT', + headers: { + Authorization: 'Bearer ' + accessToken.access_token, + 'Content-Type': 'application/json; UTF-8', + 'Accept-Encoding': 'gzip', + 'If-Match': '*', + }, + }; + const request = https.request(options, resp => {}); + request.write(JSON.stringify({ version: { description: testId } })); + request.end(); + }), // Invoke a callable HTTPS trigger. callHttpsTrigger('callableTests', { foo: 'bar', testId }), ]) diff --git a/integration_test/functions/src/remoteConfig-tests.ts b/integration_test/functions/src/remoteConfig-tests.ts new file mode 100644 index 000000000..2b824fbbd --- /dev/null +++ b/integration_test/functions/src/remoteConfig-tests.ts @@ -0,0 +1,29 @@ +import * as functions from 'firebase-functions'; +import { TestSuite, expectEq } from './testing'; +import TemplateVersion = functions.remoteConfig.TemplateVersion; + +export const remoteConfigTests: any = functions.remoteConfig.onUpdate( + (v, c) => { + return new TestSuite('remoteConfig onUpdate') + .it('should have a project as resource', (version, context) => + expectEq( + context.resource.name, + `projects/${process.env.GCLOUD_PROJECT}` + ) + ) + + .it('should have the correct eventType', (version, context) => + expectEq(context.eventType, 'google.firebase.remoteconfig.update') + ) + + .it('should have an eventId', (version, context) => context.eventId) + + .it('should have a timestamp', (version, context) => context.timestamp) + + .it('should not have auth', (version, context) => + expectEq((context as any).auth, undefined) + ) + + .run(v.description, v, c); + } +); diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index e63736a91..05abd2bd6 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -51,7 +51,7 @@ function delete_all_functions { cd $DIR # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests --project=$PROJECT_ID -f || : + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --project=$PROJECT_ID -f || : announce "Project emptied." } diff --git a/spec/index.spec.ts b/spec/index.spec.ts index 6c64e5cba..a42ed16a8 100644 --- a/spec/index.spec.ts +++ b/spec/index.spec.ts @@ -40,5 +40,6 @@ import './providers/database.spec'; import './providers/firestore.spec'; import './providers/https.spec'; import './providers/pubsub.spec'; +import './providers/remoteConfig.spec'; import './providers/storage.spec'; import './providers/crashlytics.spec'; diff --git a/spec/providers/remoteConfig.spec.ts b/spec/providers/remoteConfig.spec.ts new file mode 100644 index 000000000..86387927e --- /dev/null +++ b/spec/providers/remoteConfig.spec.ts @@ -0,0 +1,128 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. +import { expect } from 'chai'; +import * as admin from 'firebase-admin'; +import * as _ from 'lodash'; + +import { CloudFunction } from '../../src/cloud-functions'; +import * as functions from '../../src/index'; +import * as remoteConfig from '../../src/providers/remoteConfig'; + +describe('RemoteConfig Functions', () => { + function constructVersion() { + return { + versionNumber: 1, + updateTime: '2017-07-02T18:48:58.920638Z', + updateUser: { + name: 'Foo Bar', + email: 'foobar@gmail.com', + }, + description: 'test description', + updateOrigin: 'CONSOLE', + updateType: 'INCREMENTAL_UPDATE', + }; + } + + function makeEvent(data: any, context?: { [key: string]: any }) { + context = context || {}; + return { + data: data, + context: _.merge( + { + eventId: '123', + timestamp: '2018-07-03T00:49:04.264Z', + eventType: 'google.firebase.remoteconfig.update', + resource: { + name: 'projects/project1', + service: 'service', + }, + }, + context + ), + }; + } + + describe('#onUpdate', () => { + function expectedTrigger() { + return { + eventTrigger: { + resource: 'projects/project1', + eventType: 'google.firebase.remoteconfig.update', + service: 'firebaseremoteconfig.googleapis.com', + }, + }; + } + + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should have the correct trigger', () => { + const cloudFunction = remoteConfig.onUpdate(() => null); + expect(cloudFunction.__trigger).to.deep.equal(expectedTrigger()); + }); + + it('should allow both region and runtime options to be set', () => { + const cloudFunction = functions + .region('my-region') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .remoteConfig.onUpdate(() => null); + + expect(cloudFunction.__trigger.regions).to.deep.equal(['my-region']); + expect(cloudFunction.__trigger.availableMemoryMb).to.deep.equal(256); + expect(cloudFunction.__trigger.timeout).to.deep.equal('90s'); + }); + }); + + describe('unwraps TemplateVersion', () => { + let cloudFunctionUpdate: CloudFunction; + let event: any; + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + cloudFunctionUpdate = remoteConfig.onUpdate( + (version: remoteConfig.TemplateVersion) => version + ); + event = { + data: constructVersion(), + }; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should unwrap the version in the event', () => { + return Promise.all([ + cloudFunctionUpdate(event).then((data: any) => { + expect(data).to.deep.equal(constructVersion()); + }), + ]); + }); + }); +}); diff --git a/src/function-builder.ts b/src/function-builder.ts index 099b71e3b..fb2edf41f 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -30,8 +30,9 @@ import * as database from './providers/database'; import * as firestore from './providers/firestore'; 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 { HttpsFunction } from './cloud-functions'; +import { CloudFunction, EventContext, HttpsFunction } from './cloud-functions'; /** * Configure the regions that the function is deployed to. @@ -212,6 +213,26 @@ export class FunctionBuilder { }; } + get remoteConfig() { + return { + /** + * Handle all updates (including rollbacks) that affect a Remote Config + * project. + * @param handler A function that takes the updated Remote Config template + * version metadata as an argument. + */ + onUpdate: ( + handler: ( + version: remoteConfig.TemplateVersion, + context: EventContext + ) => PromiseLike | any + ) => + remoteConfig._onUpdateWithOpts(handler, this.options) as CloudFunction< + remoteConfig.TemplateVersion + >, + }; + } + get storage() { return { /** diff --git a/src/index.ts b/src/index.ts index 1998ce642..5971b02ad 100644 --- a/src/index.ts +++ b/src/index.ts @@ -29,6 +29,7 @@ import * as database from './providers/database'; import * as firestore from './providers/firestore'; 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 { firebaseConfig } from './config'; @@ -40,6 +41,7 @@ export { firestore, https, pubsub, + remoteConfig, storage, }; diff --git a/src/providers/remoteConfig.ts b/src/providers/remoteConfig.ts new file mode 100644 index 000000000..ca8ef3139 --- /dev/null +++ b/src/providers/remoteConfig.ts @@ -0,0 +1,107 @@ +// The MIT License (MIT) +// +// Copyright (c) 2018 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. + +import * as _ from 'lodash'; + +import { + CloudFunction, + Event, + EventContext, + makeCloudFunction, +} from '../cloud-functions'; +import { DeploymentOptions } from '../function-builder'; + +/** @internal */ +export const provider = 'google.firebase.remoteconfig'; +/** @internal */ +export const service = 'firebaseremoteconfig.googleapis.com'; + +/** + * Handle all updates (including rollbacks) that affect a Remote Config project. + * @param handler A function that takes the updated Remote Config template + * version metadata as an argument. + */ +export function onUpdate( + handler: ( + version: TemplateVersion, + context: EventContext + ) => PromiseLike | any +): CloudFunction { + return _onUpdateWithOpts(handler, {}); +} + +/** @internal */ +export function _onUpdateWithOpts( + handler: ( + version: TemplateVersion, + context: EventContext + ) => PromiseLike | any, + opts: DeploymentOptions +): CloudFunction { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return makeCloudFunction({ + handler, + provider, + service, + triggerResource: () => `projects/${process.env.GCLOUD_PROJECT}`, + eventType: 'update', + opts: opts, + }); +} + +/** + * Interface representing a Remote Config template version metadata object that + * was emitted when the project was updated. + */ +export interface TemplateVersion { + /** The version number of the updated Remote Config template. */ + versionNumber: number; + + /** When the template was updated in format (ISO8601 timestamp). */ + updateTime: string; + + /** Metadata about the account that performed the update. */ + updateUser: RemoteConfigUser; + + /** A description associated with the particular Remote Config template. */ + description: string; + + /** The origin of the caller. */ + updateOrigin: string; + + /** The type of update action that was performed. */ + updateType: string; + + /** + * The version number of the Remote Config template that was rolled back to, + * if the update was a rollback. + */ + rollbackSource?: number; +} + +export interface RemoteConfigUser { + name?: string; + email: string; + imageUrl?: string; +} From 510e4285a5b85de440cdf62b5a4fcd8927c9729d Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Thu, 25 Oct 2018 10:15:04 -0700 Subject: [PATCH 073/705] Changelog for v2.1.0 --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..c5f226684 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +feature - Added support for Remote Config triggered functions with `functions.remoteConfig`. From 25b8ddea4533ff979c16b4b1c0e1b8e7a1a3cf72 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 25 Oct 2018 17:22:41 +0000 Subject: [PATCH 074/705] [firebase-release] Updated SDK for Cloud Functions to 2.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f044e2f40..2f8d3e588 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "2.0.5", + "version": "2.1.0", "description": "Firebase SDK for Cloud Functions", "main": "lib/index.js", "scripts": { From 7f6d71c81d8c22c1c5f6b3e66de92eae91c558d6 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 25 Oct 2018 17:22:52 +0000 Subject: [PATCH 075/705] [firebase-release] Removed change log and reset repo after 2.1.0 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index c5f226684..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -feature - Added support for Remote Config triggered functions with `functions.remoteConfig`. From 557158b6b544d5ee2aa36ca4c09c98e429f763a6 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko Date: Mon, 3 Dec 2018 18:09:02 -0800 Subject: [PATCH 076/705] adding ts-node as dev dependency so that we can run unit tests individually --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 2f8d3e588..f8339ad84 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "nock": "^9.0.0", "prettier": "^1.13.7", "sinon": "^1.17.4", + "ts-node": "^7.0.1", "typescript": "~2.8.3" }, "peerDependencies": { From c145499988ec8c6861bc0ae5bea27c3582e8804c Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Thu, 20 Dec 2018 13:55:44 -0800 Subject: [PATCH 077/705] Make template fields required --- .github/ISSUE_TEMPLATE.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 89a43f576..bd1d9681f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -32,7 +32,7 @@ https://firebase.google.com/support/contact/bugs-features/. Select 'Functions' a --> -### Version info +### [REQUIRED] Version info @@ -43,27 +43,27 @@ be fixed in the latest versions. --> **firebase-admin:** -### Test case +### [REQUIRED] Test case -### Steps to reproduce +### [REQUIRED] Steps to reproduce -### Were you able to successfully deploy your functions? +### [REQUIRED] Were you able to successfully deploy your functions? -### Expected behavior +### [REQUIRED] Expected behavior -### Actual behavior +### [REQUIRED] Actual behavior From 440936866f564bb7cf3cb1591a96954eda475fb8 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Fri, 21 Dec 2018 15:40:33 -0800 Subject: [PATCH 078/705] Remove require on deploy changes question --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index bd1d9681f..80e315479 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -53,7 +53,7 @@ be fixed in the latest versions. --> -### [REQUIRED] Were you able to successfully deploy your functions? +### Were you able to successfully deploy your functions? From d5b704d1348b73b225067d62084aca41e06ff77a Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Fri, 4 Jan 2019 16:24:52 -0800 Subject: [PATCH 079/705] Update https types in function builder --- src/function-builder.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/function-builder.ts b/src/function-builder.ts index fb2edf41f..cc673dce1 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -32,7 +32,7 @@ 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 { CloudFunction, EventContext, HttpsFunction } from './cloud-functions'; +import { CloudFunction, EventContext } from './cloud-functions'; /** * Configure the regions that the function is deployed to. @@ -122,7 +122,7 @@ export class FunctionBuilder { */ onRequest: ( handler: (req: express.Request, resp: express.Response) => void - ) => https._onRequestWithOpts(handler, this.options) as HttpsFunction, + ) => https._onRequestWithOpts(handler, this.options), /** * Declares a callable method for clients to call using a Firebase SDK. * @param handler A method that takes a data and context and returns a value. @@ -132,7 +132,7 @@ export class FunctionBuilder { data: any, context: https.CallableContext ) => any | Promise - ) => https._onCallWithOpts(handler, this.options) as HttpsFunction, + ) => https._onCallWithOpts(handler, this.options), }; } From 1ac36ce70f6b9715c1567f73a4c3c8d2017dd0f5 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 8 Jan 2019 09:46:36 -0800 Subject: [PATCH 080/705] adding errors for invalid region and timeoutSeconds values (#371) * adding errors for invalid region and timeoutSeconds values * fixing tests broken by new errors --- spec/function-builder.spec.ts | 41 ++++++++++++++++++++++++----- spec/providers/analytics.spec.ts | 4 +-- spec/providers/auth.spec.ts | 4 +-- spec/providers/crashlytics.spec.ts | 4 +-- spec/providers/database.spec.ts | 4 +-- spec/providers/firestore.spec.ts | 4 +-- spec/providers/https.spec.ts | 8 +++--- spec/providers/pubsub.spec.ts | 4 +-- spec/providers/remoteConfig.spec.ts | 4 +-- spec/providers/storage.spec.ts | 4 +-- src/function-builder.ts | 28 ++++++++++++++++++-- 11 files changed, 80 insertions(+), 29 deletions(-) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 972f865dc..22bfefbc5 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -35,11 +35,11 @@ describe('FunctionBuilder', () => { it('should allow region to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .auth.user() .onCreate(user => user); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); }); // it('should allow multiple regions to be set', () => { @@ -69,7 +69,7 @@ describe('FunctionBuilder', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -77,7 +77,7 @@ describe('FunctionBuilder', () => { .auth.user() .onCreate(user => user); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); @@ -88,11 +88,11 @@ describe('FunctionBuilder', () => { timeoutSeconds: 90, memory: '256MB', }) - .region('my-region') + .region('us-east1') .auth.user() .onCreate(user => user); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); @@ -105,9 +105,36 @@ describe('FunctionBuilder', () => { }).to.throw(Error); expect(() => { - return functions.region('some-region').runWith({ + return functions.region('us-east1').runWith({ memory: 'unsupported', } as any); }).to.throw(Error); }); + + it('should throw an error if user chooses an invalid timeoutSeconds', () => { + expect(() => { + return functions.runWith({ + timeoutSeconds: 1000000, + } as any); + }).to.throw(Error); + + expect(() => { + return functions.region('us-east1').runWith({ + timeoutSeconds: 1000000, + } as any); + }).to.throw(Error); + }); + + it('should throw an error if user chooses an invalid region', () => { + expect(() => { + return functions.region('unsupported'); + }).to.throw(Error); + + expect(() => { + return functions.region('unsupported').runWith({ + timeoutSeconds: 500, + } as any); + }).to.throw(Error); + }); + }); diff --git a/spec/providers/analytics.spec.ts b/spec/providers/analytics.spec.ts index e56e354f6..e7a4532d5 100644 --- a/spec/providers/analytics.spec.ts +++ b/spec/providers/analytics.spec.ts @@ -38,7 +38,7 @@ describe('Analytics Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -46,7 +46,7 @@ describe('Analytics Functions', () => { .analytics.event('event') .onLog(event => event); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index f63840f2d..f82c736e5 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -40,7 +40,7 @@ describe('Auth Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -48,7 +48,7 @@ describe('Auth Functions', () => { .auth.user() .onCreate(() => null); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/crashlytics.spec.ts b/spec/providers/crashlytics.spec.ts index 391ae016a..7b2a78018 100644 --- a/spec/providers/crashlytics.spec.ts +++ b/spec/providers/crashlytics.spec.ts @@ -40,7 +40,7 @@ describe('Crashlytics Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -48,7 +48,7 @@ describe('Crashlytics Functions', () => { .crashlytics.issue() .onNew(issue => issue); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index 87d502243..9388cd9ae 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -44,7 +44,7 @@ describe('Database Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -52,7 +52,7 @@ describe('Database Functions', () => { .database.ref('/') .onCreate(snap => snap); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index bd823210d..34e7ab24c 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -122,7 +122,7 @@ describe('Firestore Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -130,7 +130,7 @@ describe('Firestore Functions', () => { .firestore.document('doc') .onCreate(snap => snap); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index 420953114..966569609 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -42,14 +42,14 @@ describe('CloudHttpsBuilder', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', }) .https.onRequest(() => null); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); @@ -508,14 +508,14 @@ describe('callable.FunctionBuilder', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', }) .https.onCall(() => null); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/pubsub.spec.ts b/spec/providers/pubsub.spec.ts index 1363955fb..b1d7e2918 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/providers/pubsub.spec.ts @@ -73,7 +73,7 @@ describe('Pubsub Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -81,7 +81,7 @@ describe('Pubsub Functions', () => { .pubsub.topic('toppy') .onPublish(() => null); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/remoteConfig.spec.ts b/spec/providers/remoteConfig.spec.ts index 86387927e..07da151a8 100644 --- a/spec/providers/remoteConfig.spec.ts +++ b/spec/providers/remoteConfig.spec.ts @@ -87,14 +87,14 @@ describe('RemoteConfig Functions', () => { it('should allow both region and runtime options to be set', () => { const cloudFunction = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', }) .remoteConfig.onUpdate(() => null); - expect(cloudFunction.__trigger.regions).to.deep.equal(['my-region']); + expect(cloudFunction.__trigger.regions).to.deep.equal(['us-east1']); expect(cloudFunction.__trigger.availableMemoryMb).to.deep.equal(256); expect(cloudFunction.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index 5003db4e6..2aa7f7145 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -38,7 +38,7 @@ describe('Storage Functions', () => { it('should allow both region and runtime options to be set', () => { let fn = functions - .region('my-region') + .region('us-east1') .runWith({ timeoutSeconds: 90, memory: '256MB', @@ -46,7 +46,7 @@ describe('Storage Functions', () => { .storage.object() .onArchive(() => null); - expect(fn.__trigger.regions).to.deep.equal(['my-region']); + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); diff --git a/src/function-builder.ts b/src/function-builder.ts index cc673dce1..71c4cda46 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -40,13 +40,23 @@ import { CloudFunction, EventContext } from './cloud-functions'; * For example: `functions.region('us-east1')` */ export function region(region: string) { + if ( + !_.includes( + ['us-central1', 'us-east1', 'europe-west1', 'asia-northeast1'], + region + ) + ) { + throw new Error( + "The only valid regions are 'us-central1', 'us-east1', 'europe-west1', and 'asia-northeast1'" + ); + } return new FunctionBuilder({ regions: [region] }); } /** * Configure runtime options for the function. * @param runtimeOptions Object with 2 optional fields: - * 1. `timeoutSeconds`: timeout for the function in seconds. + * 1. `timeoutSeconds`: timeout for the function in seconds, possible values are 0 to 540 * 2. `memory`: amount of memory to allocate to the function, * possible values are: '128MB', '256MB', '512MB', '1GB', and '2GB'. */ @@ -65,6 +75,13 @@ export function runWith(runtimeOptions: { "The only valid memory allocation values are: '128MB', '256MB', '512MB', '1GB', and '2GB'" ); } + if ( + runtimeOptions.timeoutSeconds > 540 || runtimeOptions.timeoutSeconds < 0 + ) { + throw new Error( + "TimeoutSeconds must be between 0 and 540" + ); + } return new FunctionBuilder(runtimeOptions); } @@ -90,7 +107,7 @@ export class FunctionBuilder { /** * Configure runtime options for the function. * @param runtimeOptions Object with 2 optional fields: - * 1. timeoutSeconds: timeout for the function in seconds. + * 1. timeoutSeconds: timeout for the function in seconds, possible values are 0 to 540 * 2. memory: amount of memory to allocate to the function, possible values are: * '128MB', '256MB', '512MB', '1GB', and '2GB'. */ @@ -109,6 +126,13 @@ export class FunctionBuilder { "The only valid memory allocation values are: '128MB', '256MB', '512MB', '1GB', and '2GB'" ); } + if ( + runtimeOptions.timeoutSeconds > 540 || runtimeOptions.timeoutSeconds < 0 + ) { + throw new Error( + "TimeoutSeconds must be between 0 and 540" + ); + } this.options = _.assign(this.options, runtimeOptions); return this; }; From 52fc6a9c90ed8dd1400127c05124332088ae8a1d Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 8 Jan 2019 09:48:22 -0800 Subject: [PATCH 081/705] makes message param required, per Google CLoud standards (#373) --- src/providers/https.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/https.ts b/src/providers/https.ts index f6a5cddff..56254efe1 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -164,7 +164,7 @@ export class HttpsError extends Error { */ readonly details?: any; - constructor(code: FunctionsErrorCode, message?: string, details?: any) { + constructor(code: FunctionsErrorCode, message: string, details?: any) { super(message); // This is a workaround for a bug in TypeScript when extending Error: From ca4f7781c8ef23f1e444262f302c710254d5f2f4 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 8 Jan 2019 10:06:35 -0800 Subject: [PATCH 082/705] Add validation on instance name (#374) * Add validation on instance name * changelog --- changelog.txt | 1 + spec/providers/database.spec.ts | 18 ++++++++++++++++++ src/providers/database.ts | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index e69de29bb..c3be970e5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +added - validation on instance name for realtime database triggers \ No newline at end of file diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index 9388cd9ae..95db92d46 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -245,6 +245,24 @@ describe('Database Functions', () => { expect(instance).to.equal('https://foo.firebaseio.com'); expect(path).to.equal('/bar'); }); + + it('should throw an error if the given instance name contains anything except alphanumerics and dashes', () => { + expect(() => { + return database.resourceToInstanceAndPath( + 'projects/_/instances/a.bad.name/refs/bar' + ); + }).to.throw(Error) + expect(() => { + return database.resourceToInstanceAndPath( + 'projects/_/instances/a_different_bad_name/refs/bar' + ); + }).to.throw(Error) + expect(() => { + return database.resourceToInstanceAndPath( + 'projects/_/instances/BAD!!!!/refs/bar' + ); + }).to.throw(Error) + }); }); describe('DataSnapshot', () => { diff --git a/src/providers/database.ts b/src/providers/database.ts index ed0557294..342379c81 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -240,7 +240,7 @@ export class RefBuilder { /* Utility function to extract database reference from resource string */ /** @internal */ export function resourceToInstanceAndPath(resource: string) { - let resourceRegex = `projects/([^/]+)/instances/([^/]+)/refs(/.+)?`; + let resourceRegex = `projects/([^/]+)/instances/([a-zA-Z0-9\-^/]+)/refs(/.+)?`; let match = resource.match(new RegExp(resourceRegex)); if (!match) { throw new Error( From 138129643d4f6203366597bb3af8c8848170aede Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Wed, 9 Jan 2019 11:03:30 -0800 Subject: [PATCH 083/705] Revert "Update https types in function builder" (#376) --- src/function-builder.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/function-builder.ts b/src/function-builder.ts index 71c4cda46..80f6086db 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -32,7 +32,7 @@ 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 { CloudFunction, EventContext } from './cloud-functions'; +import { CloudFunction, EventContext, HttpsFunction } from './cloud-functions'; /** * Configure the regions that the function is deployed to. @@ -146,7 +146,7 @@ export class FunctionBuilder { */ onRequest: ( handler: (req: express.Request, resp: express.Response) => void - ) => https._onRequestWithOpts(handler, this.options), + ) => https._onRequestWithOpts(handler, this.options) as HttpsFunction, /** * Declares a callable method for clients to call using a Firebase SDK. * @param handler A method that takes a data and context and returns a value. @@ -156,7 +156,7 @@ export class FunctionBuilder { data: any, context: https.CallableContext ) => any | Promise - ) => https._onCallWithOpts(handler, this.options), + ) => https._onCallWithOpts(handler, this.options) as HttpsFunction, }; } From 992fb988a046ebefe370b26a55f813a4dec00fc7 Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Thu, 10 Jan 2019 10:46:09 -0800 Subject: [PATCH 084/705] Update https types in function builder (#377) --- src/function-builder.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/function-builder.ts b/src/function-builder.ts index 80f6086db..df9cb1cf4 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -32,7 +32,7 @@ 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 { CloudFunction, EventContext, HttpsFunction } from './cloud-functions'; +import { CloudFunction, EventContext, Runnable, TriggerAnnotated } from './cloud-functions'; /** * Configure the regions that the function is deployed to. @@ -146,7 +146,7 @@ export class FunctionBuilder { */ onRequest: ( handler: (req: express.Request, resp: express.Response) => void - ) => https._onRequestWithOpts(handler, this.options) as HttpsFunction, + ) => https._onRequestWithOpts(handler, this.options), /** * Declares a callable method for clients to call using a Firebase SDK. * @param handler A method that takes a data and context and returns a value. @@ -156,7 +156,7 @@ export class FunctionBuilder { data: any, context: https.CallableContext ) => any | Promise - ) => https._onCallWithOpts(handler, this.options) as HttpsFunction, + ) => https._onCallWithOpts(handler, this.options), }; } From c99af7b07070a8d6f67a8593edfef13488fa89cc Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 10 Jan 2019 15:37:47 -0800 Subject: [PATCH 085/705] Fixes tsc error (#380) * fixes error durign tsc * casting field to string; --- src/providers/analytics.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 6802e61a1..b41ae479a 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -411,7 +411,7 @@ function copyField( field: K, transform: (val: any) => T[K] = _.identity ): void { - copyFieldTo(from, to, field, field, transform); + copyFieldTo(from, to, field as string, field, transform); } function copyFields(from: any, to: T, fields: K[]): void { From 9325a68af3168217d62ce0d3e917d28c07e5dbf2 Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 10 Jan 2019 15:38:05 -0800 Subject: [PATCH 086/705] Reformats changelog (#379) * reformats changelog; * removing + --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index c3be970e5..95c0d1741 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1 @@ -added - validation on instance name for realtime database triggers \ No newline at end of file +fixed - validation on instance name for realtime database triggers \ No newline at end of file From d7c09b79df06b633d60f50398917bca864086286 Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 11 Jan 2019 11:27:05 -0800 Subject: [PATCH 087/705] Allow functions to deploy to multiple regions (#375) * Reverts 3d2adbe, allows region() to accept multiple regions * switch to loadash difference * adds ` * changelog --- changelog.txt | 1 + spec/function-builder.spec.ts | 44 ++++++++++++++++++++++++++--------- src/function-builder.ts | 30 +++++++++++++----------- 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/changelog.txt b/changelog.txt index 95c0d1741..7f8cac513 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1,2 @@ +feature - support for multiple regions on functions by passing extra region strings to functions.regions() fixed - validation on instance name for realtime database triggers \ No newline at end of file diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 22bfefbc5..118525c0f 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -42,17 +42,17 @@ describe('FunctionBuilder', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); }); - // it('should allow multiple regions to be set', () => { - // let fn = functions - // .region('my-region', 'my-other-region') - // .auth.user() - // .onCreate(user => user); - - // expect(fn.__trigger.regions).to.deep.equal([ - // 'my-region', - // 'my-other-region', - // ]); - // }); + it('should allow multiple regions to be set', () => { + let fn = functions + .region('us-east1', 'us-central1') + .auth.user() + .onCreate(user => user); + + expect(fn.__trigger.regions).to.deep.equal([ + 'us-east1', + 'us-central1', + ]); + }); it('should allow runtime options to be set', () => { let fn = functions @@ -135,6 +135,28 @@ describe('FunctionBuilder', () => { timeoutSeconds: 500, } as any); }).to.throw(Error); + + expect(() => { + return functions.region('unsupported', 'us-east1'); + }).to.throw(Error); + + expect(() => { + return functions.region('unsupported', 'us-east1').runWith({ + timeoutSeconds: 500, + } as any); + }).to.throw(Error); + }); + + it('should throw an error if user chooses no region when using .region()', () => { + expect(() => { + return functions.region(); + }).to.throw(Error); + + expect(() => { + return functions.region().runWith({ + timeoutSeconds: 500, + } as any); + }).to.throw(Error); }); }); diff --git a/src/function-builder.ts b/src/function-builder.ts index df9cb1cf4..e2a52cf42 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -36,23 +36,27 @@ import { CloudFunction, EventContext, Runnable, TriggerAnnotated } from './cloud /** * Configure the regions that the function is deployed to. - * @param region Region string. - * For example: `functions.region('us-east1')` + * @param regions One of more region strings. + * For example: `functions.region('us-east1')` or `functions.region('us-east1', 'us-central1')` */ -export function region(region: string) { +export function region(...regions: string[]) { + if (!regions.length) { + throw new Error( + "You must specify at least one region" + ); + } if ( - !_.includes( - ['us-central1', 'us-east1', 'europe-west1', 'asia-northeast1'], - region - ) + _.difference( + regions, + ['us-central1', 'us-east1', 'europe-west1', 'asia-northeast1'] + ).length ) { throw new Error( "The only valid regions are 'us-central1', 'us-east1', 'europe-west1', and 'asia-northeast1'" ); } - return new FunctionBuilder({ regions: [region] }); + return new FunctionBuilder({ regions }); } - /** * Configure runtime options for the function. * @param runtimeOptions Object with 2 optional fields: @@ -96,11 +100,11 @@ export class FunctionBuilder { /** * Configure the regions that the function is deployed to. - * @param region Region string. - * For example: `functions.region('us-east1')` + * @param regions One or more region strings. + * For example: `functions.region('us-east1')` or `functions.region('us-east1', 'us-central1')` */ - region = (region: string) => { - this.options.regions = [region]; + region = (...regions: string[]) => { + this.options.regions = regions; return this; }; From edb3d27b2429b760b0542947781a33dd559d9dd7 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Wed, 16 Jan 2019 08:13:53 -0800 Subject: [PATCH 088/705] Update issue templates (#382) * Update issue templates Adding two templates for easier filing. * Delete duplicate bug report template * Add related issue field to bug template * Make spacing consistent Also, changed "related issue" to "related issues" * Update feature request template Updates to be more consistent with firebase-tools feature request template in https://github.com/firebase/firebase-tools/pull/1094 --- .github/ISSUE_TEMPLATE/---feature-request.md | 37 +++++++++++++++ .github/ISSUE_TEMPLATE/---report-a-bug.md | 50 ++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/---feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/---report-a-bug.md diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md new file mode 100644 index 000000000..6ea47a921 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/---feature-request.md @@ -0,0 +1,37 @@ +--- +name: "\U0001F4A1 Feature Request" +about: Have a feature you'd like to see in the functions SDK? Request it through our + support channel +title: '' +labels: '' +assignees: '' + +--- + + + +### [REQUIRED] Version info + + + +**node:** + + +**firebase-functions:** + +**firebase-tools:** + + +**firebase-admin:** + +### [REQUIRED] Test case + + + + +### [REQUIRED] Steps to reproduce + + + + +### [REQUIRED] Expected behavior + + + + +### [REQUIRED] Actual behavior + + + +### Were you able to successfully deploy your functions? + + From 616dc4f4988dec7c47fa44e31789aa6f45a9f816 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Wed, 16 Jan 2019 10:02:20 -0800 Subject: [PATCH 089/705] Small changes to issue templates (#385) * Add period in feature request issue template * Delete old issue template --- .github/ISSUE_TEMPLATE.md | 69 -------------------- .github/ISSUE_TEMPLATE/---feature-request.md | 2 +- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 80e315479..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,69 +0,0 @@ - - - -### [REQUIRED] Version info - - - -**firebase-functions:** - -**firebase-tools:** - -**firebase-admin:** - -### [REQUIRED] Test case - - - - -### [REQUIRED] Steps to reproduce - - - - -### Were you able to successfully deploy your functions? - - - - -### [REQUIRED] Expected behavior - - - - -### [REQUIRED] Actual behavior - - diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md index 6ea47a921..2ff568e74 100644 --- a/.github/ISSUE_TEMPLATE/---feature-request.md +++ b/.github/ISSUE_TEMPLATE/---feature-request.md @@ -1,7 +1,7 @@ --- name: "\U0001F4A1 Feature Request" about: Have a feature you'd like to see in the functions SDK? Request it through our - support channel + support channel. title: '' labels: '' assignees: '' From fe3d410b38363ebb47d0b0a23b721958644c7f7e Mon Sep 17 00:00:00 2001 From: joehan Date: Wed, 16 Jan 2019 13:48:37 -0800 Subject: [PATCH 090/705] Improving stability and speed of intergration tests (#384) * Adds delay to ensure functions are deployed, adds ability to test node6 and node8 on different projects * Support for 1 or 2 projects, run tests simulatenously when 2 projects * retry deploy up to 3 times, fix typo * Switch to cleaner looping Co-Authored-By: joehan * code review; --- integration_test/functions/src/index.ts | 2 +- integration_test/run_tests.sh | 66 ++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index c135b371c..844d8f8da 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -148,7 +148,7 @@ export const integrationTests: any = functions }) .then(() => { console.log('All tests pass!'); - resp.status(200).send('PASS'); + resp.status(200).send('PASS \n'); }) .catch(err => { console.log(`Some tests failed: ${err}`); diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 05abd2bd6..0e4ffeaa0 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -4,15 +4,25 @@ set -e function usage { - echo "Usage: $0 " + echo "Usage: $0 " exit 1 } +# This script takes 1 or 2 params, both of which are Firebase project ids. +# If there is only one given, that project will be used for both node6 and node8 +# Otherwise, param1 will be used for node6 +# and param2 will be used for node8 # The first parameter is required and is the Firebase project id. if [[ $1 == "" ]]; then usage fi -PROJECT_ID=$1 +if [[ $2 == "" ]]; then + PROJECT_ID_NODE_6=$1 + PROJECT_ID_NODE_8=$1 +else + PROJECT_ID_NODE_6=$1 + PROJECT_ID_NODE_8=$2 +fi # Directory where this script lives. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -31,11 +41,13 @@ function build_sdk { function pick_node6 { cd $DIR + PROJECT_ID=$PROJECT_ID_NODE_6 cp package.node6.json functions/package.json } function pick_node8 { cd $DIR + PROJECT_ID=$PROJECT_ID_NODE_8 cp package.node8.json functions/package.json } @@ -51,15 +63,47 @@ function delete_all_functions { cd $DIR # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --project=$PROJECT_ID -f || : + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --force --project=$PROJECT_ID_NODE_6 || : & + if ! [[ $PROJECT_ID_NODE_6 == $PROJECT_ID_NODE_8 ]]; then + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --force --project=$PROJECT_ID_NODE_8 || : & + fi + wait announce "Project emptied." } function deploy { cd $DIR ./functions/node_modules/.bin/tsc -p functions/ - # Deploy functions, and security rules for database and Firestore - firebase deploy --project=$PROJECT_ID --only functions,database,firestore + # Deploy functions, and security rules for database and Firestore. If the deploy fails, retry twice + for i in 1 2 3; do firebase deploy --project=$PROJECT_ID --only functions,database,firestore && break; done +} + +# At the moment, functions take 30-40 seconds AFTER firebase deploy returns successfully to go live +# This needs to be fixed separately +# However, so that we have working integration tests in the interim, waitForPropagation is a workaround +function waitForPropagation { + announce "Waiting 50 seconds for functions changes to propagate" + sleep 50 +} + +function run_all_tests { + announce "Running the integration tests..." + + # Constructs the URLs for both test functions. This may change in the future, + # causing this script to start failing, but currently we don't have a very + # reliable way of determining the URL dynamically. + TEST_DOMAIN="cloudfunctions.net" + if [[ $FIREBASE_FUNCTIONS_URL == "https://preprod-cloudfunctions.sandbox.googleapis.com" ]]; then + TEST_DOMAIN="txcloud.net" + fi + TEST_URL_NODE_6="https://us-central1-$PROJECT_ID_NODE_6.$TEST_DOMAIN/integrationTests" + TEST_URL_NODE_8="https://us-central1-$PROJECT_ID_NODE_8.$TEST_DOMAIN/integrationTests" + echo $TEST_URL_NODE_6 + echo $TEST_URL_NODE_8 + curl --fail $TEST_URL_NODE_6 & NODE6PID=$! + curl --fail $TEST_URL_NODE_8 & NODE8PID=$! + wait $NODE6PID && echo 'node 6 passed' || (announce 'Node 6 tests failed'; cleanup; announce 'Tests failed'; exit 1) + wait $NODE8PID && echo 'node 8 passed' || (announce 'Node 8 tests failed'; cleanup; announce 'Tests failed'; exit 1) } function run_tests { @@ -93,10 +137,18 @@ install_deps delete_all_functions announce "Deploying functions to Node 8 runtime ..." deploy -run_tests +if [[ $PROJECT_ID_NODE_6 == $PROJECT_ID_NODE_8 ]]; then + waitForPropagation + run_tests +fi pick_node6 announce "Re-deploying the same functions to Node 6 runtime ..." deploy -run_tests +waitForPropagation +if [[ $PROJECT_ID_NODE_6 == $PROJECT_ID_NODE_8 ]]; then + run_tests +else + run_all_tests +fi cleanup announce "All tests pass!" From f45266e9889a3d8ada4139af8c559b48622493a0 Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 17 Jan 2019 12:46:08 -0800 Subject: [PATCH 091/705] Adds integration tests for storage triggers, updates README to describe 2 project integration test option (#386) * Adds integration tests for storage triggers * Documents multiproject option --- integration_test/README.md | 5 ++-- integration_test/functions/src/index.ts | 6 ++++- .../functions/src/storage-tests.ts | 26 +++++++++++++++++++ integration_test/run_tests.sh | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 integration_test/functions/src/storage-tests.ts diff --git a/integration_test/README.md b/integration_test/README.md index f972e26cd..d0a1f3ef9 100644 --- a/integration_test/README.md +++ b/integration_test/README.md @@ -1,12 +1,13 @@ How to Use --------- -***ATTENTION***: Running this test will wipe the contents of the Firebase project you run it against. Make sure you use a disposable Firebase project! +***ATTENTION***: Running this test will wipe the contents of the Firebase project(s) you run it against. Make sure you use disposable Firebase project(s)! Run the integration test as follows: ```bash -./run_tests.sh +./run_tests.sh [] ``` +If just one project_id is provided, the both the node6 and node8 tests will be run on that project, in series. If two project_ids are provided, the node6 tests will be run on the first project and the node8 tests will be run on the second one, in parallel. The tests run fully automatically, and will print the result on standard out. The integration test for HTTPS is that it properly kicks off other integration tests and returns a result. From there the other integration test suites will write their results back to the database, where you can check the detailed results if you'd like. diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 844d8f8da..7b250d745 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -2,6 +2,7 @@ import * as functions from 'firebase-functions'; import * as https from 'https'; import * as admin from 'firebase-admin'; import { Request, Response } from 'express'; +import * as fs from 'fs' import * as PubSub from '@google-cloud/pubsub'; const pubsub = PubSub(); @@ -12,6 +13,7 @@ export * from './auth-tests'; export * from './firestore-tests'; export * from './https-tests'; export * from './remoteConfig-tests'; +export * from './storage-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) @@ -57,7 +59,7 @@ export const integrationTests: any = functions .ref() .push().key; console.log('testId is: ', testId); - + fs.writeFile('/tmp/' + testId + '.txt', 'test', ()=> {}); return Promise.all([ // A database write to trigger the Firebase Realtime Database tests. admin @@ -107,6 +109,8 @@ export const integrationTests: any = functions request.write(JSON.stringify({ version: { description: testId } })); request.end(); }), + // A storage upload to trigger the Storage tests + admin.storage().bucket().upload('/tmp/' + testId + '.txt'), // Invoke a callable HTTPS trigger. callHttpsTrigger('callableTests', { foo: 'bar', testId }), ]) diff --git a/integration_test/functions/src/storage-tests.ts b/integration_test/functions/src/storage-tests.ts new file mode 100644 index 000000000..3f3c4e997 --- /dev/null +++ b/integration_test/functions/src/storage-tests.ts @@ -0,0 +1,26 @@ +import * as functions from 'firebase-functions'; +import { TestSuite, expectEq, expectDeepEq } from './testing'; +import ObjectMetadata = functions.storage.ObjectMetadata; +const testIdFieldName = 'documentId'; + +export const storageTests: any = functions + .runWith({ + timeoutSeconds: 540, + }) + .storage.bucket().object() + .onFinalize((s, c) => { + const testId = s.name.split('.')[0]; + return new TestSuite('storage object finalize') + + .it('should not have event.app', (data, context) => !(context as any).app) + + .it('should have the right eventType', (snap, context) => + expectEq(context.eventType, 'google.storage.object.finalize') + ) + + .it('should have eventId', (snap, context) => context.eventId) + + .it('should have timestamp', (snap, context) => context.timestamp) + + .run(testId, s, c); + }); diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 0e4ffeaa0..8721842c7 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -4,7 +4,7 @@ set -e function usage { - echo "Usage: $0 " + echo "Usage: $0 []" exit 1 } From 0d3095d85bd4f296409c15009d05ce2e71efd49f Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 18 Jan 2019 10:03:34 -0800 Subject: [PATCH 092/705] deactivates storage tests to unblock gcf (#388) --- integration_test/functions/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 7b250d745..56cbba7f6 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -13,7 +13,7 @@ export * from './auth-tests'; export * from './firestore-tests'; export * from './https-tests'; export * from './remoteConfig-tests'; -export * from './storage-tests'; +// export * from './storage-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) From 5651ff354d628d5e10d980d218920af22c2064ed Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 18 Jan 2019 10:49:05 -0800 Subject: [PATCH 093/705] Allow storage bucket url and database url to be explicitly defined (#389) --- src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 5971b02ad..4b70693dd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -62,8 +62,8 @@ if (!process.env.FIREBASE_CONFIG) { 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' ); process.env.FIREBASE_CONFIG = JSON.stringify({ - databaseURL: `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, - storageBucket: `${process.env.GCLOUD_PROJECT}.appspot.com`, + databaseURL: `${process.env.DATABASE_URL}` || `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, + storageBucket: `${process.env.STORAGE_BUCKET_URL}` || `${process.env.GCLOUD_PROJECT}.appspot.com`, projectId: process.env.GCLOUD_PROJECT, }); } else { From c9b6d5750c8b0f43f655a671a9a93432c9efa9a6 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Wed, 23 Jan 2019 11:58:32 -0800 Subject: [PATCH 094/705] Add issue template metadata for the OSS bot (#390) --- .github/ISSUE_TEMPLATE/---feature-request.md | 4 ++++ .github/ISSUE_TEMPLATE/---report-a-bug.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md index 2ff568e74..d53f53652 100644 --- a/.github/ISSUE_TEMPLATE/---feature-request.md +++ b/.github/ISSUE_TEMPLATE/---feature-request.md @@ -7,6 +7,10 @@ labels: '' assignees: '' --- + + ### Related issues From 8052eaade388b75b434deed9cd6d7a12dd74f397 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Fri, 25 Jan 2019 11:50:42 -0800 Subject: [PATCH 095/705] Update feature request template (#393) * Update feature request template Update feature request template to be more clear on directions and less cluttered. * Update README with usage question info * Remove usage line --- .github/ISSUE_TEMPLATE/---feature-request.md | 26 -------------------- README.md | 11 +++++++++ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md index d53f53652..d47fbda18 100644 --- a/.github/ISSUE_TEMPLATE/---feature-request.md +++ b/.github/ISSUE_TEMPLATE/---feature-request.md @@ -5,37 +5,11 @@ about: Have a feature you'd like to see in the functions SDK? Request it through title: '' labels: '' assignees: '' - --- - diff --git a/.github/ISSUE_TEMPLATE/---report-a-bug.md b/.github/ISSUE_TEMPLATE/---report-a-bug.md index 4484df5fa..694c4aedf 100644 --- a/.github/ISSUE_TEMPLATE/---report-a-bug.md +++ b/.github/ISSUE_TEMPLATE/---report-a-bug.md @@ -1,12 +1,12 @@ --- -name: "⚠️ Report a Bug" +name: '⚠️ Report a Bug' about: Think you found a bug in the SDK? Report it here. title: '' labels: '' assignees: '' - --- - @@ -21,11 +21,13 @@ template_path=.github/ISSUE_TEMPLATE/---report-a-bug.md be fixed in the latest versions. --> **node:** + **firebase-functions:** **firebase-tools:** + **firebase-admin:** @@ -34,17 +36,14 @@ be fixed in the latest versions. --> - ### [REQUIRED] Steps to reproduce - ### [REQUIRED] Expected behavior - ### [REQUIRED] Actual behavior - ### Description \ No newline at end of file + diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..de457f940 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +lib +package.json +spec/fixtures/credential/unparsable.key.json diff --git a/integration_test/README.md b/integration_test/README.md index d0a1f3ef9..c6a0ca32d 100644 --- a/integration_test/README.md +++ b/integration_test/README.md @@ -1,13 +1,13 @@ -How to Use ---------- +## How to Use -***ATTENTION***: Running this test will wipe the contents of the Firebase project(s) you run it against. Make sure you use disposable Firebase project(s)! +**_ATTENTION_**: Running this test will wipe the contents of the Firebase project(s) you run it against. Make sure you use disposable Firebase project(s)! Run the integration test as follows: ```bash ./run_tests.sh [] ``` + If just one project_id is provided, the both the node6 and node8 tests will be run on that project, in series. If two project_ids are provided, the node6 tests will be run on the first project and the node8 tests will be run on the second one, in parallel. The tests run fully automatically, and will print the result on standard out. The integration test for HTTPS is that it properly kicks off other integration tests and returns a result. From there the other integration test suites will write their results back to the database, where you can check the detailed results if you'd like. diff --git a/integration_test/functions/tsconfig.json b/integration_test/functions/tsconfig.json index a8e9362db..a5bd57033 100644 --- a/integration_test/functions/tsconfig.json +++ b/integration_test/functions/tsconfig.json @@ -6,11 +6,7 @@ "noImplicitAny": false, "outDir": "lib", "declaration": true, - "typeRoots": [ - "node_modules/@types" - ] + "typeRoots": ["node_modules/@types"] }, - "files": [ - "src/index.ts" - ] + "files": ["src/index.ts"] } diff --git a/package.json b/package.json index fd83fbb0b..916c4159f 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", - "format": "prettier --check '**/*.ts'", - "format:fix": "prettier --write '**/*.ts'", + "format": "prettier --check '**/*.{json,md,ts,yml,yaml}'", + "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", "test": "mocha -r ts-node/register ./spec/index.spec.ts" diff --git a/tsconfig.json b/tsconfig.json index 0992f6d5b..2f7cc7e0d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "resolveJsonModule": true, - "sourceMap": true, + "sourceMap": true }, "extends": "./tsconfig.release.json", "include": ["./src/**/*.ts", "./spec/**/*.ts"] From 59adaa80fbb197d86f3f6bed9c577ab42b5107bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Thu, 11 Jul 2019 01:59:49 +0200 Subject: [PATCH 166/705] Remove unused valAt utility (#513) --- spec/utils.spec.ts | 23 +---------------------- src/utils.ts | 31 ------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/spec/utils.spec.ts b/spec/utils.spec.ts index 57634dd72..2ea64fb7e 100644 --- a/spec/utils.spec.ts +++ b/spec/utils.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { applyChange, normalizePath, pathParts, valAt } from '../src/utils'; +import { applyChange, normalizePath, pathParts } from '../src/utils'; describe('utils', () => { describe('.normalizePath(path: string)', () => { @@ -42,27 +42,6 @@ describe('utils', () => { }); }); - describe('.valAt(source: any, path?: string): any', () => { - it('should be null if null along any point in the path', () => { - expect(valAt(null)).to.be.null; - expect(valAt(null, '/foo')).to.be.null; - expect(valAt({ a: { b: null } }, '/a/b/c')).to.be.null; - }); - - it('should be null if accessing a path past a leaf value', () => { - expect(valAt({ a: 2 }, '/a/b')).to.be.null; - }); - - it('should be the leaf value if one is present', () => { - expect(valAt({ a: { b: 23 } }, '/a/b')).to.eq(23); - expect(valAt({ a: { b: 23 } }, '/a')).to.deep.equal({ b: 23 }); - }); - - it('should be undefined if in unexplored territory', () => { - expect(valAt({ a: 23 }, '/b')).to.be.undefined; - }); - }); - describe('.applyChange(from: any, to: any): any', () => { it('should return the to value for non-object values of from and to', () => { expect(applyChange({ a: 'b' }, null)).to.eq(null); diff --git a/src/utils.ts b/src/utils.ts index 0ebbb38c4..ffec72a2d 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -61,34 +61,3 @@ export function pruneNulls(obj: any) { } return obj; } - -export function valAt(source: any, path?: string) { - if (source === null) { - return null; - } else if (typeof source !== 'object') { - return path ? null : source; - } - - const parts = pathParts(path); - if (!parts.length) { - return source; - } - - let cur = source; - let leaf; - while (parts.length) { - const key = parts.shift(); - if (cur[key] === null || leaf) { - return null; - } else if (typeof cur[key] === 'object') { - if (parts.length) { - cur = cur[key]; - } else { - return cur[key]; - } - } else { - leaf = cur[key]; - } - } - return leaf; -} From f3af1759f0bba3c13a0fed9e14682aad76580dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Thu, 11 Jul 2019 02:05:28 +0200 Subject: [PATCH 167/705] Include all TypeScript files in development configuration (#512) * Include all TypeScript files in development configuration * Autofix TSLint issues * Reformat --- integration_test/functions/src/auth-tests.ts | 8 ++++---- integration_test/functions/src/database-tests.ts | 4 ++-- integration_test/functions/src/firestore-tests.ts | 4 ++-- integration_test/functions/src/https-tests.ts | 2 +- integration_test/functions/src/index.ts | 13 +++++-------- integration_test/functions/src/pubsub-tests.ts | 6 +++--- .../functions/src/remoteConfig-tests.ts | 2 +- integration_test/functions/src/storage-tests.ts | 3 +-- integration_test/functions/src/testing.ts | 12 +++++++----- tsconfig.json | 2 +- 10 files changed, 27 insertions(+), 29 deletions(-) diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/auth-tests.ts index aaef21e6a..2c1e1d4e6 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/auth-tests.ts @@ -1,10 +1,10 @@ -import * as functions from 'firebase-functions'; -import { TestSuite, expectEq } from './testing'; import * as admin from 'firebase-admin'; +import * as functions from 'firebase-functions'; +import { expectEq, TestSuite } from './testing'; import UserMetadata = admin.auth.UserRecord; export const createUserTests: any = functions.auth.user().onCreate((u, c) => { - let testId: string = u.displayName; + const testId: string = u.displayName; console.log(`testId is ${testId}`); return new TestSuite('auth user onCreate') @@ -38,7 +38,7 @@ export const createUserTests: any = functions.auth.user().onCreate((u, c) => { }); export const deleteUserTests: any = functions.auth.user().onDelete((u, c) => { - let testId: string = u.displayName; + const testId: string = u.displayName; console.log(`testId is ${testId}`); return new TestSuite('auth user onDelete') diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index 215e6bd3b..de3030d3a 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -1,6 +1,6 @@ -import * as functions from 'firebase-functions'; -import { TestSuite, expectEq, expectMatches } from './testing'; import * as admin from 'firebase-admin'; +import * as functions from 'firebase-functions'; +import { expectEq, expectMatches, TestSuite } from './testing'; import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index e5f8acdbf..49d1ae919 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -1,6 +1,6 @@ -import * as functions from 'firebase-functions'; -import { TestSuite, expectEq, expectDeepEq } from './testing'; import * as admin from 'firebase-admin'; +import * as functions from 'firebase-functions'; +import { expectDeepEq, expectEq, TestSuite } from './testing'; import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/https-tests.ts index 7a0889ef6..55c7df983 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/https-tests.ts @@ -1,6 +1,6 @@ import * as functions from 'firebase-functions'; import * as _ from 'lodash'; -import { TestSuite, expectEq } from './testing'; +import { expectEq, TestSuite } from './testing'; export const callableTests: any = functions.https.onCall((d) => { return new TestSuite('https onCall') diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 967b3d376..05f9e2035 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,11 +1,8 @@ -import * as functions from 'firebase-functions'; -import * as https from 'https'; -import * as admin from 'firebase-admin'; import { Request, Response } from 'express'; +import * as admin from 'firebase-admin'; +import * as functions from 'firebase-functions'; import * as fs from 'fs'; - -import * as PubSub from '@google-cloud/pubsub'; -const pubsub = PubSub(); +import * as https from 'https'; export * from './pubsub-tests'; export * from './database-tests'; @@ -82,7 +79,7 @@ export const integrationTests: any = functions .split('.') .slice(1) .join('.'); - let pubsub: any = require('@google-cloud/pubsub')(); + const pubsub: any = require('@google-cloud/pubsub')(); const testId = admin .database() .ref() @@ -155,7 +152,7 @@ export const integrationTests: any = functions .then(() => { // On test completion, check that all tests pass and reply "PASS", or provide further details. console.log('Waiting for all tests to report they pass...'); - let ref = admin.database().ref(`testRuns/${testId}`); + const ref = admin.database().ref(`testRuns/${testId}`); return new Promise((resolve, reject) => { let testsExecuted = 0; ref.on('child_added', (snapshot) => { diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index ebac609dc..3c1b1ecc7 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -1,6 +1,6 @@ -import * as functions from 'firebase-functions'; import * as admin from 'firebase-admin'; -import { TestSuite, expectEq, evaluate, success } from './testing'; +import * as functions from 'firebase-functions'; +import { evaluate, expectEq, success, TestSuite } from './testing'; import PubsubMessage = functions.pubsub.Message; // TODO(inlined) use multiple queues to run inline. @@ -64,7 +64,7 @@ export const schedule: any = functions.pubsub // For the test, the job is triggered by the jobs:run api .onRun((context) => { let testId; - let db = admin.database(); + const db = admin.database(); return new Promise(async (resolve, reject) => { await db .ref('testRuns') diff --git a/integration_test/functions/src/remoteConfig-tests.ts b/integration_test/functions/src/remoteConfig-tests.ts index 2b824fbbd..3474e1fc2 100644 --- a/integration_test/functions/src/remoteConfig-tests.ts +++ b/integration_test/functions/src/remoteConfig-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { TestSuite, expectEq } from './testing'; +import { expectEq, TestSuite } from './testing'; import TemplateVersion = functions.remoteConfig.TemplateVersion; export const remoteConfigTests: any = functions.remoteConfig.onUpdate( diff --git a/integration_test/functions/src/storage-tests.ts b/integration_test/functions/src/storage-tests.ts index 7ced40fc9..43cdef5e2 100644 --- a/integration_test/functions/src/storage-tests.ts +++ b/integration_test/functions/src/storage-tests.ts @@ -1,7 +1,6 @@ import * as functions from 'firebase-functions'; -import { TestSuite, expectEq, expectDeepEq } from './testing'; +import { expectEq, TestSuite } from './testing'; import ObjectMetadata = functions.storage.ObjectMetadata; -const testIdFieldName = 'documentId'; export const storageTests: any = functions .runWith({ diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index d3782a981..43d3e69d5 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -1,9 +1,11 @@ import * as firebase from 'firebase-admin'; -import * as _ from 'lodash'; import { EventContext } from 'firebase-functions'; +import * as _ from 'lodash'; export type TestCase = (data: T, context?: EventContext) => any; -export type TestCaseMap = { [key: string]: TestCase }; +export interface TestCaseMap { + [key: string]: TestCase; +} export class TestSuite { private name: string; @@ -20,8 +22,8 @@ export class TestSuite { } run(testId: string, data: T, context?: EventContext): Promise { - let running: Array> = []; - for (let testName in this.tests) { + const running: Array> = []; + for (const testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { continue; } @@ -36,7 +38,7 @@ export class TestSuite { }, (error) => { console.error(`Failed: ${testName}`, error); - return { name: testName, passed: 0, error: error }; + return { name: testName, passed: 0, error }; } ); running.push(run); diff --git a/tsconfig.json b/tsconfig.json index 2f7cc7e0d..6538f1f07 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,5 +4,5 @@ "sourceMap": true }, "extends": "./tsconfig.release.json", - "include": ["./src/**/*.ts", "./spec/**/*.ts"] + "include": ["**/*.ts"] } From 5363a48ccebcb9340923dbf09f882f1bc4a48288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Fri, 12 Jul 2019 00:19:54 +0200 Subject: [PATCH 168/705] Define Codeowners (#516) * Define Codeowners * Add @kevinajian to Codeowners --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..49f7349e0 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @kevinajian @thechenky From a6ef584f9e7f296cb2d1aec9fdb7b5a4c31010ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Fri, 12 Jul 2019 01:16:34 +0200 Subject: [PATCH 169/705] Extract and document path manipulation utilities (#514) --- spec/index.spec.ts | 1 + spec/utilities/path.spec.ts | 24 ++++++++++++++++++++++++ spec/utils.spec.ts | 20 +------------------- src/providers/database.ts | 3 ++- src/utilities/path.ts | 35 +++++++++++++++++++++++++++++++++++ src/utils.ts | 20 -------------------- 6 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 spec/utilities/path.spec.ts create mode 100644 src/utilities/path.ts diff --git a/spec/index.spec.ts b/spec/index.spec.ts index 64ffdf62e..0eb95045d 100644 --- a/spec/index.spec.ts +++ b/spec/index.spec.ts @@ -43,4 +43,5 @@ import './providers/pubsub.spec'; import './providers/remoteConfig.spec'; import './providers/storage.spec'; import './setup.spec'; +import './utilities/path.spec'; import './utils.spec'; diff --git a/spec/utilities/path.spec.ts b/spec/utilities/path.spec.ts new file mode 100644 index 000000000..c0a5dc318 --- /dev/null +++ b/spec/utilities/path.spec.ts @@ -0,0 +1,24 @@ +import { expect } from 'chai'; +import { normalizePath, pathParts } from '../../src/utilities/path'; + +describe('utilities', () => { + describe('path', () => { + describe('#normalizePath', () => { + it('should strip leading and trailing slash', () => { + expect(normalizePath('/my/path/is/{rad}/')).to.eq('my/path/is/{rad}'); + }); + }); + + describe('#pathParts', () => { + it('should turn a path into an array of strings', () => { + expect(pathParts('/foo/bar/baz')).to.deep.equal(['foo', 'bar', 'baz']); + }); + + it('should turn a root path, empty string, or null path into an empty array', () => { + expect(pathParts('')).to.deep.equal([]); + expect(pathParts(null)).to.deep.equal([]); + expect(pathParts('/')).to.deep.equal([]); + }); + }); + }); +}); diff --git a/spec/utils.spec.ts b/spec/utils.spec.ts index 2ea64fb7e..51a8478fa 100644 --- a/spec/utils.spec.ts +++ b/spec/utils.spec.ts @@ -21,27 +21,9 @@ // SOFTWARE. import { expect } from 'chai'; -import { applyChange, normalizePath, pathParts } from '../src/utils'; +import { applyChange } from '../src/utils'; describe('utils', () => { - describe('.normalizePath(path: string)', () => { - it('should strip leading and trailing slash', () => { - expect(normalizePath('/my/path/is/{rad}/')).to.eq('my/path/is/{rad}'); - }); - }); - - describe('.pathParts(path: string): string[]', () => { - it('should turn a path into an array of strings', () => { - expect(pathParts('/foo/bar/baz')).to.deep.equal(['foo', 'bar', 'baz']); - }); - - it('should turn a root path, empty string, or null path into an empty array', () => { - expect(pathParts('')).to.deep.equal([]); - expect(pathParts(null)).to.deep.equal([]); - expect(pathParts('/')).to.deep.equal([]); - }); - }); - describe('.applyChange(from: any, to: any): any', () => { it('should return the to value for non-object values of from and to', () => { expect(applyChange({ a: 'b' }, null)).to.eq(null); diff --git a/src/providers/database.ts b/src/providers/database.ts index 7740a4373..ec6969909 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -32,7 +32,8 @@ import { } from '../cloud-functions'; import { firebaseConfig } from '../config'; import { DeploymentOptions } from '../function-configuration'; -import { applyChange, joinPath, normalizePath, pathParts } from '../utils'; +import { joinPath, normalizePath, pathParts } from '../utilities/path'; +import { applyChange } from '../utils'; /** @hidden */ export const provider = 'google.firebase.database'; diff --git a/src/utilities/path.ts b/src/utilities/path.ts new file mode 100644 index 000000000..40ab8f047 --- /dev/null +++ b/src/utilities/path.ts @@ -0,0 +1,35 @@ +/** + * Removes leading and trailing slashes from a path. + * + * @param path A path to normalize, in POSIX format. + */ +export function normalizePath(path: string): string { + if (!path) { + return ''; + } + return path.replace(/^\//, '').replace(/\/$/, ''); +} + +/** + * Normalizes a given path and splits it into an array of segments. + * + * @param path A path to split, in POSIX format. + */ +export function pathParts(path: string): string[] { + if (!path || path === '' || path === '/') { + return []; + } + return normalizePath(path).split('/'); +} + +/** + * Normalizes given paths and joins these together using a POSIX separator. + * + * @param base A first path segment, in POSIX format. + * @param child A second path segment, in POSIX format. + */ +export function joinPath(base: string, child: string) { + return pathParts(base) + .concat(pathParts(child)) + .join('/'); +} diff --git a/src/utils.ts b/src/utils.ts index ffec72a2d..b52c1e54f 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -22,26 +22,6 @@ import * as _ from 'lodash'; -export function normalizePath(path: string): string { - if (!path) { - return ''; - } - return path.replace(/^\//, '').replace(/\/$/, ''); -} - -export function pathParts(path: string): string[] { - if (!path || path === '' || path === '/') { - return []; - } - return normalizePath(path).split('/'); -} - -export function joinPath(base: string, child: string) { - return pathParts(base) - .concat(pathParts(child)) - .join('/'); -} - export function applyChange(src: any, dest: any) { // if not mergeable, don't merge if (!_.isPlainObject(dest) || !_.isPlainObject(src)) { From 03155440dea92fe6ffd166ebea9c022f5ee0c13d Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Thu, 11 Jul 2019 16:39:30 -0700 Subject: [PATCH 170/705] Add automatic TypeDoc generation to Functions SDK (#491) * add typedoc generation, somewhat working * fix from admin => functions in a comment * add npm run apidocs command to generate apidocs * modify to use modules instead of file mode * change toc to match modules mode of typedoc * add UserInfo to be generated, modify toc.yaml to correct links * add missing sections to toc.yaml * fix merge conflict * fix erroneous warnings about missing and unlisted files * remove underscores * edit toc.yaml to fix the links * remove underscores in links inside the html files * unhide Event * hide Event * add docgen/html to gitignore * formatting * remove Event from toc, add proper toc file checking * clean up docgen script --- .gitignore | 1 + docgen/content-sources/HOME.md | 3 + docgen/content-sources/toc.yaml | 114 +++++ docgen/generate-docs.js | 339 ++++++++++++++ docgen/theme/assets/css/firebase.css | 40 ++ docgen/theme/assets/css/main.css | 552 +++++++++++++++++++++++ docgen/theme/assets/images/lockup.png | Bin 0 -> 2646 bytes docgen/theme/layouts/default.hbs | 33 ++ docgen/theme/partials/breadcrumb.hbs | 11 + docgen/theme/partials/comment.hbs | 22 + docgen/theme/partials/header.hbs | 23 + docgen/theme/partials/member.sources.hbs | 15 + docgen/theme/partials/navigation.hbs | 22 + docgen/theme/templates/reflection.hbs | 72 +++ docgen/tsconfig.json | 3 + docgen/typedoc.js | 27 ++ package.json | 10 +- src/providers/auth.ts | 5 + 18 files changed, 1290 insertions(+), 2 deletions(-) create mode 100644 docgen/content-sources/HOME.md create mode 100644 docgen/content-sources/toc.yaml create mode 100644 docgen/generate-docs.js create mode 100644 docgen/theme/assets/css/firebase.css create mode 100644 docgen/theme/assets/css/main.css create mode 100644 docgen/theme/assets/images/lockup.png create mode 100644 docgen/theme/layouts/default.hbs create mode 100644 docgen/theme/partials/breadcrumb.hbs create mode 100644 docgen/theme/partials/comment.hbs create mode 100644 docgen/theme/partials/header.hbs create mode 100644 docgen/theme/partials/member.sources.hbs create mode 100644 docgen/theme/partials/navigation.hbs create mode 100644 docgen/theme/templates/reflection.hbs create mode 100644 docgen/tsconfig.json create mode 100644 docgen/typedoc.js diff --git a/.gitignore b/.gitignore index d345a2f7a..ba3cdeec5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .tmp .vscode/ coverage +docgen/html firebase-functions-*.tgz integration_test/.firebaserc integration_test/*.log diff --git a/docgen/content-sources/HOME.md b/docgen/content-sources/HOME.md new file mode 100644 index 000000000..c89df0a57 --- /dev/null +++ b/docgen/content-sources/HOME.md @@ -0,0 +1,3 @@ +# Firebase Functions SDK Reference + +Functions SDK!!! diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml new file mode 100644 index 000000000..c2766e430 --- /dev/null +++ b/docgen/content-sources/toc.yaml @@ -0,0 +1,114 @@ +toc: + - title: 'functions' + path: /docs/reference/functions/cloud_functions_.html + section: + - title: 'CloudFunction' + path: /docs/reference/functions/cloud_functions_.html#cloudfunction + - title: 'HttpsFunction' + path: /docs/reference/functions/cloud_functions_.html#httpsfunction + - title: 'EventContext' + path: /docs/reference/functions/cloud_functions_.eventcontext.html + - title: 'FunctionBuilder' + path: /docs/reference/functions/function_builder_.functionbuilder.html + - title: 'Change' + path: /docs/reference/functions/cloud_functions_.change.html + + - title: 'functions.config' + path: /docs/reference/functions/config_.html + section: + - title: 'Config' + path: /docs/reference/functions/config_.config.html + + - title: 'functions.analytics' + path: /docs/reference/functions/providers_analytics_.html + section: + - title: 'AnalyticsEvent' + path: /docs/reference/functions/providers_analytics_.analyticsevent.html + - title: 'AnalyticsEventBuilder' + path: /docs/reference/functions/providers_analytics_.analyticseventbuilder.html + - title: 'AppInfo' + path: /docs/reference/functions/providers_analytics_.appinfo.html + - title: 'DeviceInfo' + path: /docs/reference/functions/providers_analytics_.deviceinfo.html + - title: 'ExportBundleInfo' + path: /docs/reference/functions/providers_analytics_.exportbundleinfo.html + - title: 'GeoInfo' + path: /docs/reference/functions/providers_analytics_.geoinfo.html + - title: 'UserDimensions' + path: /docs/reference/functions/providers_analytics_.userdimensions.html + - title: 'UserPropertyValue' + path: /docs/reference/functions/providers_analytics_.userpropertyvalue.html + + - title: 'functions.auth' + path: /docs/reference/functions/providers_auth_.html + section: + - title: 'UserBuilder' + path: /docs/reference/functions/providers_auth_.userbuilder.html + - title: 'UserInfo' + path: /docs/reference/functions/providers_auth_.html#userinfo + - title: 'UserRecordMetadata' + path: /docs/reference/functions/providers_auth_.userrecordmetadata.html + - title: 'UserRecord' + path: /docs/reference/functions/providers_auth_.html#userrecord + + - title: 'functions.crashlytics' + path: /docs/reference/functions/providers_crashlytics_.html + section: + - title: 'Issue' + path: /docs/reference/functions/providers_crashlytics_.issue.html + - title: 'IssueBuilder' + path: /docs/reference/functions/providers_crashlytics_.issuebuilder.html + - title: 'AppInfo' + path: /docs/reference/functions/providers_crashlytics_.appinfo.html + - title: 'VelocityAlert' + path: /docs/reference/functions/providers_crashlytics_.velocityalert.html + + - title: 'functions.firestore' + path: /docs/reference/functions/providers_firestore_.html + section: + - title: 'DocumentBuilder' + path: /docs/reference/functions/providers_firestore_.documentbuilder.html + - title: 'DocumentSnapshot' + path: /docs/reference/functions/providers_firestore_.html#documentsnapshot + + - title: 'functions.database' + path: /docs/reference/functions/providers_database_.html + section: + - title: 'DataSnapshot' + path: /docs/reference/functions/providers_database_.datasnapshot.html + - title: 'RefBuilder' + path: /docs/reference/functions/providers_database_.refbuilder.html + - title: 'InstanceBuilder' + path: /docs/reference/functions/providers_database_.instancebuilder.html + + - title: 'functions.https' + path: /docs/reference/functions/providers_https_.html + section: + - title: 'HttpsError' + path: /docs/reference/functions/providers_https_.httpserror.html + + - title: 'functions.pubsub' + path: /docs/reference/functions/providers_pubsub_.html + section: + - title: 'Message' + path: /docs/reference/functions/providers_pubsub_.message.html + - title: 'TopicBuilder' + path: /docs/reference/functions/providers_pubsub_.topicbuilder.html + + - title: 'functions.remoteconfig' + path: /docs/reference/functions/providers_remoteconfig_.html + section: + - title: 'RemoteConfigUser' + path: /docs/reference/functions/providers_remoteconfig_.remoteconfiguser.html + - title: 'TemplateVersion' + path: /docs/reference/functions/providers_remoteconfig_.templateversion.html + + - title: 'functions.storage' + path: /docs/reference/functions/providers_storage_.html + section: + - title: 'BucketBuilder' + path: /docs/reference/functions/providers_storage_.bucketbuilder.html + - title: 'ObjectBuilder' + path: /docs/reference/functions/providers_storage_.objectbuilder.html + - title: 'ObjectMetadata' + path: /docs/reference/functions/providers_storage_.objectmetadata.html diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js new file mode 100644 index 000000000..299250e64 --- /dev/null +++ b/docgen/generate-docs.js @@ -0,0 +1,339 @@ +/** + * @license + * Copyright 2019 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const { exec } = require('child-process-promise'); +const fs = require('mz/fs'); +const path = require('path'); +const yargs = require('yargs'); +const yaml = require('js-yaml'); +const _ = require('lodash'); + +const repoPath = path.resolve(`${__dirname}/..`); + +// Command-line options. +const { source: sourceFile } = yargs + .option('source', { + default: `${repoPath}/src`, + describe: 'Typescript source file(s)', + type: 'string' + }) + .version(false) + .help().argv; + +const docPath = path.resolve(`${__dirname}/html`); +const contentPath = path.resolve(`${__dirname}/content-sources`); +const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`); +const devsitePath = `/docs/reference/functions/`; + +/** + * Strips path prefix and returns only filename. + * @param {string} path + */ +function stripPath(path) { + const parts = path.split('/'); + return parts[parts.length - 1]; +} + +/** + * Runs Typedoc command. + * + * Additional config options come from ./typedoc.js + */ +function runTypedoc() { + const command = `${repoPath}/node_modules/.bin/typedoc ${sourceFile} \ + --out ${docPath} \ + --readme ${tempHomePath} \ + --options ${__dirname}/typedoc.js \ + --theme ${__dirname}/theme`; + + console.log('Running command:\n', command); + return exec(command); +} + +/** + * Moves files from subdir to root. + * @param {string} subdir Subdir to move files out of. + */ +function moveFilesToRoot(subdir) { + return exec(`mv ${docPath}/${subdir}/* ${docPath}`) + .then(() => { + exec(`rmdir ${docPath}/${subdir}`); + }) + .catch(e => console.error(e)); +} + +/** + * Renames files to remove the leading underscores. + * We need to do this because devsite hides these files. + * Example: + * _cloud_functions_.resource.html => cloud_functions_.resource.html + */ +function renameFiles() { + return fs.readdir(docPath).then(files => { + console.log(files); + files.forEach(file => { + let newFileName = file; + if (_.startsWith(file, "_") && _.endsWith(file, "html")) { + newFileName = _.trimStart(file, "_"); + fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`, (err) => { + if (err) console.log(err) + }); + } + }) + }) +} + +/** + * Reformat links to match flat structure. + * @param {string} file File to fix links in. + */ +function fixLinks(file) { + return fs.readFile(file, 'utf8').then(data => { + const flattenedLinks = data + .replace(/\.\.\//g, '') + .replace(/(modules|interfaces|classes)\//g, '') + .replace(/\"_/g, '"'); + let caseFixedLinks = flattenedLinks; + for (const lower in lowerToUpperLookup) { + const re = new RegExp(lower, 'g'); + caseFixedLinks = caseFixedLinks.replace(re, lowerToUpperLookup[lower]); + } + return fs.writeFile(file, caseFixedLinks); + }); +} + +let tocText = ''; + +/** + * Generates temporary markdown file that will be sourced by Typedoc to + * create index.html. + * + * @param {string} tocRaw + * @param {string} homeRaw + */ +function generateTempHomeMdFile(tocRaw, homeRaw) { + const { toc } = yaml.safeLoad(tocRaw); + let tocPageLines = [homeRaw, '# API Reference']; + toc.forEach(group => { + tocPageLines.push(`\n## [${group.title}](${stripPath(group.path)})`); + const section = group.section || []; + section.forEach(item => { + tocPageLines.push(`- [${item.title}](${stripPath(item.path)})`); + }); + }); + return fs.writeFile(tempHomePath, tocPageLines.join('\n')); +} + +/** + * Mapping between lowercase file name and correctly cased name. + * Used to update links when filenames are capitalized. + */ +const lowerToUpperLookup = {}; + +/** + * Checks to see if any files listed in toc.yaml were not generated. + * If files exist, fixes filename case to match toc.yaml version. + */ +function checkForMissingFilesAndFixFilenameCase() { + // Get filenames from toc.yaml. + const filenames = tocText + .split('\n') + .filter(line => line.includes('path:')) + .map(line => line.split(devsitePath)[1]); + // Logs warning to console if a file from TOC is not found. + // console.log(filenames); + const fileCheckPromises = filenames.map(filename => { + // Warns if file does not exist, fixes filename case if it does. + // Preferred filename for devsite should be capitalized and taken from + // toc.yaml. + const tocFilePath = `${docPath}/${filename}`; + // Generated filename from Typedoc will be lowercase. + const generatedFilePath = `${docPath}/${filename.toLowerCase()}`; + return fs.exists(generatedFilePath).then(exists => { + if (exists) { + // Store in a lookup table for link fixing. + lowerToUpperLookup[ + `${filename.toLowerCase()}` + ] = `${filename}`; + return fs.rename(generatedFilePath, tocFilePath); + } else { + console.warn( + `Missing file: ${filename} requested ` + + `in toc.yaml but not found in ${docPath}` + ); + } + }); + }); + return Promise.all(fileCheckPromises).then(() => filenames); +} + +/** + * Gets a list of html files in generated dir and checks if any are not + * found in toc.yaml. + * Option to remove the file if not found (used for node docs). + * + * @param {Array} filenamesFromToc Filenames pulled from toc.yaml + * @param {boolean} shouldRemove Should just remove the file + */ +function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { + return fs.readdir(docPath).then(files => { + const htmlFiles = files + .filter(filename => filename.slice(-4) === 'html'); + const removePromises = []; + htmlFiles.forEach(filename => { + if ( + !filenamesFromToc.includes(filename) && + filename !== 'index' && + filename !== 'globals' + ) { + if (shouldRemove) { + console.log( + `REMOVING ${docPath}/${filename} - not listed in toc.yaml.` + ); + removePromises.push(fs.unlink(`${docPath}/${filename}`)); + } else { + // This is just a warning, it doesn't need to finish before + // the process continues. + console.warn( + `Unlisted file: ${filename} generated ` + + `but not listed in toc.yaml.` + ); + } + } + }); + if (shouldRemove) { + return Promise.all(removePromises).then(() => + htmlFiles.filter(filename => filenamesFromToc.includes(filename)) + ); + } else { + return htmlFiles; + } + }); +} + +/** + * Writes a _toc_autogenerated.yaml as a record of all files that were + * autogenerated. Helpful to tech writers. + * + * @param {Array} htmlFiles List of html files found in generated dir. + */ +function writeGeneratedFileList(htmlFiles) { + const fileList = htmlFiles.map(filename => { + return { + title: filename, + path: `${devsitePath}${filename}` + }; + }); + const generatedTocYAML = yaml.safeDump({ toc: fileList }); + return fs + .writeFile(`${docPath}/_toc_autogenerated.yaml`, generatedTocYAML) + .then(() => htmlFiles); +} + +/** + * Fix all links in generated files to other generated files to point to top + * level of generated docs dir. + * + * @param {Array} htmlFiles List of html files found in generated dir. + */ +function fixAllLinks(htmlFiles) { + const writePromises = []; + htmlFiles.forEach(file => { + // Update links in each html file to match flattened file structure. + writePromises.push(fixLinks(`${docPath}/${file}`)); + }); + return Promise.all(writePromises); +} + +/** + * Main document generation process. + * + * Steps for generating documentation: + * 1) Create temporary md file as source of homepage. + * 2) Run Typedoc, sourcing index.d.ts for API content and temporary md file + * for index.html content. + * 3) Write table of contents file. + * 4) Flatten file structure by moving all items up to root dir and fixing + * links as needed. + * 5) Check for mismatches between TOC list and generated file list. + */ +Promise.all([ + fs.readFile(`${contentPath}/toc.yaml`, 'utf8'), + fs.readFile(`${contentPath}/HOME.md`, 'utf8') +]) + // Read TOC and homepage text and assemble a homepage markdown file. + // This file will be sourced by Typedoc to generate index.html. + .then(([tocRaw, homeRaw]) => { + tocText = tocRaw; + return generateTempHomeMdFile(tocRaw, homeRaw); + }) + // Run main Typedoc process (uses index.d.ts and generated temp file above). + .then(runTypedoc) + .then(output => { + // Typedoc output. + console.log(output.stdout); + // Clean up temp home markdown file. (Nothing needs to wait for this.) + fs.unlink(tempHomePath); + // Devsite doesn't like css.map files. + return fs.unlink(`${docPath}/assets/css/main.css.map`); + }) + // Write out TOC file. Do this after Typedoc step to prevent Typedoc + // erroring when it finds an unexpected file in the target dir. + .then(() => fs.writeFile(`${docPath}/_toc.yaml`, tocText)) + // Flatten file structure. These categories don't matter to us and it makes + // it easier to manage the docs directory. + .then(() => { + return Promise.all([ + moveFilesToRoot('classes'), + moveFilesToRoot('modules'), + moveFilesToRoot('interfaces'), + ]); + }) + // Rename files to remove the underscores since devsite hides those. + .then(renameFiles) + // Check for files listed in TOC that are missing and warn if so. + // Not blocking. + .then(checkForMissingFilesAndFixFilenameCase) + // Check for files that exist but aren't listed in the TOC and warn. + // (If API is node, actually remove the file.) + // Removal is blocking, warnings aren't. + .then(filenamesFromToc => + checkForUnlistedFiles(filenamesFromToc, false) + ) + // Write a _toc_autogenerated.yaml to record what files were created. + .then(htmlFiles => writeGeneratedFileList(htmlFiles)) + // Correct the links in all the generated html files now that files have + // all been moved to top level. + // .then(removeUnderscores) + .then(fixAllLinks) + .then(() => { + fs.readFile(`${docPath}/index.html`, 'utf8').then(data => { + // String to include devsite local variables. + const localVariablesIncludeString = `{% include "docs/web/_local_variables.html" %}\n`; + return fs.writeFile( + `${docPath}/index.html`, + localVariablesIncludeString + data + ); + }); + }) + .catch(e => { + if (e.stdout) { + console.error(e.stdout); + } else { + console.error(e); + } + }); diff --git a/docgen/theme/assets/css/firebase.css b/docgen/theme/assets/css/firebase.css new file mode 100644 index 000000000..86c592820 --- /dev/null +++ b/docgen/theme/assets/css/firebase.css @@ -0,0 +1,40 @@ +.firebase-docs .project-name { + color: #333; + display: inline-block; + font-size: 20px; + font-weight: normal; + margin-left: 130px; +} + +.firebase-docs aside.tsd-sources { + padding: 8px; +} + +.firebase-docs .tsd-panel li { + margin: 0; +} + +.firebase-docs aside.tsd-sources:before { + content: unset; +} + +.firebase-docs dl.tsd-comment-tags dt.tag-example { + float: none; + text-transform: capitalize; + color: #000; + font-size: 1.1em; + padding: 5px; + border: none; +} + +.firebase-docs dl.tsd-comment-tags dd.tag-body-example { + padding-left: 0; +} + +.firebase-docs .tsd-breadcrumb .breadcrumb-name a { + color: #039be5; +} + +.firebase-docs .tsd-breadcrumb .model-name { + color: #333; +} \ No newline at end of file diff --git a/docgen/theme/assets/css/main.css b/docgen/theme/assets/css/main.css new file mode 100644 index 000000000..12f3d05d9 --- /dev/null +++ b/docgen/theme/assets/css/main.css @@ -0,0 +1,552 @@ +/*! normalize.css v1.1.3 | MIT License | git.io/normalize */ +/* ========================================================================== HTML5 display definitions ========================================================================== */ +/** Correct `block` display not defined in IE 6/7/8/9 and Firefox 3. */ +article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; } + +/** Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. */ +audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; } + +/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ +audio:not([controls]) { display: none; height: 0; } + +/** Address styling not present in IE 7/8/9, Firefox 3, and Safari 4. Known issue: no IE 6 support. */ +[hidden] { display: none; } + +/* ========================================================================== Base ========================================================================== */ +/** 1. Correct text resizing oddly in IE 6/7 when body `font-size` is set using `em` units. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ +html { font-size: 100%; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ font-family: sans-serif; } + +/** Address `font-family` inconsistency between `textarea` and other form elements. */ +button, input, select, textarea { font-family: sans-serif; } + +/** Address margins handled incorrectly in IE 6/7. */ +body { margin: 0; } + +/* ========================================================================== Links ========================================================================== */ +/** Address `outline` inconsistency between Chrome and other browsers. */ +a:focus { outline: thin dotted; } +a:active, a:hover { outline: 0; } + +/** Improve readability when focused and also mouse hovered in all browsers. */ +/* ========================================================================== Typography ========================================================================== */ +/** Address font sizes and margins set differently in IE 6/7. Address font sizes within `section` and `article` in Firefox 4+, Safari 5, and Chrome. */ +h1 { font-size: 2em; margin: 0.67em 0; } + +h2 { font-size: 1.5em; margin: 0.83em 0; } + +h3 { font-size: 1.17em; margin: 1em 0; } + +h4, .tsd-index-panel h3 { font-size: 1em; margin: 1.33em 0; } + +h5 { font-size: 0.83em; margin: 1.67em 0; } + +h6 { font-size: 0.67em; margin: 2.33em 0; } + +/** Address styling not present in IE 7/8/9, Safari 5, and Chrome. */ +abbr[title] { border-bottom: 1px dotted; } + +/** Address style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. */ +b, strong { font-weight: bold; } + +blockquote { margin: 1em 40px; } + +/** Address styling not present in Safari 5 and Chrome. */ +dfn { font-style: italic; } + +/** Address differences between Firefox and other browsers. Known issue: no IE 6/7 normalization. */ +hr { box-sizing: content-box; height: 0; } + +/** Address styling not present in IE 6/7/8/9. */ +mark { background: #ff0; color: #000; } + +/** Address margins set differently in IE 6/7. */ +p, pre { margin: 1em 0; } + +/** Improve readability of pre-formatted text in all browsers. */ +pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } + +/** Address CSS quotes not supported in IE 6/7. */ +q { quotes: none; } +q:before, q:after { content: ""; content: none; } + +/** Address `quotes` property not supported in Safari 4. */ +/** Address inconsistent and variable font size in all browsers. */ +small { font-size: 80%; } + +/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ +sub { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } + +sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; top: -0.5em; } + +sub { bottom: -0.25em; } + +/* ========================================================================== Lists ========================================================================== */ +dd { margin: 0 0 0 40px; } + +/** Address paddings set differently in IE 6/7. */ +menu, ol, ul { padding: 0 0 0 40px; } + +/** Correct list images handled incorrectly in IE 7. */ +nav ul, nav ol { list-style: none; list-style-image: none; } + +/* ========================================================================== Embedded content ========================================================================== */ +/** 1. Remove border when inside `a` element in IE 6/7/8/9 and Firefox 3. 2. Improve image quality when scaled in IE 7. */ +img { border: 0; /* 1 */ -ms-interpolation-mode: bicubic; } + +/* 2 */ +/** Correct overflow displayed oddly in IE 9. */ +svg:not(:root) { overflow: hidden; } + +/* ========================================================================== Figures ========================================================================== */ +/** Address margin not present in IE 6/7/8/9, Safari 5, and Opera 11. */ +figure, form { margin: 0; } + +/* ========================================================================== Forms ========================================================================== */ +/** Correct margin displayed oddly in IE 6/7. */ +/** Define consistent border, margin, and padding. */ +fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } + +/** 1. Correct color not being inherited in IE 6/7/8/9. 2. Correct text not wrapping in Firefox 3. 3. Correct alignment displayed oddly in IE 6/7. */ +legend { border: 0; /* 1 */ padding: 0; white-space: normal; /* 2 */ *margin-left: -7px; } + +/* 3 */ +/** 1. Correct font size not being inherited in all browsers. 2. Address margins set differently in IE 6/7, Firefox 3+, Safari 5, and Chrome. 3. Improve appearance and consistency in all browsers. */ +button, input, select, textarea { font-size: 100%; /* 1 */ margin: 0; /* 2 */ vertical-align: baseline; /* 3 */ *vertical-align: middle; } + +/* 3 */ +/** Address Firefox 3+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ +button, input { line-height: normal; } + +/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Chrome, Safari 5+, and IE 6+. Correct `select` style inheritance in Firefox 4+ and Opera. */ +button, select { text-transform: none; } + +/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. 4. Remove inner spacing in IE 7 without affecting normal text inputs. Known issue: inner spacing remains in IE 6. */ +button, html input[type="button"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ *overflow: visible; } + +/* 4 */ +input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ *overflow: visible; } + +/* 4 */ +/** Re-set default cursor for disabled elements. */ +button[disabled], html input[disabled] { cursor: default; } + +/** 1. Address box sizing set to content-box in IE 8/9. 2. Remove excess padding in IE 8/9. 3. Remove excess padding in IE 7. Known issue: excess padding remains in IE 6. */ +input { /* 3 */ } +input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ *height: 13px; /* 3 */ *width: 13px; } +input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } +input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } + +/** 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome (include `-moz` to future-proof). */ +/** Remove inner padding and search cancel button in Safari 5 and Chrome on OS X. */ +/** Remove inner padding and border in Firefox 3+. */ +button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } + +/** 1. Remove default vertical scrollbar in IE 6/7/8/9. 2. Improve readability and alignment in all browsers. */ +textarea { overflow: auto; /* 1 */ vertical-align: top; } + +/* 2 */ +/* ========================================================================== Tables ========================================================================== */ +/** Remove most spacing between table cells. */ +table { border-collapse: collapse; border-spacing: 0; } + +.hljs { display: inline-block; padding: 0.5em; background: white; color: #37474f; } + +.hljs-comment, +.hljs-annotation, +.hljs-template_comment, +.diff .hljs-header, +.hljs-chunk, +.apache .hljs-cbracket { color: #d81b60; } + +.hljs-keyword, +.hljs-id, +.hljs-built_in, +.css .smalltalk .hljs-class, +.hljs-winutils, +.bash .hljs-variable, +.tex .hljs-command, +.hljs-request, +.hljs-status, +.hljs-meta, +.nginx .hljs-title { color: #3b78e7; } + +.xml .hljs-tag { color: #3b78e7; } +.xml .hljs-tag .hljs-value { color: #3b78e7; } + +.hljs-string, +.hljs-title, +.hljs-parent, +.hljs-tag .hljs-value, +.hljs-rules .hljs-value { color: #0d904f; } + +.devsite-dark-code .hljs { display: inline-block; padding: 0.5em; background: white; color: #eceff1; } + +.devsite-dark-code .hljs-comment, +.devsite-dark-code .hljs-annotation, +.devsite-dark-code .hljs-template_comment, +.devsite-dark-code .diff .hljs-header, +.devsite-dark-code .hljs-chunk { color: #f06292; } + +.devsite-dark-code .hljs-keyword, +.devsite-dark-code .hljs-id, +.devsite-dark-code .hljs-built_in, +.devsite-dark-code .hljs-winutils, +.devsite-dark-code .hljs-request, +.devsite-dark-code .hljs-status, +.devsite-dark-code .hljs-meta { color: #4dd0e1; } + +.devsite-dark-code .hljs-string, +.devsite-dark-code .hljs-title, +.devsite-dark-code .hljs-parent, +.devsite-dark-code .hljs-tag .hljs-value, +.devsite-dark-code .hljs-rules .hljs-value { color: #9ccc65; } + +.col > :first-child, .col-1 > :first-child, .col-2 > :first-child, .col-3 > :first-child, .col-4 > :first-child, .col-5 > :first-child, .col-6 > :first-child, .col-7 > :first-child, .col-8 > :first-child, .col-9 > :first-child, .col-10 > :first-child, .col-11 > :first-child, .tsd-panel > :first-child, ul.tsd-descriptions > li > :first-child, .col > :first-child > :first-child, .col-1 > :first-child > :first-child, .col-2 > :first-child > :first-child, .col-3 > :first-child > :first-child, .col-4 > :first-child > :first-child, .col-5 > :first-child > :first-child, .col-6 > :first-child > :first-child, .col-7 > :first-child > :first-child, .col-8 > :first-child > :first-child, .col-9 > :first-child > :first-child, .col-10 > :first-child > :first-child, .col-11 > :first-child > :first-child, .tsd-panel > :first-child > :first-child, ul.tsd-descriptions > li > :first-child > :first-child, .col > :first-child > :first-child > :first-child, .col-1 > :first-child > :first-child > :first-child, .col-2 > :first-child > :first-child > :first-child, .col-3 > :first-child > :first-child > :first-child, .col-4 > :first-child > :first-child > :first-child, .col-5 > :first-child > :first-child > :first-child, .col-6 > :first-child > :first-child > :first-child, .col-7 > :first-child > :first-child > :first-child, .col-8 > :first-child > :first-child > :first-child, .col-9 > :first-child > :first-child > :first-child, .col-10 > :first-child > :first-child > :first-child, .col-11 > :first-child > :first-child > :first-child, .tsd-panel > :first-child > :first-child > :first-child, ul.tsd-descriptions > li > :first-child > :first-child > :first-child { margin-top: 0; } +.col > :last-child, .col-1 > :last-child, .col-2 > :last-child, .col-3 > :last-child, .col-4 > :last-child, .col-5 > :last-child, .col-6 > :last-child, .col-7 > :last-child, .col-8 > :last-child, .col-9 > :last-child, .col-10 > :last-child, .col-11 > :last-child, .tsd-panel > :last-child, ul.tsd-descriptions > li > :last-child, .col > :last-child > :last-child, .col-1 > :last-child > :last-child, .col-2 > :last-child > :last-child, .col-3 > :last-child > :last-child, .col-4 > :last-child > :last-child, .col-5 > :last-child > :last-child, .col-6 > :last-child > :last-child, .col-7 > :last-child > :last-child, .col-8 > :last-child > :last-child, .col-9 > :last-child > :last-child, .col-10 > :last-child > :last-child, .col-11 > :last-child > :last-child, .tsd-panel > :last-child > :last-child, ul.tsd-descriptions > li > :last-child > :last-child, .col > :last-child > :last-child > :last-child, .col-1 > :last-child > :last-child > :last-child, .col-2 > :last-child > :last-child > :last-child, .col-3 > :last-child > :last-child > :last-child, .col-4 > :last-child > :last-child > :last-child, .col-5 > :last-child > :last-child > :last-child, .col-6 > :last-child > :last-child > :last-child, .col-7 > :last-child > :last-child > :last-child, .col-8 > :last-child > :last-child > :last-child, .col-9 > :last-child > :last-child > :last-child, .col-10 > :last-child > :last-child > :last-child, .col-11 > :last-child > :last-child > :last-child, .tsd-panel > :last-child > :last-child > :last-child, ul.tsd-descriptions > li > :last-child > :last-child > :last-child { margin-bottom: 0; } + +.container { max-width: 1200px; margin: 0 auto; padding: 0 40px; } +@media (max-width: 640px) { .container { padding: 0 20px; } } + +.container-main { padding-bottom: 200px; } + +.row { position: relative; margin: 0 -10px; } +.row:after { visibility: hidden; display: block; content: ""; clear: both; height: 0; } + +.col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11 { box-sizing: border-box; float: left; padding: 0 10px; } + +.col-1 { width: 8.33333%; } + +.offset-1 { margin-left: 8.33333%; } + +.col-2 { width: 16.66667%; } + +.offset-2 { margin-left: 16.66667%; } + +.col-3 { width: 25%; } + +.offset-3 { margin-left: 25%; } + +.col-4 { width: 33.33333%; } + +.offset-4 { margin-left: 33.33333%; } + +.col-5 { width: 41.66667%; } + +.offset-5 { margin-left: 41.66667%; } + +.col-6 { width: 50%; } + +.offset-6 { margin-left: 50%; } + +.col-7 { width: 58.33333%; } + +.offset-7 { margin-left: 58.33333%; } + +.col-8 { width: 66.66667%; } + +.offset-8 { margin-left: 66.66667%; } + +.col-9 { width: 75%; } + +.offset-9 { margin-left: 75%; } + +.col-10 { width: 83.33333%; } + +.offset-10 { margin-left: 83.33333%; } + +.col-11 { width: 91.66667%; } + +.offset-11 { margin-left: 91.66667%; } + +.tsd-kind-icon { display: block; position: relative; padding-left: 20px; text-indent: -20px; } + +.no-transition { transition: none !important; } + +@-webkit-keyframes fade-in { from { opacity: 0; } + to { opacity: 1; } } + +@keyframes fade-in { from { opacity: 0; } + to { opacity: 1; } } +@-webkit-keyframes fade-out { from { opacity: 1; visibility: visible; } + to { opacity: 0; } } +@keyframes fade-out { from { opacity: 1; visibility: visible; } + to { opacity: 0; } } +@-webkit-keyframes fade-in-delayed { 0% { opacity: 0; } + 33% { opacity: 0; } + 100% { opacity: 1; } } +@keyframes fade-in-delayed { 0% { opacity: 0; } + 33% { opacity: 0; } + 100% { opacity: 1; } } +@-webkit-keyframes fade-out-delayed { 0% { opacity: 1; visibility: visible; } + 66% { opacity: 0; } + 100% { opacity: 0; } } +@keyframes fade-out-delayed { 0% { opacity: 1; visibility: visible; } + 66% { opacity: 0; } + 100% { opacity: 0; } } +@-webkit-keyframes shift-to-left { from { -webkit-transform: translate(0, 0); transform: translate(0, 0); } + to { -webkit-transform: translate(-25%, 0); transform: translate(-25%, 0); } } +@keyframes shift-to-left { from { -webkit-transform: translate(0, 0); transform: translate(0, 0); } + to { -webkit-transform: translate(-25%, 0); transform: translate(-25%, 0); } } +@-webkit-keyframes unshift-to-left { from { -webkit-transform: translate(-25%, 0); transform: translate(-25%, 0); } + to { -webkit-transform: translate(0, 0); transform: translate(0, 0); } } +@keyframes unshift-to-left { from { -webkit-transform: translate(-25%, 0); transform: translate(-25%, 0); } + to { -webkit-transform: translate(0, 0); transform: translate(0, 0); } } +@-webkit-keyframes pop-in-from-right { from { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); } + to { -webkit-transform: translate(0, 0); transform: translate(0, 0); } } +@keyframes pop-in-from-right { from { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); } + to { -webkit-transform: translate(0, 0); transform: translate(0, 0); } } +@-webkit-keyframes pop-out-to-right { from { -webkit-transform: translate(0, 0); transform: translate(0, 0); visibility: visible; } + to { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); } } +@keyframes pop-out-to-right { from { -webkit-transform: translate(0, 0); transform: translate(0, 0); visibility: visible; } + to { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); } } + +a { color: #4da6ff; text-decoration: none; } +a:hover { text-decoration: underline; } + +pre { padding: 10px; } +pre code { padding: 0; font-size: 100%; background-color: transparent; } + +.tsd-typography ul { list-style: square; padding: 0 0 0 20px; margin: 0; } +.tsd-typography h4, .tsd-typography .tsd-index-panel h3, .tsd-index-panel .tsd-typography h3, .tsd-typography h5, .tsd-typography h6 { font-size: 1em; margin: 0; } +.tsd-typography h5, .tsd-typography h6 { font-weight: normal; } +.tsd-typography p, .tsd-typography ul, .tsd-typography ol { margin: 1em 0; } + +@media (min-width: 901px) and (max-width: 1024px) { html.default .col-content { width: 72%; } + html.default .col-menu { width: 28%; } + html.default .tsd-navigation { padding-left: 10px; } } +@media (max-width: 900px) { html.default .col-content { float: none; width: 100%; } + html.default .col-menu { position: fixed !important; overflow: auto; -webkit-overflow-scrolling: touch; overflow-scrolling: touch; z-index: 1024; top: 0 !important; bottom: 0 !important; left: auto !important; right: 0 !important; width: 100%; padding: 20px 20px 0 0; max-width: 450px; visibility: hidden; background-color: #fff; -webkit-transform: translate(100%, 0); transform: translate(100%, 0); } + html.default .col-menu > *:last-child { padding-bottom: 20px; } + html.default .overlay { content: ""; display: block; position: fixed; z-index: 1023; top: 0; left: 0; right: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.75); visibility: hidden; } + html.default.to-has-menu .overlay { -webkit-animation: fade-in 0.4s; animation: fade-in 0.4s; } + html.default.to-has-menu header, html.default.to-has-menu footer, html.default.to-has-menu .col-content { -webkit-animation: shift-to-left 0.4s; animation: shift-to-left 0.4s; } + html.default.to-has-menu .col-menu { -webkit-animation: pop-in-from-right 0.4s; animation: pop-in-from-right 0.4s; } + html.default.from-has-menu .overlay { -webkit-animation: fade-out 0.4s; animation: fade-out 0.4s; } + html.default.from-has-menu header, html.default.from-has-menu footer, html.default.from-has-menu .col-content { -webkit-animation: unshift-to-left 0.4s; animation: unshift-to-left 0.4s; } + html.default.from-has-menu .col-menu { -webkit-animation: pop-out-to-right 0.4s; animation: pop-out-to-right 0.4s; } + html.default.has-menu body { overflow: hidden; } + html.default.has-menu .overlay { visibility: visible; } + html.default.has-menu header, html.default.has-menu footer, html.default.has-menu .col-content { -webkit-transform: translate(-25%, 0); transform: translate(-25%, 0); } + html.default.has-menu .col-menu { visibility: visible; -webkit-transform: translate(0, 0); transform: translate(0, 0); } } + +.tsd-page-title { padding: 0; margin: 0; background: #fff; } +.tsd-page-title h1 { font-weight: normal; margin: 0; } + +.tsd-breadcrumb { margin: 0; padding: 0; color: #808080; } +.tsd-breadcrumb a { color: #808080; text-decoration: none; } +.tsd-breadcrumb a:hover { text-decoration: underline; } +.tsd-breadcrumb li { display: inline; margin-right: -0.25em; } + +html.minimal .container { margin: 0; } +html.minimal .container-main { padding-top: 50px; padding-bottom: 0; } +html.minimal .content-wrap { padding-left: 300px; } +html.minimal .tsd-navigation { position: fixed !important; overflow: auto; -webkit-overflow-scrolling: touch; overflow-scrolling: touch; box-sizing: border-box; z-index: 1; left: 0; top: 40px; bottom: 0; width: 300px; padding: 20px; margin: 0; } +html.minimal .tsd-member .tsd-member { margin-left: 0; } +html.minimal .tsd-page-toolbar { position: fixed; z-index: 2; } +html.minimal #tsd-filter .tsd-filter-group { right: 0; -webkit-transform: none; transform: none; } +html.minimal footer { background-color: transparent; } +html.minimal footer .container { padding: 0; } +html.minimal .tsd-generator { padding: 0; } +@media (max-width: 900px) { html.minimal .tsd-navigation { display: none; } + html.minimal .content-wrap { padding-left: 0; } } + +dl.tsd-comment-tags { overflow: hidden; } +dl.tsd-comment-tags dt { clear: both; float: left; padding: 1px 5px; margin: 0 10px 0 0; border-radius: 4px; border: 1px solid #808080; color: #808080; font-size: 0.8em; font-weight: normal; } +dl.tsd-comment-tags dd { margin: 0 0 10px 0; } +dl.tsd-comment-tags p { margin: 0; } + +.tsd-panel.tsd-comment .lead { font-size: 1.1em; line-height: 1.333em; margin-bottom: 2em; } +.tsd-panel.tsd-comment .lead:last-child { margin-bottom: 0; } + +.toggle-protected .tsd-is-private { display: none; } + +.toggle-public .tsd-is-private, .toggle-public .tsd-is-protected, .toggle-public .tsd-is-private-protected { display: none; } + +.toggle-inherited .tsd-is-inherited { display: none; } + +.toggle-only-exported .tsd-is-not-exported { display: none; } + +.toggle-externals .tsd-is-external { display: none; } + +#tsd-filter { position: relative; display: inline-block; height: 40px; vertical-align: bottom; } +.no-filter #tsd-filter { display: none; } +#tsd-filter .tsd-filter-group { display: inline-block; height: 40px; vertical-align: bottom; white-space: nowrap; } +#tsd-filter input { display: none; } +@media (max-width: 900px) { #tsd-filter .tsd-filter-group { display: block; position: absolute; top: 40px; right: 20px; height: auto; background-color: #fff; visibility: hidden; -webkit-transform: translate(50%, 0); transform: translate(50%, 0); box-shadow: 0 0 4px rgba(0, 0, 0, 0.25); } + .has-options #tsd-filter .tsd-filter-group { visibility: visible; } + .to-has-options #tsd-filter .tsd-filter-group { -webkit-animation: fade-in 0.2s; animation: fade-in 0.2s; } + .from-has-options #tsd-filter .tsd-filter-group { -webkit-animation: fade-out 0.2s; animation: fade-out 0.2s; } + #tsd-filter label, #tsd-filter .tsd-select { display: block; padding-right: 20px; } } + +footer { border-top: 1px solid #eee; background-color: #fff; } +footer.with-border-bottom { border-bottom: 1px solid #eee; } +footer .tsd-legend-group { font-size: 0; } +footer .tsd-legend { display: inline-block; width: 25%; padding: 0; font-size: 16px; list-style: none; line-height: 1.333em; vertical-align: top; } +@media (max-width: 900px) { footer .tsd-legend { width: 50%; } } + +.tsd-hierarchy { list-style: square; padding: 0 0 0 20px; margin: 0; } +.tsd-hierarchy .target { font-weight: bold; } + +.tsd-index-panel .tsd-index-content { margin-bottom: -30px !important; } +.tsd-index-panel .tsd-index-section { margin-bottom: 30px !important; } +.tsd-index-panel h3 { margin: 0 -20px 10px -20px; padding: 0 20px 10px 20px; border-bottom: 1px solid #eee; } +.tsd-index-panel ul.tsd-index-list { -webkit-column-count: 3; -moz-column-count: 3; -ms-column-count: 3; -o-column-count: 3; column-count: 3; -webkit-column-gap: 20px; -moz-column-gap: 20px; -ms-column-gap: 20px; -o-column-gap: 20px; column-gap: 20px; padding: 0; list-style: none; line-height: 1.333em; } +@media (max-width: 900px) { .tsd-index-panel ul.tsd-index-list { -webkit-column-count: 1; -moz-column-count: 1; -ms-column-count: 1; -o-column-count: 1; column-count: 1; } } +@media (min-width: 901px) and (max-width: 1024px) { .tsd-index-panel ul.tsd-index-list { -webkit-column-count: 2; -moz-column-count: 2; -ms-column-count: 2; -o-column-count: 2; column-count: 2; } } +.tsd-index-panel ul.tsd-index-list li { -webkit-column-break-inside: avoid; -moz-column-break-inside: avoid; -ms-column-break-inside: avoid; -o-column-break-inside: avoid; column-break-inside: avoid; -webkit-page-break-inside: avoid; -moz-page-break-inside: avoid; -ms-page-break-inside: avoid; -o-page-break-inside: avoid; page-break-inside: avoid; } + +.tsd-flag { display: inline-block; padding: 1px 5px; border-radius: 4px; color: #fff; background-color: #808080; text-indent: 0; font-size: 14px; font-weight: normal; line-height: 1.5em; } + +.tsd-anchor { position: absolute; top: -100px; } + +.tsd-member { position: relative; } +.tsd-member .tsd-anchor + h3 { margin-top: 0; margin-bottom: 0; border-bottom: none; } + +.tsd-navigation { padding: 0 0 0 40px; } +.tsd-navigation a { display: block; padding-top: 2px; padding-bottom: 2px; border-left: 2px solid transparent; color: #222; text-decoration: none; transition: border-left-color 0.1s; } +.tsd-navigation a:hover { text-decoration: underline; } +.tsd-navigation ul { margin: 0; padding: 0; list-style: none; } +.tsd-navigation li { padding: 0; } + +.tsd-navigation.primary { padding-bottom: 40px; } +.tsd-navigation.primary a { display: block; padding-top: 6px; padding-bottom: 6px; } +.tsd-navigation.primary ul li a { padding-left: 5px; } +.tsd-navigation.primary ul li li a { padding-left: 25px; } +.tsd-navigation.primary ul li li li a { padding-left: 45px; } +.tsd-navigation.primary ul li li li li a { padding-left: 65px; } +.tsd-navigation.primary ul li li li li li a { padding-left: 85px; } +.tsd-navigation.primary ul li li li li li li a { padding-left: 105px; } +.tsd-navigation.primary > ul { border-bottom: 1px solid #eee; } +.tsd-navigation.primary li { border-top: 1px solid #eee; } +.tsd-navigation.primary li.current > a { font-weight: bold; } +.tsd-navigation.primary li.label span { display: block; padding: 20px 0 6px 5px; color: #808080; } +.tsd-navigation.primary li.globals + li > span, .tsd-navigation.primary li.globals + li > a { padding-top: 20px; } + +.tsd-navigation.secondary ul { transition: opacity 0.2s; } +.tsd-navigation.secondary ul li a { padding-left: 25px; } +.tsd-navigation.secondary ul li li a { padding-left: 45px; } +.tsd-navigation.secondary ul li li li a { padding-left: 65px; } +.tsd-navigation.secondary ul li li li li a { padding-left: 85px; } +.tsd-navigation.secondary ul li li li li li a { padding-left: 105px; } +.tsd-navigation.secondary ul li li li li li li a { padding-left: 125px; } +.tsd-navigation.secondary ul.current a { border-left-color: #eee; } +.tsd-navigation.secondary li.focus > a, .tsd-navigation.secondary ul.current li.focus > a { border-left-color: #000; } +.tsd-navigation.secondary li.current { margin-top: 20px; margin-bottom: 20px; border-left-color: #eee; } +.tsd-navigation.secondary li.current > a { font-weight: bold; } + +@media (min-width: 901px) { .menu-sticky-wrap { position: static; } + .no-csspositionsticky .menu-sticky-wrap.sticky { position: fixed; } + .no-csspositionsticky .menu-sticky-wrap.sticky-current { position: fixed; } + .no-csspositionsticky .menu-sticky-wrap.sticky-current ul.before-current, .no-csspositionsticky .menu-sticky-wrap.sticky-current ul.after-current { opacity: 0; } + .no-csspositionsticky .menu-sticky-wrap.sticky-bottom { position: absolute; top: auto !important; left: auto !important; bottom: 0; right: 0; } + .csspositionsticky .menu-sticky-wrap.sticky { position: -webkit-sticky; position: sticky; } + .csspositionsticky .menu-sticky-wrap.sticky-current { position: -webkit-sticky; position: sticky; } } + +.tsd-panel { margin: 20px 0; padding: 20px; background-color: #fff; } +.tsd-panel:empty { display: none; } +.tsd-panel > h1, .tsd-panel > h2, .tsd-panel > h3 { margin: 1.5em -20px 10px -20px; padding: 0 20px 10px 20px; border-bottom: 1px solid #ebebeb; } +.tsd-panel > h1.tsd-before-signature, .tsd-panel > h2.tsd-before-signature, .tsd-panel > h3.tsd-before-signature { margin-bottom: 0; border-bottom: 0; } +.tsd-panel table { display: block; width: 100%; overflow: auto; margin-top: 10px; word-break: normal; word-break: keep-all; } +.tsd-panel table th { font-weight: bold; } +.tsd-panel table th, .tsd-panel table td { padding: 6px 13px; border: 1px solid #ddd; } +.tsd-panel table tr { background-color: #fff; border-top: 1px solid #ccc; } +.tsd-panel table tr:nth-child(2n) { background-color: #f8f8f8; } + +.tsd-panel-group { margin: 60px 0; } +.tsd-panel-group > h1, .tsd-panel-group > h2, .tsd-panel-group > h3 { padding-left: 20px; padding-right: 20px; } + +#tsd-search { transition: background-color 0.2s; } +#tsd-search .title { position: relative; z-index: 2; } +#tsd-search .field { position: absolute; left: 0; top: 0; right: 40px; height: 40px; } +#tsd-search .field input { box-sizing: border-box; position: relative; top: -50px; z-index: 1; width: 100%; padding: 0 10px; opacity: 0; outline: 0; border: 0; background: transparent; color: #222; } +#tsd-search .field label { position: absolute; overflow: hidden; right: -40px; } +#tsd-search .field input, #tsd-search .title { transition: opacity 0.2s; } +#tsd-search .results { position: absolute; visibility: hidden; top: 40px; width: 100%; margin: 0; padding: 0; list-style: none; box-shadow: 0 0 4px rgba(0, 0, 0, 0.25); } +#tsd-search .results li { padding: 0 10px; background-color: #fdfdfd; } +#tsd-search .results li:nth-child(even) { background-color: #fff; } +#tsd-search .results li.state { display: none; } +#tsd-search .results li.current, #tsd-search .results li:hover { background-color: #eee; } +#tsd-search .results a { display: block; } +#tsd-search .results a:before { top: 10px; } +#tsd-search .results span.parent { color: #808080; font-weight: normal; } +#tsd-search.has-focus { background-color: #eee; } +#tsd-search.has-focus .field input { top: 0; opacity: 1; } +#tsd-search.has-focus .title { z-index: 0; opacity: 0; } +#tsd-search.has-focus .results { visibility: visible; } +#tsd-search.loading .results li.state.loading { display: block; } +#tsd-search.failure .results li.state.failure { display: block; } + +.tsd-signature { margin: 0 0 1em 0; padding: 10px; border: 1px solid #eee; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; } +.tsd-signature.tsd-kind-icon { padding-left: 30px; } +.tsd-panel > .tsd-signature { margin-left: -20px; margin-right: -20px; border-width: 1px 0; } +.tsd-panel > .tsd-signature.tsd-kind-icon { padding-left: 40px; } + +.tsd-signature-symbol { color: #808080; font-weight: normal; } + +.tsd-signature-type { font-style: italic; font-weight: normal; } + +.tsd-signatures { padding: 0; margin: 0 0 1em 0; border: 1px solid #eee; } +.tsd-signatures .tsd-signature { margin: 0; border-width: 1px 0 0 0; transition: background-color 0.1s; } +.tsd-signatures .tsd-signature:first-child { border-top-width: 0; } +.tsd-signatures .tsd-signature.current { background-color: #eee; } +.tsd-signatures.active > .tsd-signature { cursor: pointer; } +.tsd-panel > .tsd-signatures { margin-left: -20px; margin-right: -20px; border-width: 1px 0; } +.tsd-panel > .tsd-signatures .tsd-signature.tsd-kind-icon { padding-left: 40px; } +.tsd-panel > a.anchor + .tsd-signatures { border-top-width: 0; margin-top: -20px; } + +ul.tsd-descriptions { position: relative; overflow: hidden; transition: height 0.3s; padding: 0; list-style: none; } +ul.tsd-descriptions.active > .tsd-description { display: none; } +ul.tsd-descriptions.active > .tsd-description.current { display: block; } +ul.tsd-descriptions.active > .tsd-description.fade-in { -webkit-animation: fade-in-delayed 0.3s; animation: fade-in-delayed 0.3s; } +ul.tsd-descriptions.active > .tsd-description.fade-out { -webkit-animation: fade-out-delayed 0.3s; animation: fade-out-delayed 0.3s; position: absolute; display: block; top: 0; left: 0; right: 0; opacity: 0; visibility: hidden; } +ul.tsd-descriptions h4, ul.tsd-descriptions .tsd-index-panel h3, .tsd-index-panel ul.tsd-descriptions h3 { font-size: 16px; margin: 1em 0 0.5em 0; } + +ul.tsd-parameters, ul.tsd-type-parameters { list-style: square; margin: 0; padding-left: 20px; } +ul.tsd-parameters > li.tsd-parameter-siganture, ul.tsd-type-parameters > li.tsd-parameter-siganture { list-style: none; margin-left: -20px; } +ul.tsd-parameters h5, ul.tsd-type-parameters h5 { font-size: 16px; margin: 1em 0 0.5em 0; } +ul.tsd-parameters .tsd-comment, ul.tsd-type-parameters .tsd-comment { margin-top: -0.5em; } + +.tsd-sources { font-size: 14px; color: #808080; } +.tsd-sources a { color: #808080; text-decoration: underline; } +.tsd-sources ul, .tsd-sources p { margin: 0 !important; } +.tsd-sources ul { list-style: none; padding: 0; } + +.tsd-page-toolbar { position: absolute; z-index: 1; top: 0; left: 0; width: 100%; height: 40px; color: #333; background: #fff; border-bottom: 1px solid #eee; } +.tsd-page-toolbar a { color: #333; text-decoration: none; } +.tsd-page-toolbar a.title { font-weight: bold; } +.tsd-page-toolbar a.title:hover { text-decoration: underline; } +.tsd-page-toolbar .table-wrap { display: table; width: 100%; height: 40px; } +.tsd-page-toolbar .table-cell { display: table-cell; position: relative; white-space: nowrap; line-height: 40px; } +.tsd-page-toolbar .table-cell:first-child { width: 100%; } + +.tsd-widget:before, .tsd-select .tsd-select-label:before, .tsd-select .tsd-select-list li:before { content: ""; display: inline-block; width: 40px; height: 40px; margin: 0 -8px 0 0; background-image: url(../images/widgets.png); background-repeat: no-repeat; text-indent: -1024px; vertical-align: bottom; } +@media (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { .tsd-widget:before, .tsd-select .tsd-select-label:before, .tsd-select .tsd-select-list li:before { background-image: url(../images/widgets@2x.png); background-size: 320px 40px; } } + +.tsd-widget { display: inline-block; overflow: hidden; opacity: 0.6; height: 40px; transition: opacity 0.1s, background-color 0.2s; vertical-align: bottom; cursor: pointer; } +.tsd-widget:hover { opacity: 0.8; } +.tsd-widget.active { opacity: 1; background-color: #eee; } +.tsd-widget.no-caption { width: 40px; } +.tsd-widget.no-caption:before { margin: 0; } +.tsd-widget.search:before { background-position: 0 0; } +.tsd-widget.menu:before { background-position: -40px 0; } +.tsd-widget.options:before { background-position: -80px 0; } +.tsd-widget.options, .tsd-widget.menu { display: none; } +@media (max-width: 900px) { .tsd-widget.options, .tsd-widget.menu { display: inline-block; } } +input[type=checkbox] + .tsd-widget:before { background-position: -120px 0; } +input[type=checkbox]:checked + .tsd-widget:before { background-position: -160px 0; } + +.tsd-select { position: relative; display: inline-block; height: 40px; transition: opacity 0.1s, background-color 0.2s; vertical-align: bottom; cursor: pointer; } +.tsd-select .tsd-select-label { opacity: 0.6; transition: opacity 0.2s; } +.tsd-select .tsd-select-label:before { background-position: -240px 0; } +.tsd-select.active .tsd-select-label { opacity: 0.8; } +.tsd-select.active .tsd-select-list { visibility: visible; opacity: 1; transition-delay: 0s; } +.tsd-select .tsd-select-list { position: absolute; visibility: hidden; top: 40px; left: 0; margin: 0; padding: 0; opacity: 0; list-style: none; box-shadow: 0 0 4px rgba(0, 0, 0, 0.25); transition: visibility 0s 0.2s, opacity 0.2s; } +.tsd-select .tsd-select-list li { padding: 0 20px 0 0; background-color: #fdfdfd; } +.tsd-select .tsd-select-list li:before { background-position: 40px 0; } +.tsd-select .tsd-select-list li:nth-child(even) { background-color: #fff; } +.tsd-select .tsd-select-list li:hover { background-color: #eee; } +.tsd-select .tsd-select-list li.selected:before { background-position: -200px 0; } +@media (max-width: 900px) { .tsd-select .tsd-select-list { top: 0; left: auto; right: 100%; margin-right: -5px; } + .tsd-select .tsd-select-label:before { background-position: -280px 0; } } + +img { max-width: 100%; } diff --git a/docgen/theme/assets/images/lockup.png b/docgen/theme/assets/images/lockup.png new file mode 100644 index 0000000000000000000000000000000000000000..f4cdcf24a42787815f45a0fbd6b2211b69cf87a0 GIT binary patch literal 2646 zcmV-c3aRypP)qsBRaHO8(yazJJDcK~r7o->-O8-CmCY zr#`z4j)yXEeD5C+QGXbQp&O3{6EN^efRRlACm;I?A{d6LFLdL<9qEFg1D^mmd|wt3 z48znHx^b-gd_m5Ej{^+djaf9@j|hfg>IdC8+I~|`$@3orIJi9vC-!?0!7xmHsN8V! zv28Hov*eTv-U-;2So2OZ3=0|#S#nA~dXus49GuwaMTGk>3{$z`=tGHBaz6JF{69*I z)m=oa;&>=lL@*3f8!9&(+L0=gv&e@5(p@9==0-nJs{ngs~{)x zp#rjiWM$D%LcX>j=QGVWUw`b;1R|7N`%VaHLxhP)foe!;#45B0#QKRaeSRFSMqw#s z_*1l;&$dcr7ER}m?)K(!%3GAvBHfXLW4pYFAi4U@6rA4$aQRDFM3{(Mf)edf7Sv9# zpdncdqUDr$AwRqk7RG|5btEGoq;p#flcV-Ai!(uUA- zzV&HY!Zg%^);U;E4oG)otI3(i%sBV^f}BN~VDfkPXa8x&ENaOqkr{OE>chA}1mC5O%rG5Hw&F!B+JzqA`xGNCb%!$EN$Q4uA33 z(XwMkkzV8ugbeq`90Lw)O;B>?pTZ3J>xyzB4Fx8CiK70k$%&j6*CPFhFbOR|^)rx< zc#V&^K&j;#57H~!91unBaM1rGBI6Du=HN401reI(5O?si3RvT*q>t*eyJKz%nyw_L zWZ_@c<(x`xfQcVA!0d@foXUyx09@RYK!iz{CMfY|<)V1XE)-fA^|9`-+5adKsPSj$ zpMyFxMO^5!OJj}!!)=*zIj!uekn;x(Fn{RbTavRVXodw<3aa{>K7v?LoMvi}L|Se1 zKaM0_xhVC|!A~5w*M)I$am+DbWaDZ%pDtuiLQbTZIkn`JTzE8#2$L{LP(s#T#E%4! zNZExRq^4;Vgt(*11sf&%Pm?Sj&sRbKiPGm{WqzCI;4eFV7)jbZc59V>1j>#ZM3U-p zae2()c&H64xR#tnmYs7u0NE@2~W%HNyu5NX>BV>XJDvF6>Ps!W0Z$W>G}|`LzoKHKvGmvqrMY z^fGL7y)sT@qgEp0QST30!W%H=FtRCEdOs&-Pq#8B&G|>pBf=C66!Z?e$993Ry8o_> z164$EiqGM3%Xbq6k=8XEa~S;OikwT2qnJM>mQvi3)4)oufr5&4FR1z)J^FI01*LaB zDGAqo%;DIskh}*}$|-LdoBNYXODWZOv-{?r+^gT%h6n?=odgZn0AF1MwZcPAL#>@l zzA^$xgcOvHfJ0GZbscjQv|q|8SxU+5Ni3zfDQ6KB<0~v^%?0%!`cdC0Zotv@J@rNe zpUw9LkX{?Y_SS98VRUoC%ARCF$bC5_mp-3BgaNEqL4BG_2z0n#B#JAZ+Z1%Lxn942 z>g?KDmobOYjVt!IC`W|`CC-3Ky=FaZ+<)wr1MaG2TRNRXJSxwKKin!aj0mX!ML>Z6x! zP%w4)6n%=hHs&yJ2Q2-su9=gd3qSWEi7k(u7e9;m}+`GAdCKv3g8 zOdlb?-5U_1Hm3FQnvXdg35FK_)3ElL(?SXwVnH~LV?Ou4&Xf_E(?YM3%T-)@3Z*Zn>X9eU8T|*y%r$VZYzD1yw$T zjd*IJ$Bi+sc-;4fd%QQ&J*nB#TOj}D+R2%Jy$fbecEI(4O)12Sh}yywFPb0{EfXn* z^wAr_)j>SYBU+M4;>4zNonu;$#nkV&zsm6=8XFJDF?TW^D5}3Lm-c7oGF$2{=j`bY z$PI7K;6>ENA~B4`>OUOn4&4~@XBS`Uab3>&bDeNwwEg_`fz2UAFbwlS=*FS0{)xlg zx#ib-YA)x}%bhTBusw^P)35F%!?2)~q~7a8or%e#-IMt@^yOTBwF{<>cI5Eb3B;@J zAj7brN>I|a+-PTN=2Vw+IjsVa{GOR&F&RBrP@2IG{C?Vrg`{rVa?YLYEEa$^xAB0x z3B!U~qJCxKP$w3W2r-ex7r6lBIt&Y{5H&G*q$9WdswL*q%UxUmVvK+Vl?=9fk;KHo zj*Ns0K<>k^pbW#XpbW#XpbW!;G7Q6lG7JmKFpLSj52E7_O`Jf{)c^nh07*qoM6N<$ Eg8U-`K>z>% literal 0 HcmV?d00001 diff --git a/docgen/theme/layouts/default.hbs b/docgen/theme/layouts/default.hbs new file mode 100644 index 000000000..72111fb4e --- /dev/null +++ b/docgen/theme/layouts/default.hbs @@ -0,0 +1,33 @@ + + + + + + + + + + {{#ifCond model.name '==' project.name}}{{project.name}}{{else}}{{model.name}} | {{project.name}}{{/ifCond}} + + + + + + + +{{> header}} + +
+
+
+ {{{contents}}} +
+
+
+ +
+ +{{> analytics}} + + + diff --git a/docgen/theme/partials/breadcrumb.hbs b/docgen/theme/partials/breadcrumb.hbs new file mode 100644 index 000000000..db115163f --- /dev/null +++ b/docgen/theme/partials/breadcrumb.hbs @@ -0,0 +1,11 @@ + +{{#if parent}} + {{#with parent}}{{> breadcrumb}}{{/with}} +
  • + {{#if url}} + {{name}}. + {{else}} + {{name}} + {{/if}} +
    • +{{/if}} \ No newline at end of file diff --git a/docgen/theme/partials/comment.hbs b/docgen/theme/partials/comment.hbs new file mode 100644 index 000000000..f92e54301 --- /dev/null +++ b/docgen/theme/partials/comment.hbs @@ -0,0 +1,22 @@ +{{#with comment}} + {{#if hasVisibleComponent}} +
    + {{#if shortText}} +
    + {{#markdown}}{{{shortText}}}{{/markdown}} +
    + {{/if}} + {{#if text}} + {{#markdown}}{{{text}}}{{/markdown}} + {{/if}} + {{#if tags}} +
    + {{#each tags}} +
    {{tagName}}
    +
    {{#markdown}}{{{text}}}{{/markdown}}
    + {{/each}} +
    + {{/if}} +
    + {{/if}} +{{/with}} \ No newline at end of file diff --git a/docgen/theme/partials/header.hbs b/docgen/theme/partials/header.hbs new file mode 100644 index 000000000..4aee65a6b --- /dev/null +++ b/docgen/theme/partials/header.hbs @@ -0,0 +1,23 @@ +
    +
    +
    +

    + {{#ifCond model.name '==' project.name}} + {{else}} +
      + {{#with model.parent}}{{> breadcrumb}}{{/with}} +
    • {{model.name}}
      • + {{#if model.typeParameters}} + < + {{#each model.typeParameters}} + {{#if @index}}, {{/if}} + {{name}} + {{/each}} + > + {{/if}} +
    + {{/ifCond}} +

    +
    +
    +
    \ No newline at end of file diff --git a/docgen/theme/partials/member.sources.hbs b/docgen/theme/partials/member.sources.hbs new file mode 100644 index 000000000..5a0e186f0 --- /dev/null +++ b/docgen/theme/partials/member.sources.hbs @@ -0,0 +1,15 @@ +{{#if implementationOf}} + +{{/if}} +{{#if inheritedFrom}} + +{{/if}} +{{#if overwrites}} + +{{/if}} \ No newline at end of file diff --git a/docgen/theme/partials/navigation.hbs b/docgen/theme/partials/navigation.hbs new file mode 100644 index 000000000..54704739a --- /dev/null +++ b/docgen/theme/partials/navigation.hbs @@ -0,0 +1,22 @@ +{{#if isVisible}} + {{#if isLabel}} +
  • + {{{wbr title}}} +
    • + {{else}} + {{#unless isGlobals}} +
  • + {{{wbr title}}} + {{#if isInPath}} + {{#if children}} +
      + {{#each children}} + {{> navigation}} + {{/each}} +
    + {{/if}} + {{/if}} +
    • + {{/unless}} + {{/if}} +{{/if}} diff --git a/docgen/theme/templates/reflection.hbs b/docgen/theme/templates/reflection.hbs new file mode 100644 index 000000000..53cd2879a --- /dev/null +++ b/docgen/theme/templates/reflection.hbs @@ -0,0 +1,72 @@ +{{#with model}} + {{#if hasComment}} +
    + {{> comment}} +
    + {{/if}} +{{/with}} + +{{#if model.typeParameters}} +
    +

    Type parameters

    + {{#with model}}{{> typeParameters}}{{/with}} +
    +{{/if}} + +{{#if model.implementedTypes}} +
    +

    Implements

    +
      + {{#each model.implementedTypes}} +
    • {{> type}}
      • + {{/each}} +
    +
    +{{/if}} + +{{#if model.implementedBy}} +
    +

    Implemented by

    +
      + {{#each model.implementedBy}} +
    • {{> type}}
      • + {{/each}} +
    +
    +{{/if}} + +{{#if model.signatures}} +
    +

    Callable

    + {{#with model}}{{> member.signatures}}{{/with}} +
    +{{/if}} + +{{#if model.indexSignature}} +
    +

    Indexable

    +
    {{#compact}} + [ + {{#each model.indexSignature.parameters}} + {{name}}: {{#with type}}{{>type}}{{/with}} + {{/each}} + ]:  + {{#with model.indexSignature.type}}{{>type}}{{/with}} + {{/compact}}
    + + {{#with model.indexSignature}} + {{> comment}} + {{/with}} + + {{#if model.indexSignature.type.declaration}} + {{#with model.indexSignature.type.declaration}} + {{> parameter}} + {{/with}} + {{/if}} +
    +{{/if}} + +{{#with model}} + {{> index}} + {{> members}} +{{/with}} \ No newline at end of file diff --git a/docgen/tsconfig.json b/docgen/tsconfig.json new file mode 100644 index 000000000..3c43903cf --- /dev/null +++ b/docgen/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../tsconfig.json" +} diff --git a/docgen/typedoc.js b/docgen/typedoc.js new file mode 100644 index 000000000..58156ff59 --- /dev/null +++ b/docgen/typedoc.js @@ -0,0 +1,27 @@ +/** + * @license + * Copyright 2019 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const options = { + // includeDeclarations: true, + excludeExternals: true, + ignoreCompilerErrors: true, + name: 'Firebase Functions SDK', + mode: 'modules', + hideGenerator: true +}; + +module.exports = options; diff --git a/package.json b/package.json index 916c4159f..10f0c33d1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", - "test": "mocha -r ts-node/register ./spec/index.spec.ts" + "test": "mocha -r ts-node/register ./spec/index.spec.ts", + "apidocs": "node docgen/generate-docs.js" }, "dependencies": { "@types/express": "^4.17.0", @@ -51,10 +52,13 @@ "@types/sinon": "^7.0.13", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", + "child-process-promise": "^2.2.1", "firebase-admin": "^8.2.0", "istanbul": "^0.4.5", + "js-yaml": "^3.13.1", "mocha": "^6.1.4", "mock-require": "^3.0.3", + "mz": "^2.7.0", "nock": "^10.0.6", "prettier": "^1.18.2", "sinon": "^7.3.2", @@ -63,7 +67,9 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typescript": "^3.5.2" + "typedoc": "^0.14.2", + "typescript": "^3.5.2", + "yargs": "^13.2.4" }, "peerDependencies": { "firebase-admin": "^8.0.0" diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 722410340..7274399b2 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -116,6 +116,11 @@ export class UserBuilder { */ export type UserRecord = firebase.auth.UserRecord; +/** + * UserInfo that is part of the UserRecord + */ +export type UserInfo = firebase.auth.UserInfo; + export function userRecordConstructor( wireData: Object ): firebase.auth.UserRecord { From 273c5ff776450742c4a794f0227456cbd7c64cee Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Thu, 11 Jul 2019 18:24:44 -0700 Subject: [PATCH 171/705] Add code comments for storage events (#517) * Add code comments for storage events * Fix some comment formatting issues --- src/providers/storage.ts | 179 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 169 insertions(+), 10 deletions(-) diff --git a/src/providers/storage.ts b/src/providers/storage.ts index 93d6b0ed0..3ba98ea72 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -34,17 +34,22 @@ export const provider = 'google.storage'; export const service = 'storage.googleapis.com'; /** - * The optional bucket function allows you to choose which buckets' events to handle. - * This step can be bypassed by calling object() directly, which will use the default - * Cloud Storage for Firebase bucket. - * @param bucket Name of the Google Cloud Storage bucket to listen to. + * Registers a Cloud Function scoped to a specific storage bucket. + * + * @param bucket Name of the bucket to which this Cloud Function is + * scoped. + * + * @return Storage bucket builder interface. */ export function bucket(bucket?: string) { return _bucketWithOptions({}, bucket); } /** - * Handle events related to Cloud Storage objects. + * Registers a Cloud Function scoped to the default storage bucket for the + * project. + * + * @return Storage object builder interface. */ export function object() { return _objectWithOptions({}); @@ -76,6 +81,11 @@ export function _objectWithOptions(options: DeploymentOptions): ObjectBuilder { return _bucketWithOptions(options).object(); } +/** + * The Google Cloud Storage bucket builder interface. + * + * Access via [`functions.storage.bucket()`](functions.storage#.bucket). + */ export class BucketBuilder { /** @hidden */ constructor( @@ -83,12 +93,22 @@ export class BucketBuilder { private options: DeploymentOptions ) {} - /** Handle events for objects in this bucket. */ + /** + * Event handler which fires every time a Google Cloud Storage change occurs. + * + * @return Storage object builder interface scoped to the specified storage + * bucket. + */ object() { return new ObjectBuilder(this.triggerResource, this.options); } } +/** + * The Google Cloud Storage object builder interface. + * + * Access via [`functions.storage.object()`](functions.storage#.object). + */ export class ObjectBuilder { /** @hidden */ constructor( @@ -104,7 +124,17 @@ export class ObjectBuilder { ); } - /** Respond to archiving of an object, this is only for buckets that enabled object versioning. */ + /** + * Event handler sent only when a bucket has enabled object versioning. + * This event indicates that the live version of an object has become an + * archived version, either because it was archived or because it was + * overwritten by the upload of an object of the same name. + * + * @param handler Event handler which is run every time a Google Cloud Storage + * archival occurs. + * + * @return A Cloud Function which you can export and deploy. + */ onArchive( handler: ( object: ObjectMetadata, @@ -114,7 +144,20 @@ export class ObjectBuilder { return this.onOperation(handler, 'object.archive'); } - /** Respond to the deletion of an object (not to archiving, if object versioning is enabled). */ + /** + * Event handler which fires every time a Google Cloud Storage deletion occurs. + * + * Sent when an object has been permanently deleted. This includes objects + * that are overwritten or are deleted as part of the bucket's lifecycle + * configuration. For buckets with object versioning enabled, this is not + * sent when an object is archived, even if archival occurs + * via the `storage.objects.delete` method. + * + * @param handler Event handler which is run every time a Google Cloud Storage + * deletion occurs. + * + * @return A Cloud Function which you can export and deploy. + */ onDelete( handler: ( object: ObjectMetadata, @@ -124,7 +167,19 @@ export class ObjectBuilder { return this.onOperation(handler, 'object.delete'); } - /** Respond to the successful creation of an object. */ + /** + * Event handler which fires every time a Google Cloud Storage object + * creation occurs. + * + * Sent when a new object (or a new generation of an existing object) + * is successfully created in the bucket. This includes copying or rewriting + * an existing object. A failed upload does not trigger this event. + * + * @param handler Event handler which is run every time a Google Cloud Storage + * object creation occurs. + * + * @return A Cloud Function which you can export and deploy. + */ onFinalize( handler: ( object: ObjectMetadata, @@ -134,7 +189,15 @@ export class ObjectBuilder { return this.onOperation(handler, 'object.finalize'); } - /** Respond to metadata updates of existing objects. */ + /** + * Event handler which fires every time the metadata of an existing object + * changes. + * + * @param handler Event handler which is run every time a Google Cloud Storage + * metadata update occurs. + * + * @return A Cloud Function which you can export and deploy. + */ onMetadataUpdate( handler: ( object: ObjectMetadata, @@ -144,6 +207,7 @@ export class ObjectBuilder { return this.onOperation(handler, 'object.metadataUpdate'); } + /** @hidden */ private onOperation( handler: ( object: ObjectMetadata, @@ -162,30 +226,101 @@ export class ObjectBuilder { } } +/** Interface representing a Google Google Cloud Storage object metadata object. */ export interface ObjectMetadata { + /** The kind of the object, which is always `storage#object`. */ kind: string; + + /** + * The ID of the object, including the bucket name, object name, and + * generation number. + */ id: string; + + /** Storage bucket that contains the object. */ bucket: string; + + /** Storage class of the object. */ storageClass: string; + + /** + * The value of the `Content-Length` header, used to determine the length of + * the object data in bytes. + */ size: string; + + /** The creation time of the object in RFC 3339 format. */ timeCreated: string; + + /** + * The modification time of the object metadata in RFC 3339 format. + */ updated: string; + + /** Link to access the object, assuming you have sufficient permissions. */ selfLink?: string; + + /**The object's name. */ name?: string; + + /** + * Generation version number that changes each time the object is + * overwritten. + */ generation?: string; + + /** The object's content type, also known as the MIME type. */ contentType?: string; + + /** + * Meta-generation version number that changes each time the object's metadata + * is updated. + */ metageneration?: string; + + /** + * The deletion time of the object in RFC 3339 format. Returned + * only if this version of the object has been deleted. + */ timeDeleted?: string; + timeStorageClassUpdated?: string; + + /** + * MD5 hash for the object. All Google Cloud Storage objects + * have a CRC32C hash or MD5 hash. + */ md5Hash?: string; + + /** Media download link. */ mediaLink?: string; + + /** + * Content-Encoding to indicate that an object is compressed + * (for example, with gzip compression) while maintaining its Content-Type. + */ contentEncoding?: string; + + /** + * The value of the `Content-Disposition` header, used to specify presentation + * information about the data being transmitted. + */ contentDisposition?: string; + + /** ISO 639-1 language code of the content. */ contentLanguage?: string; + + /** + * The value of the `Cache-Control` header, used to determine whether Internet + * caches are allowed to cache public data for an object. + */ cacheControl?: string; + + /** User-provided metadata. */ metadata?: { [key: string]: string; }; + acl?: [ { kind?: string; @@ -206,13 +341,37 @@ export interface ObjectMetadata { etag?: string; } ]; + owner?: { entity?: string; entityId?: string; }; + + /** + * The object's CRC32C hash. All Google Cloud Storage objects + * have a CRC32C hash or MD5 hash. + */ crc32c?: string; + + /** + * Specifies the number of originally uploaded objects from which + * a composite object was created. + */ componentCount?: string; + etag?: string; + + /** + * Customer-supplied encryption key. + * + * This object contains the following properties: + * * `encryptionAlgorithm` (`string|undefined`): The encryption algorithm that + * was used. Always contains the value `AES256`. + * * `keySha256` (`string|undefined`): An RFC 4648 base64-encoded string of the + * SHA256 hash of your encryption key. You can use this SHA256 hash to + * uniquely identify the AES-256 encryption key required to decrypt the + * object, which you must store securely. + */ customerEncryption?: { encryptionAlgorithm?: string; keySha256?: string; From 1f6499c87a596393dd721fa36a1397cfac81e454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Fri, 12 Jul 2019 18:36:10 +0200 Subject: [PATCH 172/705] Introduce Mocha configuration file (#515) * Introduce mocha configuration file * Reformat * Remove an empty file --- .mocharc.yaml | 10 ++++++++++ mocha/setup.ts | 7 +++++++ package.json | 8 +++++--- spec/index.spec.ts | 47 ---------------------------------------------- 4 files changed, 22 insertions(+), 50 deletions(-) create mode 100644 .mocharc.yaml create mode 100644 mocha/setup.ts delete mode 100644 spec/index.spec.ts diff --git a/.mocharc.yaml b/.mocharc.yaml new file mode 100644 index 000000000..932144124 --- /dev/null +++ b/.mocharc.yaml @@ -0,0 +1,10 @@ +exit: true +extension: + - ts +file: + - mocha/setup.ts +package: ./package.json +reporter: spec +require: + - 'ts-node/register' +spec: spec/**/*.spec.ts diff --git a/mocha/setup.ts b/mocha/setup.ts new file mode 100644 index 000000000..ba4d08621 --- /dev/null +++ b/mocha/setup.ts @@ -0,0 +1,7 @@ +import * as chai from 'chai'; +import * as chaiAsPromised from 'chai-as-promised'; +import * as nock from 'nock'; + +chai.use(chaiAsPromised); + +nock.disableNetConnect(); diff --git a/package.json b/package.json index 10f0c33d1..76ea87fb5 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,13 @@ }, "license": "MIT", "author": "Firebase Team", - "files": ["lib"], + "files": [ + "lib" + ], "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { + "apidocs": "node docgen/generate-docs.js", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", @@ -29,8 +32,7 @@ "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", - "test": "mocha -r ts-node/register ./spec/index.spec.ts", - "apidocs": "node docgen/generate-docs.js" + "test": "mocha" }, "dependencies": { "@types/express": "^4.17.0", diff --git a/spec/index.spec.ts b/spec/index.spec.ts deleted file mode 100644 index 0eb95045d..000000000 --- a/spec/index.spec.ts +++ /dev/null @@ -1,47 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -import * as chai from 'chai'; -import * as chaiAsPromised from 'chai-as-promised'; -chai.use(chaiAsPromised); - -import * as nock from 'nock'; -nock.disableNetConnect(); - -import 'mocha'; - -import './apps.spec'; -import './cloud-functions.spec'; -import './config.spec'; -import './function-builder.spec'; -import './providers/analytics.spec'; -import './providers/auth.spec'; -import './providers/crashlytics.spec'; -import './providers/database.spec'; -import './providers/firestore.spec'; -import './providers/https.spec'; -import './providers/pubsub.spec'; -import './providers/remoteConfig.spec'; -import './providers/storage.spec'; -import './setup.spec'; -import './utilities/path.spec'; -import './utils.spec'; From 87e75d717d5acf32d893e867078c531542d30c69 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Fri, 12 Jul 2019 11:59:01 -0700 Subject: [PATCH 173/705] Adding comments for EventContext and main CloudFunctions methods. (#519) * Adding comments for EventContext and main CloudFunctions methods. * Fixing spacing and alignment issues found by thechenky. * Committing edits from npm run format:fix. --- src/cloud-functions.ts | 100 +++++++++++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 18 deletions(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 686e9e31e..b35ba6ee1 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -25,11 +25,13 @@ import * as _ from 'lodash'; import { DeploymentOptions, Schedule } from './function-configuration'; export { Request, Response }; +/** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); /** - * Wire format for an event. * @hidden + * + * Wire format for an event. */ export interface Event { context: { @@ -53,38 +55,89 @@ export interface Event { */ export interface EventContext { /** - * Firebase auth variable for the user whose action triggered the function. - * Field will be null for unauthenticated users, and will not exist for admin - * users. Only available for database functions. + * Authentication information for the user that triggered the function. + * This object contains `uid` and `token` properties for authenticated users. + * For more detail including token keys, see the + * [security rules reference](/docs/firestore/reference/security/#properties). + * + * This field is only populated for Realtime Database triggers and Callable + * functions. For an unauthenticated user, this field is null. For Firebase + * admin users and event types that do not provide user information, this field + * does not exist. */ auth?: { token: object; uid: string; }; + /** - * Type of authentication for the triggering action. Only available for - * database functions. + * The level of permissions for a user. Valid values are: + * + * * `ADMIN` Developer user or user authenticated via a service account. + * * `USER` Known user. + * * `UNAUTHENTICATED` Unauthenticated action + * * `null` For event types that do not provide user information (all except + * Realtime Database). */ authType?: 'ADMIN' | 'USER' | 'UNAUTHENTICATED'; + /** - * ID of the event + * The event’s unique identifier. */ eventId: string; + /** - * Type of event + * Type of event. Valid values are: + * + * * `providers/google.firebase.analytics/eventTypes/event.log` + * * `providers/firebase.auth/eventTypes/user.create` + * * `providers/firebase.auth/eventTypes/user.delete` + * * `providers/firebase.crashlytics/eventTypes/issue.new` + * * `providers/firebase.crashlytics/eventTypes/issue.regressed` + * * `providers/firebase.crashlytics/eventTypes/issue.velocityAlert` + * * `providers/google.firebase.database/eventTypes/ref.write` + * * `providers/google.firebase.database/eventTypes/ref.create` + * * `providers/google.firebase.database/eventTypes/ref.update` + * * `providers/google.firebase.database/eventTypes/ref.delete` + * * `providers/cloud.firestore/eventTypes/document.write` + * * `providers/cloud.firestore/eventTypes/document.create` + * * `providers/cloud.firestore/eventTypes/document.update` + * * `providers/cloud.firestore/eventTypes/document.delete` + * * `google.pubsub.topic.publish` + * * `google.storage.object.finalize` + * * `google.storage.object.archive` + * * `google.storage.object.delete` + * * `google.storage.object.metadataUpdate` + * * `google.firebase.remoteconfig.update` */ eventType: string; + /** - * Key-value pairs that represent the values of wildcards in a database - * reference. Cannot be accessed while inside the handler namespace. + * An object containing the values of the wildcards in the `path` parameter + * provided to the [`ref()`](functions.database#.ref) method for a Realtime + * Database trigger. Cannot be accessed while inside the handler namespace. */ params: { [option: string]: any }; + /** - * Resource that triggered the event + * The resource that emitted the event. Valid values are: + * + * * Analytics — `projects//events/` + * * Realtime Database — + `projects/_/instances//refs/` + * * Storage — + `projects/_/buckets//objects/#` + * * Authentication — `projects/` + * * Pub/Sub — `projects//topics/` + * + * Because Realtime Database instances and Cloud Storage buckets are globally + * unique and not tied to the project, their resources start with `projects/_`. + * Underscore is not a valid project name. */ resource: Resource; /** - * Timestamp for when the event ocurred (ISO 8601 string) + * Timestamp for the event as an + * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) string. */ timestamp: string; } @@ -180,6 +233,7 @@ export interface Resource { } /** + * @hidden * TriggerAnnotated is used internally by the firebase CLI to understand what * type of Cloud Function to deploy. */ @@ -208,17 +262,23 @@ export interface Runnable { } /** - * An HttpsFunction is both an object that exports its trigger definitions at - * __trigger and can be called as a function that takes an express.js Request - * and Response object. + * The Cloud Function type for HTTPS triggers. This should be exported from your + * JavaScript file to define a Cloud Function. + * + * This type is a special JavaScript function which takes Express + * [`Request`](https://expressjs.com/en/api.html#req) and + * [`Response`](https://expressjs.com/en/api.html#res) objects as its only + * arguments. */ export type HttpsFunction = TriggerAnnotated & ((req: Request, resp: Response) => void); /** - * A CloudFunction is both an object that exports its trigger definitions at - * __trigger and can be called as a function using the raw JS API for Google - * Cloud Functions. + * The Cloud Function type for all non-HTTPS triggers. This should be exported + * from your JavaScript file to define a Cloud Function. + * + * This type is a special JavaScript function which takes a templated + * `Event` object as its only argument. */ export type CloudFunction = Runnable & TriggerAnnotated & @@ -346,6 +406,7 @@ export function makeCloudFunction({ return cloudFunction; } +/** @hidden */ function _makeParams( context: EventContext, triggerResourceGetter: () => string @@ -373,6 +434,7 @@ function _makeParams( return params; } +/** @hidden */ function _makeAuth(event: Event, authType: string) { if (authType === 'UNAUTHENTICATED') { return null; @@ -383,6 +445,7 @@ function _makeAuth(event: Event, authType: string) { }; } +/** @hidden */ function _detectAuthType(event: Event) { if (_.get(event, 'context.auth.admin')) { return 'ADMIN'; @@ -393,6 +456,7 @@ function _detectAuthType(event: Event) { return 'UNAUTHENTICATED'; } +/** @hidden */ export function optionsToTrigger(options: DeploymentOptions) { const trigger: any = {}; if (options.regions) { From f7df0c7be3246094657a5ce8c907bd2eb7d49ebb Mon Sep 17 00:00:00 2001 From: egilmorez Date: Mon, 15 Jul 2019 16:02:47 -0700 Subject: [PATCH 174/705] Adding comments to try and populate information for Change and ChangeJson (#525) * Adding comments to try and populate information for Change and ChangeJson. * Remembered to run npm run format:fix! --- docgen/content-sources/toc.yaml | 2 ++ src/cloud-functions.ts | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index c2766e430..9ba761c15 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -12,6 +12,8 @@ toc: path: /docs/reference/functions/function_builder_.functionbuilder.html - title: 'Change' path: /docs/reference/functions/cloud_functions_.change.html + - title: 'ChangeJson' + path: /docs/reference/functions/cloud_functions_.changejson.html - title: 'functions.config' path: /docs/reference/functions/config_.html diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index b35ba6ee1..e8d099dca 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -143,15 +143,19 @@ export interface EventContext { } /** - * Change describes a change of state - "before" represents the state prior to - * the event, "after" represents the state after the event. + * The Functions interface for events that change state, such as + * Realtime Database or Cloud Firestore `onWrite` and `onUpdate`. + * + * For more information about the format used to construct `Change` objects, see + * [`cloud-functions.ChangeJson`](/docs/reference/functions/cloud_functions_.changejson). + * */ export class Change { constructor(public before: T, public after: T) {} } /** - * ChangeJson is the JSON format used to construct a Change object. + * `ChangeJson` is the JSON format used to construct a Change object. */ export interface ChangeJson { /** @@ -164,17 +168,20 @@ export interface ChangeJson { */ before?: any; /** - * Comma-separated string that represents names of field that changed. + * @hidden + * Comma-separated string that represents names of fields that changed. */ fieldMask?: string; } export namespace Change { + /** @hidden */ function reinterpretCast(x: any) { return x as T; } /** + * @hidden * Factory method for creating a Change from a `before` object and an `after` * object. */ @@ -183,6 +190,7 @@ export namespace Change { } /** + * @hidden * Factory method for creating a Change from a JSON and an optional customizer * function to be applied to both the `before` and the `after` fields. */ From 36916b873fc25fc94f4fc425ffceaf138d0a4b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Tue, 16 Jul 2019 01:13:11 +0200 Subject: [PATCH 175/705] Fix exhaustiveness of error code switch in http status conversion (#520) * Fix exhaustiveness of error code switch in http status conversion * Add a dot at the end of an error message * Add a newline before parameter documentation --- src/providers/https.ts | 3 ++- src/utilities/assertions.ts | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/utilities/assertions.ts diff --git a/src/providers/https.ts b/src/providers/https.ts index e6c8a63f4..3c3999123 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -27,6 +27,7 @@ import * as _ from 'lodash'; import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; +import { assertNever } from '../utilities/assertions'; export interface Request extends express.Request { rawBody: Buffer; @@ -231,7 +232,7 @@ export class HttpsError extends Error { return 500; // This should never happen as long as the type system is doing its job. default: - throw new Error('Invalid error code: ' + this.code); + assertNever(this.code); } } diff --git a/src/utilities/assertions.ts b/src/utilities/assertions.ts new file mode 100644 index 000000000..49ff5e36d --- /dev/null +++ b/src/utilities/assertions.ts @@ -0,0 +1,16 @@ +/** + * @file Provides common assertion helpers which can be used to improve + * strictness of both type checking and runtime. + */ + +/** + * Checks that the given value is of type `never` — the type that’s left after + * all other cases have been removed. + * + * @param x A value of type `never`. + */ +export function assertNever(x: never): never { + throw new Error( + `Unhandled discriminated union member: ${JSON.stringify(x)}.` + ); +} From a2e58e7d1b366a44fb3b895b6cdb5355892e1cae Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Tue, 16 Jul 2019 09:48:29 -0700 Subject: [PATCH 176/705] Adding code comments to remoteConfig.ts source (#524) * Adding code comments to remoteConfig.ts source * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Update src/providers/remoteConfig.ts Co-Authored-By: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> * Revised wording for TemplateVersion.rollBackSource * Adding only npm run format:fix, everything else is the same as my previous commit * Fixed some small typos found by Diana, 'if' and 'Config' --- src/providers/remoteConfig.ts | 48 +++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/src/providers/remoteConfig.ts b/src/providers/remoteConfig.ts index cd32e5423..f15716c17 100644 --- a/src/providers/remoteConfig.ts +++ b/src/providers/remoteConfig.ts @@ -35,9 +35,13 @@ export const provider = 'google.firebase.remoteconfig'; export const service = 'firebaseremoteconfig.googleapis.com'; /** - * Handle all updates (including rollbacks) that affect a Remote Config project. - * @param handler A function that takes the updated Remote Config template - * version metadata as an argument. + * Registers a function that triggers on Firebase Remote Config template + * update events. + * + * @param handler A function that takes the updated Remote Config + * template version metadata as an argument. + * + * @return A Cloud Function that you can export and deploy. */ export function onUpdate( handler: ( @@ -97,8 +101,8 @@ export class UpdateBuilder { } /** - * Interface representing a Remote Config template version metadata object that - * was emitted when the project was updated. + * An interface representing a Remote Config template version metadata object + * emitted when a project is updated. */ export interface TemplateVersion { /** The version number of the updated Remote Config template. */ @@ -107,27 +111,49 @@ export interface TemplateVersion { /** When the template was updated in format (ISO8601 timestamp). */ updateTime: string; - /** Metadata about the account that performed the update. */ + /** + * Metadata about the account that performed the update, of + * type [`RemoteConfigUser`](/docs/reference/remote-config/rest/v1/Version#remoteconfiguser). + */ updateUser: RemoteConfigUser; - /** A description associated with the particular Remote Config template. */ + /** A description associated with this Remote Config template version. */ description: string; - /** The origin of the caller. */ + /** + * The origin of the caller - either the Firebase console or the Remote Config + * REST API. See [`RemoteConfigUpdateOrigin`](/docs/reference/remote-config/rest/v1/Version#remoteconfigupdateorigin) + * for valid values. + */ updateOrigin: string; - /** The type of update action that was performed. */ + /** + * The type of update action that was performed, whether forced, + * incremental, or a rollback operation. See + * [`RemoteConfigUpdateType`](/docs/reference/remote-config/rest/v1/Version#remoteconfigupdatetype) + * for valid values. + */ updateType: string; /** - * The version number of the Remote Config template that was rolled back to, - * if the update was a rollback. + * The version number of the Remote Config template that this update rolled back to. + * Only applies if this update was a rollback. */ rollbackSource?: number; } +/** + * An interface representing metadata for a Remote Config account + * that performed the update. Contains the same fields as + * [`RemoteConfigUser`](/docs/reference/remote-config/rest/v1/Version#remoteconfiguser). + */ export interface RemoteConfigUser { + /** Name of the Remote Config account that performed the update. */ name?: string; + + /** Email address of the Remote Config account that performed the update. */ email: string; + + /** Image URL of the Remote Config account that performed the update. */ imageUrl?: string; } From ef4e0db481df4989c47fdcb30abac8d0b465f018 Mon Sep 17 00:00:00 2001 From: Jeroen Claassens Date: Wed, 17 Jul 2019 10:52:00 +0200 Subject: [PATCH 177/705] Resolve security vulnerability CVE-2019-10744 (#526) * Resolve security vulnerability CVE-2019-10744 Signed-off-by: Jeroen Claassens * Resolve prettier formatting * Resolve requested review by @thechenky Signed-off-by: Jeroen Claassens --- changelog.txt | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index e69de29bb..ef03d65d5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +fixed - Upgrade lodash dependency to resolve security vulnerability CVE-2019-10744 \ No newline at end of file diff --git a/package.json b/package.json index 76ea87fb5..de58f1199 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "cors": "^2.8.5", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", - "lodash": "^4.17.11" + "lodash": "^4.17.14" }, "devDependencies": { "@types/chai": "^4.1.7", From 9c4f6807a827ad3bdbe89674ce881c29f9ea7846 Mon Sep 17 00:00:00 2001 From: Michael Zoech Date: Wed, 17 Jul 2019 02:38:53 -0700 Subject: [PATCH 178/705] Test Lab Functions (#229) * Firebase Test Lab Provider * Minor code cleanups * Update event type and provider namespace to new format * Rename testlab to testLab * Add testMatrix handler function to HandlerBuilder * Resolve PR comments * Resolve PR comments * Add changelog message for new Test Lab trigger * Resolve minor pr comments * Promisify makeRequest and reuse in existing http request helpers * Fix testLab import in handler-builder.ts * Necessary fixes after merging master --- changelog.txt | 3 +- integration_test/functions/src/index.ts | 36 +-- integration_test/functions/src/test-utils.ts | 38 +++ .../functions/src/testLab-tests.ts | 26 ++ .../functions/src/testLab-utils.ts | 117 +++++++ integration_test/run_tests.sh | 4 +- spec/index.spec.ts | 1 + spec/providers/testLab.spec.ts | 255 +++++++++++++++ src/function-builder.ts | 10 + src/handler-builder.ts | 10 + src/index.ts | 2 + src/providers/testLab.ts | 297 ++++++++++++++++++ 12 files changed, 775 insertions(+), 24 deletions(-) create mode 100644 integration_test/functions/src/test-utils.ts create mode 100644 integration_test/functions/src/testLab-tests.ts create mode 100644 integration_test/functions/src/testLab-utils.ts create mode 100644 spec/providers/testLab.spec.ts create mode 100644 src/providers/testLab.ts diff --git a/changelog.txt b/changelog.txt index 1385ce18b..d05db1837 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1,2 @@ -feature - Adds region support for us-east4. \ No newline at end of file +feature - Adds support for Test Lab triggered functions with `functions.testLab`. +feature - Adds region support for us-east4. diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 967b3d376..e8fa396e9 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -14,36 +14,29 @@ export * from './firestore-tests'; export * from './https-tests'; export * from './remoteConfig-tests'; export * from './storage-tests'; +export * from './testLab-tests'; const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. +import * as utils from './test-utils'; +import * as testLab from './testLab-utils'; + import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); admin.initializeApp(); // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. function callHttpsTrigger(name: string, data: any, baseUrl) { - return new Promise((resolve, reject) => { - const request = https.request( - { - method: 'POST', - host: 'us-central1-' + firebaseConfig.projectId + '.' + baseUrl, - path: '/' + name, - headers: { - 'Content-Type': 'application/json', - }, + return utils.makeRequest( + { + method: 'POST', + host: 'us-central1-' + firebaseConfig.projectId + '.' + baseUrl, + path: '/' + name, + headers: { + 'Content-Type': 'application/json', }, - (response) => { - let body = ''; - response.on('data', (chunk) => { - body += chunk; - }); - response.on('end', () => resolve(body)); - } - ); - request.on('error', reject); - request.write(JSON.stringify({ data })); - request.end(); - }); + }, + JSON.stringify({ data }) + ); } function callScheduleTrigger(functionName: string, region: string) { @@ -149,6 +142,7 @@ export const integrationTests: any = functions .storage() .bucket() .upload('/tmp/' + testId + '.txt'), + testLab.startTestRun(firebaseConfig.projectId, testId), // Invoke the schedule for our scheduled function to fire callScheduleTrigger('schedule', 'us-central1'), ]) diff --git a/integration_test/functions/src/test-utils.ts b/integration_test/functions/src/test-utils.ts new file mode 100644 index 000000000..eda799a67 --- /dev/null +++ b/integration_test/functions/src/test-utils.ts @@ -0,0 +1,38 @@ +import * as https from 'https'; + +/** + * Makes an http request asynchronously and returns the response data. + * + * This function wraps the callback-based `http.request()` function with a + * Promise. The returned Promise will be rejected in case the request fails with an + * error, or the response code is not in the 200-299 range. + * + * @param options Request options for the request. + * @param body Optional body to send as part of the request. + * @returns Promise returning the response data as string. + */ +export function makeRequest( + options: https.RequestOptions, + body?: string +): Promise { + return new Promise((resolve, reject) => { + const request = https.request(options, (response) => { + let body = ''; + response.on('data', (chunk) => { + body += chunk; + }); + response.on('end', () => { + if (response.statusCode < 200 || response.statusCode > 299) { + reject(body); + return; + } + resolve(body); + }); + }); + if (body) { + request.write(body); + } + request.on('error', reject); + request.end(); + }); +} diff --git a/integration_test/functions/src/testLab-tests.ts b/integration_test/functions/src/testLab-tests.ts new file mode 100644 index 000000000..a6350c57d --- /dev/null +++ b/integration_test/functions/src/testLab-tests.ts @@ -0,0 +1,26 @@ +import * as functions from 'firebase-functions'; +import * as _ from 'lodash'; +import { TestSuite, expectEq } from './testing'; +import TestMatrix = functions.testLab.TestMatrix; + +export const testLabTests: any = functions + .runWith({ + timeoutSeconds: 540, + }) + .testLab.testMatrix() + .onComplete((matrix, context) => { + return new TestSuite('test matrix complete') + .it('should have eventId', (snap, context) => context.eventId) + + .it('should have timestamp', (snap, context) => context.timestamp) + + .it('should have right eventType', (_, context) => + expectEq(context.eventType, 'google.testing.testMatrix.complete') + ) + + .it("should be in state 'INVALID'", (matrix, _) => + expectEq(matrix.state, 'INVALID') + ) + + .run(_.get(matrix, 'clientInfo.details.testId'), matrix, context); + }); diff --git a/integration_test/functions/src/testLab-utils.ts b/integration_test/functions/src/testLab-utils.ts new file mode 100644 index 000000000..2f457e70d --- /dev/null +++ b/integration_test/functions/src/testLab-utils.ts @@ -0,0 +1,117 @@ +import * as http from 'http'; +import * as https from 'https'; +import * as admin from 'firebase-admin'; +import * as _ from 'lodash'; +import * as utils from './test-utils'; + +interface AndroidDevice { + androidModelId: string; + androidVersionId: string; + locale: string; + orientation: string; +} + +const TESTING_API_SERVICE_NAME = 'testing.googleapis.com'; + +/** + * Creates a new TestMatrix in Test Lab which is expected to be rejected as + * invalid. + * + * @param projectId Project for which the test run will be created + * @param testId Test id which will be encoded in client info details + */ +export async function startTestRun(projectId: string, testId: string) { + const accessToken = await admin.credential + .applicationDefault() + .getAccessToken(); + const device = await fetchDefaultDevice(accessToken); + return await createTestMatrix(accessToken, projectId, testId, device); +} + +async function fetchDefaultDevice( + accessToken: admin.GoogleOAuthAccessToken +): Promise { + const response = await utils.makeRequest( + requestOptions(accessToken, 'GET', '/v1/testEnvironmentCatalog/ANDROID') + ); + const data = JSON.parse(response); + const models = _.get(data, 'androidDeviceCatalog.models', []); + const defaultModels = models.filter( + (m) => + m.tags !== undefined && + m.tags.indexOf('default') > -1 && + m.supportedVersionIds !== undefined && + m.supportedVersionIds.length > 0 + ); + + if (defaultModels.length === 0) { + throw new Error('No default device found'); + } + + const model = defaultModels[0]; + const versions = model.supportedVersionIds; + + return { + androidModelId: model.id, + androidVersionId: versions[versions.length - 1], + locale: 'en', + orientation: 'portrait', + }; +} + +function createTestMatrix( + accessToken: admin.GoogleOAuthAccessToken, + projectId: string, + testId: string, + device: AndroidDevice +): Promise { + const options = requestOptions( + accessToken, + 'POST', + '/v1/projects/' + projectId + '/testMatrices' + ); + const body = { + projectId: projectId, + testSpecification: { + androidRoboTest: { + appApk: { + gcsPath: 'gs://path/to/non-existing-app.apk', + }, + }, + }, + environmentMatrix: { + androidDeviceList: { + androidDevices: [device], + }, + }, + resultStorage: { + googleCloudStorage: { + gcsPath: 'gs://' + admin.storage().bucket().name, + }, + }, + clientInfo: { + name: 'CloudFunctionsSDKIntegrationTest', + clientInfoDetails: { + key: 'testId', + value: testId, + }, + }, + }; + return utils.makeRequest(options, JSON.stringify(body)); +} + +function requestOptions( + accessToken: admin.GoogleOAuthAccessToken, + method: string, + path: string +): https.RequestOptions { + return { + method: method, + hostname: TESTING_API_SERVICE_NAME, + path: path, + headers: { + Authorization: 'Bearer ' + accessToken.access_token, + 'Content-Type': 'application/json', + }, + }; +} diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 911fc1dd4..d7017af52 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -60,9 +60,9 @@ function delete_all_functions { # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. if [[ "${TOKEN}" == "" ]]; then - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --force --project=$PROJECT_ID || : & + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests testLabTests --force --project=$PROJECT_ID || : & else - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests --force --project=$PROJECT_ID --token=$TOKEN || : & + firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests testLabTests --force --project=$PROJECT_ID --token=$TOKEN || : & fi wait announce "Project emptied." diff --git a/spec/index.spec.ts b/spec/index.spec.ts index 6d56878da..e438e6a97 100644 --- a/spec/index.spec.ts +++ b/spec/index.spec.ts @@ -42,6 +42,7 @@ import './providers/https.spec'; import './providers/pubsub.spec'; import './providers/remoteConfig.spec'; import './providers/storage.spec'; +import './providers/testLab.spec'; import './setup.spec'; import './testing.spec'; import './utils.spec'; diff --git a/spec/providers/testLab.spec.ts b/spec/providers/testLab.spec.ts new file mode 100644 index 000000000..bf74a6fd1 --- /dev/null +++ b/spec/providers/testLab.spec.ts @@ -0,0 +1,255 @@ +// The MIT License (MIT) +// +// Copyright (c) 2019 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. + +import { expect } from 'chai'; + +import * as testLab from '../../src/providers/testLab'; + +describe('Test Lab Functions', () => { + describe('#onComplete', () => { + describe('with process.env.GCLOUD_PROJECT set', () => { + before(() => { + process.env.GCLOUD_PROJECT = 'project1'; + }); + + after(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a TriggerDefinition with appropriate values', () => { + const func = testLab.testMatrix().onComplete(() => null); + expect(func.__trigger).to.deep.equal({ + eventTrigger: { + service: 'testing.googleapis.com', + eventType: 'google.testing.testMatrix.complete', + resource: 'projects/project1/testMatrices/{matrix}', + }, + }); + }); + + it('should parse TestMatrix in "INVALID" state', () => { + const event = { + data: { + clientInfo: { + name: 'test', + }, + invalidMatrixDetails: 'INVALID_INPUT_APK', + resultStorage: { + googleCloudStorage: { + gcsPath: 'gs://test.appspot.com', + }, + }, + state: 'INVALID', + testMatrixId: 'matrix-375mfeu9mnw8t', + timestamp: '2019-04-15T17:43:32.538Z', + }, + context: { + resource: {}, + }, + }; + const expected = { + testMatrixId: 'matrix-375mfeu9mnw8t', + state: 'INVALID', + createTime: '2019-04-15T17:43:32.538Z', + outcomeSummary: undefined, + invalidMatrixDetails: 'INVALID_INPUT_APK', + resultStorage: { + gcsPath: 'gs://test.appspot.com', + resultsUrl: undefined, + toolResultsHistoryId: undefined, + toolResultsExecutionId: undefined, + }, + clientInfo: { + name: 'test', + details: {}, + }, + }; + const func = testLab.testMatrix().onComplete((matrix) => matrix); + return expect(func(event.data, event.context)).to.eventually.deep.equal( + expected + ); + }); + + it('should parse TestMatrix in "FINISHED" state', () => { + const event = { + data: { + clientInfo: { + name: 'test', + }, + outcomeSummary: 'FAILURE', + resultStorage: { + googleCloudStorage: { + gcsPath: 'gs://test.appspot.com', + }, + toolResultsExecution: { + executionId: '6352915701487950333', + historyId: 'bh.9b6f4dac24d3049', + projectId: 'test', + }, + toolResultsHistory: { + historyId: 'bh.9b6f4dac24d3049', + projectId: 'test', + }, + resultsUrl: 'https://path/to/results', + }, + state: 'FINISHED', + testMatrixId: 'matrix-tsgjk8pnvxhya', + timestamp: '2019-04-15T18:03:11.115Z', + }, + context: { + resource: {}, + }, + }; + const expected = { + testMatrixId: 'matrix-tsgjk8pnvxhya', + state: 'FINISHED', + createTime: '2019-04-15T18:03:11.115Z', + outcomeSummary: 'FAILURE', + invalidMatrixDetails: undefined, + resultStorage: { + gcsPath: 'gs://test.appspot.com', + toolResultsHistoryId: 'bh.9b6f4dac24d3049', + toolResultsExecutionId: '6352915701487950333', + resultsUrl: 'https://path/to/results', + }, + clientInfo: { + name: 'test', + details: {}, + }, + }; + const func = testLab.testMatrix().onComplete((matrix) => matrix); + return expect(func(event.data, event.context)).to.eventually.deep.equal( + expected + ); + }); + }); + + describe('process.env.GCLOUD_PROJECT not set', () => { + it('should not throw if trigger is not accessed', () => { + expect(() => testLab.testMatrix().onComplete(() => null)).to.not.throw( + Error + ); + }); + + it('should throw when trigger is accessed', () => { + expect( + () => testLab.testMatrix().onComplete(() => null).__trigger + ).to.throw(Error); + }); + }); + }); + + describe('TestMatrix', () => { + describe('constructor', () => { + it('should populate basic fields', () => { + const expected = { + testMatrixId: 'id1', + createTime: '2019-02-08T18:50:32.178Z', + state: 'FINISHED', + outcomeSummary: 'SUCCESS', + invalidMatrixDetails: 'DETAILS_UNAVAILABLE', + resultStorage: new testLab.ResultStorage(), + clientInfo: new testLab.ClientInfo(), + }; + const actual = new testLab.TestMatrix({ + testMatrixId: 'id1', + timestamp: '2019-02-08T18:50:32.178Z', + state: 'FINISHED', + outcomeSummary: 'SUCCESS', + invalidMatrixDetails: 'DETAILS_UNAVAILABLE', + }); + expect(actual).to.deep.equal(expected); + }); + }); + }); + + describe('ClientInfo', () => { + describe('constructor', () => { + it('should populate basic fields', () => { + const expected = { + name: 'client', + details: {}, + }; + const actual = new testLab.ClientInfo({ + name: 'client', + }); + expect(actual).to.deep.equal(expected); + }); + + it('should populate key/value details', () => { + const expected = { + name: 'client', + details: { + k0: 'v0', + k1: '', + }, + }; + const actual = new testLab.ClientInfo({ + name: 'client', + clientInfoDetails: [ + { + key: 'k0', + value: 'v0', + }, + { + key: 'k1', + }, + ], + }); + expect(actual).to.deep.equal(expected); + }); + }); + }); + + describe('ResultStorage', () => { + describe('constructor', () => { + it('should populate basic fields', () => { + const expected = { + gcsPath: 'path', + toolResultsHistoryId: 'h1', + toolResultsExecutionId: 'e2', + resultsUrl: 'http://example.com/', + }; + const actual = new testLab.ResultStorage({ + googleCloudStorage: { + gcsPath: 'path', + }, + toolResultsHistory: { + projectId: 'p1', + historyId: 'h1', + }, + toolResultsExecution: { + projectId: 'p2', + historyId: 'h2', + executionId: 'e2', + }, + resultsUrl: 'http://example.com/', + }); + expect(actual).to.deep.equal(expected); + }); + + it('should not throw on unset fields', () => { + expect(() => new testLab.ResultStorage({})).to.not.throw(); + }); + }); + }); +}); diff --git a/src/function-builder.ts b/src/function-builder.ts index bdf7f296f..3d24d6a56 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -40,6 +40,7 @@ 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 testLab from './providers/testLab'; /** * Assert that the runtime options passed in are valid. @@ -317,4 +318,13 @@ export class FunctionBuilder { user: () => auth._userWithOptions(this.options), }; } + + get testLab() { + return { + /** + * Handle events related to Test Lab test matrices. + */ + testMatrix: () => testLab._testMatrixWithOpts(this.options), + }; + } } diff --git a/src/handler-builder.ts b/src/handler-builder.ts index 20e15986d..94a55bf71 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -33,6 +33,7 @@ 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 testLab from './providers/testLab'; export class HandlerBuilder { constructor() {} @@ -213,6 +214,15 @@ export class HandlerBuilder { }, }; } + + get testLab() { + /** Handle events related to Test Lab test matrices. */ + return { + get testMatrix() { + return new testLab.TestMatrixBuilder(() => null, {}); + }, + }; + } } export let handler = new HandlerBuilder(); diff --git a/src/index.ts b/src/index.ts index 534080f56..d4951c512 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,6 +30,7 @@ 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 testLab from './providers/testLab'; import * as apps from './apps'; import { handler } from './handler-builder'; @@ -49,6 +50,7 @@ export { pubsub, remoteConfig, storage, + testLab, }; // Exported root types: diff --git a/src/providers/testLab.ts b/src/providers/testLab.ts new file mode 100644 index 000000000..86398c5c9 --- /dev/null +++ b/src/providers/testLab.ts @@ -0,0 +1,297 @@ +// The MIT License (MIT) +// +// Copyright (c) 2019 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. + +import * as _ from 'lodash'; + +import { + CloudFunction, + Event, + EventContext, + makeCloudFunction, +} from '../cloud-functions'; +import { DeploymentOptions } from '../function-configuration'; + +/** @internal */ +export const PROVIDER = 'google.testing'; +/** @internal */ +export const SERVICE = 'testing.googleapis.com'; +/** @internal */ +export const TEST_MATRIX_COMPLETE_EVENT_TYPE = 'testMatrix.complete'; + +/** Handle events related to Test Lab test matrices. */ +export function testMatrix() { + return _testMatrixWithOpts({}); +} + +/** @internal */ +export function _testMatrixWithOpts(opts: DeploymentOptions) { + return new TestMatrixBuilder(() => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + return 'projects/' + process.env.GCLOUD_PROJECT + '/testMatrices/{matrix}'; + }, opts); +} + +/** Builder used to create Cloud Functions for Test Lab test matrices events. */ +export class TestMatrixBuilder { + /** @internal */ + constructor( + private triggerResource: () => string, + private options: DeploymentOptions + ) {} + + /** Handle a TestMatrix that reached a final test state. */ + onComplete( + handler: ( + testMatrix: TestMatrix, + context: EventContext + ) => PromiseLike | any + ): CloudFunction { + const dataConstructor = (raw: Event) => { + return new TestMatrix(raw.data); + }; + return makeCloudFunction({ + provider: PROVIDER, + eventType: TEST_MATRIX_COMPLETE_EVENT_TYPE, + triggerResource: this.triggerResource, + service: SERVICE, + dataConstructor, + handler, + options: this.options, + }); + } +} + +/** TestMatrix captures details about a test run. */ +export class TestMatrix { + /** Unique id set by the service. */ + testMatrixId: string; + + /** When this test matrix was initially created (ISO8601 timestamp). */ + createTime: string; + + /** Indicates the current progress of the test matrix */ + state: TestState; + + /** + * The overall outcome of the test matrix run. Only set when the test matrix + * state is FINISHED. + */ + outcomeSummary?: OutcomeSummary; + + /** For 'INVALID' matrices only, describes why the matrix is invalid. */ + invalidMatrixDetails?: InvalidMatrixDetails; + + /** Where the results for the matrix are located. */ + resultStorage: ResultStorage; + + /** Information about the client which invoked the test. */ + clientInfo: ClientInfo; + + /** @internal */ + constructor(data: any) { + this.testMatrixId = data.testMatrixId; + this.createTime = data.timestamp; + this.state = data.state; + this.outcomeSummary = data.outcomeSummary; + this.invalidMatrixDetails = data.invalidMatrixDetails; + this.resultStorage = new ResultStorage(data.resultStorage); + this.clientInfo = new ClientInfo(data.clientInfo); + } +} + +/** Information about the client which invoked the test. */ +export class ClientInfo { + /** Client name, e.g. 'gcloud'. */ + name: string; + + /** Map of detailed information about the client which invoked the test. */ + details: { [key: string]: string }; + + /** @internal */ + constructor(data?: any) { + this.name = _.get(data, 'name', ''); + this.details = {}; + _.forEach(_.get(data, 'clientInfoDetails'), (detail: any) => { + this.details[detail.key] = detail.value || ''; + }); + } +} + +/** Locations where the test results are stored. */ +export class ResultStorage { + /** A storage location within Google Cloud Storage (GCS) for the test artifacts. */ + gcsPath?: string; + + /** Id of the ToolResults History containing these results. */ + toolResultsHistoryId?: string; + + /** + * Id of the ToolResults execution that the detailed TestMatrix results are + * written to. + */ + toolResultsExecutionId?: string; + + /** URL to test results in Firebase Console. */ + resultsUrl?: string; + + /** @internal */ + constructor(data?: any) { + this.gcsPath = _.get(data, 'googleCloudStorage.gcsPath'); + this.toolResultsHistoryId = _.get(data, 'toolResultsHistory.historyId'); + this.toolResultsExecutionId = _.get( + data, + 'toolResultsExecution.executionId' + ); + this.resultsUrl = _.get(data, 'resultsUrl'); + } +} + +/** + * The detailed reason that a Matrix was deemed INVALID. + * + * Possible values: + * - 'DETAILS_UNAVAILABLE': The matrix is INVALID, but there are no further + * details available. + * - 'MALFORMED_APK': The input app APK could not be parsed. + * - 'MALFORMED_TEST_APK': The input test APK could not be parsed. + * - 'NO_MANIFEST': The AndroidManifest.xml could not be found. + * - 'NO_PACKAGE_NAME': The APK manifest does not declare a package name. + * - 'INVALID_PACKAGE_NAME': The APK application ID is invalid. + * - 'TEST_SAME_AS_APP': The test package and app package are the same. + * - 'NO_INSTRUMENTATION': The test apk does not declare an instrumentation. + * - 'NO_SIGNATURE': The input app apk does not have a signature. + * - 'INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE': The test runner class + * specified by user or in the test APK's manifest file is not compatible with + * Android Test Orchestrator. + * - 'NO_TEST_RUNNER_CLASS': The test APK does not contain the test runner class + * specified by user or in the manifest file. + * - 'NO_LAUNCHER_ACTIVITY': A main launcher activity could not be found. + * - 'FORBIDDEN_PERMISSIONS': The app declares one or more permissions that are + * not allowed. + * - 'INVALID_ROBO_DIRECTIVES': There is a conflict in the provided + * robo_directives. + * - 'INVALID_RESOURCE_NAME': There is at least one invalid resource name in the + * provided robo directives. + * - 'INVALID_DIRECTIVE_ACTION': Invalid definition of action in the robo + * directives, e.g. a click or ignore action includes an input text field. + * - 'TEST_LOOP_INTENT_FILTER_NOT_FOUND': There is no test loop intent filter, + * or the one that is given is not formatted correctly. + * - 'SCENARIO_LABEL_NOT_DECLARED': The request contains a scenario label that + * was not declared in the manifest. + * - 'SCENARIO_LABEL_MALFORMED': There was an error when parsing a label value. + * - 'SCENARIO_NOT_DECLARED': The request contains a scenario number that was + * not declared in the manifest. + * - 'DEVICE_ADMIN_RECEIVER': Device administrator applications are not allowed. + * - 'MALFORMED_XC_TEST_ZIP': The zipped XCTest was malformed. The zip did not ] + * contain a single .xctestrun file and the contents of the + * DerivedData/Build/Products directory. + * - 'BUILT_FOR_IOS_SIMULATOR': The zipped XCTest was built for the iOS + * simulator rather than for a physical device. + * - 'NO_TESTS_IN_XC_TEST_ZIP': The .xctestrun file did not specify any test + * targets. + * - 'USE_DESTINATION_ARTIFACTS': One or more of the test targets defined in the + * .xctestrun file specifies "UseDestinationArtifacts", which is disallowed. + * - 'TEST_NON_APP_HOSTED': XC tests which run on physical devices must have + * "IsAppHostedTestBundle" == "true" in the xctestrun file. + * - 'PLIST_CANNOT_BE_PARSED': An Info.plist file in the XCTest zip could not be + * parsed. + * - 'NO_CODE_APK': APK contains no code. + * - 'INVALID_INPUT_APK': Either the provided input APK path was malformed, the + * APK file does not exist, or the user does not have permission to access the + * APK file. + * - 'INVALID_APK_PREVIEW_SDK': APK is built for a preview SDK which is + * unsupported. + */ +export type InvalidMatrixDetails = + | 'DETAILS_UNAVAILABLE' + | 'MALFORMED_APK' + | 'MALFORMED_TEST_APK' + | 'NO_MANIFEST' + | 'NO_PACKAGE_NAME' + | 'INVALID_PACKAGE_NAME' + | 'TEST_SAME_AS_APP' + | 'NO_INSTRUMENTATION' + | 'NO_SIGNATURE' + | 'INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE' + | 'NO_TEST_RUNNER_CLASS' + | 'NO_LAUNCHER_ACTIVITY' + | 'FORBIDDEN_PERMISSIONS' + | 'INVALID_ROBO_DIRECTIVES' + | 'INVALID_RESOURCE_NAME' + | 'INVALID_DIRECTIVE_ACTION' + | 'TEST_LOOP_INTENT_FILTER_NOT_FOUND' + | 'SCENARIO_LABEL_NOT_DECLARED' + | 'SCENARIO_LABEL_MALFORMED' + | 'SCENARIO_NOT_DECLARED' + | 'DEVICE_ADMIN_RECEIVER' + | 'MALFORMED_XC_TEST_ZIP' + | 'BUILT_FOR_IOS_SIMULATOR' + | 'NO_TESTS_IN_XC_TEST_ZIP' + | 'USE_DESTINATION_ARTIFACTS' + | 'TEST_NOT_APP_HOSTED' + | 'PLIST_CANNOT_BE_PARSED' + | 'NO_CODE_APK' + | 'INVALID_INPUT_APK' + | 'INVALID_APK_PREVIEW_SDK'; + +/** + * The state (i.e. progress) of a TestMatrix. + * + * Possible values: + * - 'VALIDATING': The matrix is being validated. + * - 'PENDING': The matrix is waiting for resources to become available. + * - 'FINISHED': The matrix has terminated normally. This means that the matrix + * level processing completed normally, but individual executions may be in an + * ERROR state. + * - 'ERROR': The matrix has stopped because it encountered an infrastructure + * failure. + * - 'INVALID': The matrix was not run because the provided inputs are not + * valid. E.g. the input file is not of the expected type, or is + * malformed/corrupt. + */ +export type TestState = + | 'VALIDATING' + | 'PENDING' + | 'FINISHED' + | 'ERROR' + | 'INVALID'; + +/** + * Outcome summary for a finished TestMatrix. + * + * Possible values: + * - 'SUCCESS': The test matrix run was successful, for instance: + * - All the test cases passed. + * - Robo did not detect a crash of the application under test. + * - 'FAILURE': The test run failed, for instance: + * - One or more test cases failed. + * - A test timed out. + * - The application under test crashed. + * - 'INCONCLUSIVE': Something unexpected happened. The run should still be + * considered unsuccessful but this is likely a transient problem and + * re-running the test might be successful. + * - 'SKIPPED': All tests were skipped, for instance: + * - All device configurations were incompatible. + */ +export type OutcomeSummary = 'SUCCESS' | 'FAILURE' | 'INCONCLUSIVE' | 'SKIPPED'; From de59422b9a09743e3c346def80e2cf2ccdf77a99 Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Wed, 17 Jul 2019 12:33:30 -0700 Subject: [PATCH 179/705] Em pubsub (#527) * Adding code comments to pupsub.ts * Adding code comments to pubsub.ts source file * Removing line breaks between @param and @return tags for TopicBuilder.onPublish() and topic() --- src/providers/pubsub.ts | 46 ++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index 265c39deb..d1a687819 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -35,8 +35,12 @@ export const provider = 'google.pubsub'; /** @hidden */ export const service = 'pubsub.googleapis.com'; -/** Select Cloud Pub/Sub topic to listen to. - * @param topic Name of Pub/Sub topic, must belong to the same project as the function. +/** + * Registers a Cloud Function triggered when a Google Cloud Pub/Sub message + * is sent to a specified topic. + * + * @param topic The Pub/Sub topic to watch for message events. + * @return Pub/Sub topic builder interface. */ export function topic(topic: string) { return _topicWithOptions(topic, {}); @@ -105,7 +109,11 @@ export function _scheduleWithOptions( return new ScheduleBuilder({ ...options, schedule: { schedule } }); } -/** Builder used to create Cloud Functions for Google Pub/Sub topics. */ +/** + * The Google Cloud Pub/Sub topic builder. + * + * Access via [`functions.pubsub.topic()`](functions.pubsub#.topic). + */ export class TopicBuilder { /** @hidden */ constructor( @@ -113,7 +121,14 @@ export class TopicBuilder { private options: DeploymentOptions ) {} - /** Handle a Pub/Sub message that was published to a Cloud Pub/Sub topic */ + /** + * Event handler that fires every time a Cloud Pub/Sub message is + * published. + * + * @param handler Event handler that runs every time a Cloud Pub/Sub message + * is published. + * @return A Cloud Function that you can export and deploy. + */ onPublish( handler: (message: Message, context: EventContext) => PromiseLike | any ): CloudFunction { @@ -130,15 +145,22 @@ export class TopicBuilder { } /** - * A Pub/Sub message. + * Interface representing a Google Cloud Pub/Sub message. * - * This class has an additional .json helper which will correctly deserialize any - * message that was a JSON object when published with the JS SDK. .json will throw - * if the message is not a base64 encoded JSON string. + * @param data Payload of a Pub/Sub message. */ export class Message { + /** + * The data payload of this message object as a base64-encoded string. + */ readonly data: string; + + /** + * User-defined attributes published with the message, if any. + */ readonly attributes: { [key: string]: string }; + + /** @hidden */ private _json: any; constructor(data: any) { @@ -149,6 +171,9 @@ export class Message { ]; } + /** + * The JSON data payload of this message object, if any. + */ get json(): any { if (typeof this._json === 'undefined') { this._json = JSON.parse(new Buffer(this.data, 'base64').toString('utf8')); @@ -157,6 +182,11 @@ export class Message { return this._json; } + /** + * Returns a JSON-serializable representation of this object. + * + * @return A JSON-serializable representation of this object. + */ toJSON(): any { return { data: this.data, From 3491a6d4e57432b5747acddd47e1a6a1109f2b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Thu, 18 Jul 2019 20:42:36 +0200 Subject: [PATCH 180/705] Increase type strictness of HttpsError class (#521) * Increase type strictness of HttpsError * Unhide toJSON method on HttpsErrors * Remove unused import * Hide httpErrorCode and toJSON on HttpsError class --- src/providers/https.ts | 166 +++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 88 deletions(-) diff --git a/src/providers/https.ts b/src/providers/https.ts index 3c3999123..d941f67c8 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -27,7 +27,6 @@ import * as _ from 'lodash'; import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; -import { assertNever } from '../utilities/assertions'; export interface Request extends express.Request { rawBody: Buffer; @@ -128,33 +127,65 @@ export type FunctionsErrorCode = | 'data-loss' | 'unauthenticated'; +export type CanonicalErrorCodeName = + | 'OK' + | 'CANCELLED' + | 'UNKNOWN' + | 'INVALID_ARGUMENT' + | 'DEADLINE_EXCEEDED' + | 'NOT_FOUND' + | 'ALREADY_EXISTS' + | 'PERMISSION_DENIED' + | 'UNAUTHENTICATED' + | 'RESOURCE_EXHAUSTED' + | 'FAILED_PRECONDITION' + | 'ABORTED' + | 'OUT_OF_RANGE' + | 'UNIMPLEMENTED' + | 'INTERNAL' + | 'UNAVAILABLE' + | 'DATA_LOSS'; + +interface HttpErrorCode { + canonicalName: CanonicalErrorCodeName; + status: number; +} + /** - * Standard error codes for different ways a request can fail, as defined by: + * Standard error codes and HTTP statuses for different ways a request can fail, + * as defined by: * https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto * * This map is used primarily to convert from a client error code string to - * to the HTTP format error code string, and make sure it's in the supported set. + * to the HTTP format error code string and status, and make sure it's in the + * supported set. */ -const errorCodeMap: { [name: string]: string } = { - ok: 'OK', - cancelled: 'CANCELLED', - unknown: 'UNKNOWN', - 'invalid-argument': 'INVALID_ARGUMENT', - 'deadline-exceeded': 'DEADLINE_EXCEEDED', - 'not-found': 'NOT_FOUND', - 'already-exists': 'ALREADY_EXISTS', - 'permission-denied': 'PERMISSION_DENIED', - unauthenticated: 'UNAUTHENTICATED', - 'resource-exhausted': 'RESOURCE_EXHAUSTED', - 'failed-precondition': 'FAILED_PRECONDITION', - aborted: 'ABORTED', - 'out-of-range': 'OUT_OF_RANGE', - unimplemented: 'UNIMPLEMENTED', - internal: 'INTERNAL', - unavailable: 'UNAVAILABLE', - 'data-loss': 'DATA_LOSS', +const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { + ok: { canonicalName: 'OK', status: 200 }, + cancelled: { canonicalName: 'CANCELLED', status: 499 }, + unknown: { canonicalName: 'UNKNOWN', status: 500 }, + 'invalid-argument': { canonicalName: 'INVALID_ARGUMENT', status: 400 }, + 'deadline-exceeded': { canonicalName: 'DEADLINE_EXCEEDED', status: 504 }, + 'not-found': { canonicalName: 'NOT_FOUND', status: 404 }, + 'already-exists': { canonicalName: 'ALREADY_EXISTS', status: 409 }, + 'permission-denied': { canonicalName: 'PERMISSION_DENIED', status: 403 }, + unauthenticated: { canonicalName: 'UNAUTHENTICATED', status: 401 }, + 'resource-exhausted': { canonicalName: 'RESOURCE_EXHAUSTED', status: 429 }, + 'failed-precondition': { canonicalName: 'FAILED_PRECONDITION', status: 400 }, + aborted: { canonicalName: 'ABORTED', status: 409 }, + 'out-of-range': { canonicalName: 'OUT_OF_RANGE', status: 400 }, + unimplemented: { canonicalName: 'UNIMPLEMENTED', status: 501 }, + internal: { canonicalName: 'INTERNAL', status: 500 }, + unavailable: { canonicalName: 'UNAVAILABLE', status: 503 }, + 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, }; +interface HttpErrorWireFormat { + details?: unknown; + message: string; + status: CanonicalErrorCodeName; +} + /** * An explicit error that can be thrown from a handler to send an error to the * client that called the function. @@ -164,88 +195,46 @@ export class HttpsError extends Error { * A standard error code that will be returned to the client. This also * determines the HTTP status code of the response, as defined in code.proto. */ - readonly code: FunctionsErrorCode; + public readonly code: FunctionsErrorCode; /** * Extra data to be converted to JSON and included in the error response. */ - readonly details?: unknown; + public readonly details: unknown; + + /** + * A wire format representation of a provided error code. + * + * @hidden + */ + public readonly httpErrorCode: HttpErrorCode; constructor(code: FunctionsErrorCode, message: string, details?: unknown) { super(message); - if (!errorCodeMap[code]) { - throw new Error('Unknown error status: ' + code); + // A sanity check for non-TypeScript consumers. + if (code in errorCodeMap === false) { + throw new Error(`Unknown error code: ${code}.`); } this.code = code; this.details = details; - } - - /** - * @hidden - * A string representation of the Google error code for this error for HTTP. - */ - get status() { - return errorCodeMap[this.code]; - } - - /** - * @hidden - * Returns the canonical http status code for the given error. - */ - get httpStatus(): number { - switch (this.code) { - case 'ok': - return 200; - case 'cancelled': - return 499; - case 'unknown': - return 500; - case 'invalid-argument': - return 400; - case 'deadline-exceeded': - return 504; - case 'not-found': - return 404; - case 'already-exists': - return 409; - case 'permission-denied': - return 403; - case 'unauthenticated': - return 401; - case 'resource-exhausted': - return 429; - case 'failed-precondition': - return 400; - case 'aborted': - return 409; - case 'out-of-range': - return 400; - case 'unimplemented': - return 501; - case 'internal': - return 500; - case 'unavailable': - return 503; - case 'data-loss': - return 500; - // This should never happen as long as the type system is doing its job. - default: - assertNever(this.code); - } + this.httpErrorCode = errorCodeMap[code]; } /** @hidden */ - public toJSON() { - const json: any = { - status: this.status, - message: this.message, + public toJSON(): HttpErrorWireFormat { + const { + details, + httpErrorCode: { canonicalName: status }, + message, + } = this; + + return { + ...(details === undefined ? {} : { details }), + message, + status, }; - if (!_.isUndefined(this.details)) { - json.details = this.details; - } - return json; } } @@ -472,8 +461,9 @@ export function _onCallWithOptions( error = new HttpsError('internal', 'INTERNAL'); } - const status = error.httpStatus; + const { status } = error.httpErrorCode; const body = { error: error.toJSON() }; + res.status(status).send(body); } }; From cc663231245256c444e54211911c25fbda0db3d3 Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Thu, 18 Jul 2019 15:24:05 -0700 Subject: [PATCH 181/705] Adding code comments and @hidden tags for src/providers/database.ts (#531) * Adding code comments to src/providers/database.ts file * Adding an @hidden tag to properties and methods of database.DataSnapshot with an underscore before them --- src/providers/database.ts | 212 ++++++++++++++++++++++++++++++++++---- 1 file changed, 191 insertions(+), 21 deletions(-) diff --git a/src/providers/database.ts b/src/providers/database.ts index ec6969909..8a2f9453a 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -44,16 +44,26 @@ export const service = 'firebaseio.com'; const databaseURLRegex = new RegExp('https://([^.]+).firebaseio.com'); /** - * Selects a database instance that will trigger the function. - * If omitted, will pick the default database for your project. - * @param instance The Realtime Database instance to use. + * Registers a function that triggers on events from a specific + * Firebase Realtime Database instance. + * + * Use this method together with `ref` to specify the instance on which to + * watch for database events. For example: `firebase.database.instance('my-app-db-2').ref('/foo/bar')` + * + * Note that `functions.database.ref` used without `instance` watches the + * *default* instance for events. + * + * @param instance The instance name of the database instance + * to watch for write events. + * @return Firebase Realtime Database instance builder interface. */ export function instance(instance: string) { return _instanceWithOptions(instance, {}); } /** - * Select Firebase Realtime Database Reference to listen to. + * Registers a function that triggers on Firebase Realtime Database write + * events. * * This method behaves very similarly to the method of the same name in the * client and Admin Firebase SDKs. Any change to the Database that affects the @@ -65,15 +75,19 @@ export function instance(instance: string) { * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component * in curly brackets (`{}`) is a wildcard that matches all strings. The value * that matched a certain invocation of a Cloud Function is returned as part - * of the `context.params` object. For example, `ref("messages/{messageId}")` - * matches changes at `/messages/message1` or `/messages/message2`, resulting - * in `context.params.messageId` being set to `"message1"` or `"message2"`, + * of the [`event.params`](functions.EventContext#params) object. For + * example, `ref("messages/{messageId}")` matches changes at + * `/messages/message1` or `/messages/message2`, resulting in + * `event.params.messageId` being set to `"message1"` or `"message2"`, * respectively. * 2. Cloud Functions do not fire an event for data that already existed before * the Cloud Function was deployed. - * 3. Cloud Function events have access to more information, including information - * about the user who triggered the Cloud Function. - * @param ref Path of the database to listen to. + * 3. Cloud Function events have access to more information, including a + * snapshot of the previous event data and information about the user who + * triggered the Cloud Function. + * + * @param path The path within the Database to watch for write events. + * @return Firebase Realtime Database builder interface. */ export function ref(path: string) { return _refWithOptions(path, {}); @@ -87,10 +101,18 @@ export function _instanceWithOptions( return new InstanceBuilder(instance, options); } +/** + * The Firebase Realtime Database instance builder interface. + * + * Access via [`functions.database.instance()`](functions.database#.instance). + */ export class InstanceBuilder { /** @hidden */ constructor(private instance: string, private options: DeploymentOptions) {} + /** + * @return Firebase Realtime Database reference builder interface. + */ ref(path: string): RefBuilder { const normalized = normalizePath(path); return new RefBuilder( @@ -130,7 +152,11 @@ export function _refWithOptions( return new RefBuilder(apps(), resourceGetter, options); } -/** Builder used to create Cloud Functions for Firebase Realtime Database References. */ +/** + * The Firebase Realtime Database reference builder interface. + * + * Access via [`functions.database.ref()`](functions.database#.ref). + */ export class RefBuilder { /** @hidden */ constructor( @@ -139,7 +165,14 @@ export class RefBuilder { private options: DeploymentOptions ) {} - /** Respond to any write that affects a ref. */ + /** + * Event handler that fires every time a Firebase Realtime Database write + * of any kind (creation, update, or delete) occurs. + * + * @param handler Event handler that runs every time a Firebase Realtime Database + * write occurs. + * @return A Cloud Function that you can export and deploy. + */ onWrite( handler: ( change: Change, @@ -149,7 +182,15 @@ export class RefBuilder { return this.onOperation(handler, 'ref.write', this.changeConstructor); } - /** Respond to update on a ref. */ + /** + * Event handler that fires every time data is updated in + * Firebase Realtime Database. + * + * @param handler Event handler which is run every time a Firebase Realtime Database + * write occurs. + * @return A Cloud + * Function which you can export and deploy. + */ onUpdate( handler: ( change: Change, @@ -159,7 +200,14 @@ export class RefBuilder { return this.onOperation(handler, 'ref.update', this.changeConstructor); } - /** Respond to new data on a ref. */ + /** + * Event handler that fires every time new data is created in + * Firebase Realtime Database. + * + * @param handler Event handler that runs every time new data is created in + * Firebase Realtime Database. + * @return A Cloud Function that you can export and deploy. + */ onCreate( handler: ( snapshot: DataSnapshot, @@ -180,7 +228,14 @@ export class RefBuilder { return this.onOperation(handler, 'ref.create', dataConstructor); } - /** Respond to all data being deleted from a ref. */ + /** + * Event handler that fires every time data is deleted from + * Firebase Realtime Database. + * + * @param handler Event handler that runs every time data is deleted from + * Firebase Realtime Database. + * @return A Cloud Function that you can export and deploy. + */ onDelete( handler: ( snapshot: DataSnapshot, @@ -259,11 +314,22 @@ export function resourceToInstanceAndPath(resource: string) { return [dbInstance, path]; } +/** + * Interface representing a Firebase Realtime Database data snapshot. + */ export class DataSnapshot { public instance: string; + + /** @hidden */ private _ref: firebase.database.Reference; + + /** @hidden */ private _path: string; + + /** @hidden */ private _data: any; + + /** @hidden */ private _childPath: string; constructor( @@ -286,7 +352,11 @@ export class DataSnapshot { this._data = data; } - /** Ref returns a reference to the database with full admin access. */ + /** + * Returns a [`Reference`](/docs/reference/admin/node/admin.database.Reference) + * to the Database location where the triggering write occurred. Has + * full read and write access. + */ get ref(): firebase.database.Reference { if (!this.app) { // may be unpopulated in user's unit tests @@ -301,11 +371,30 @@ export class DataSnapshot { return this._ref; } + /** + * The key (last part of the path) of the location of this `DataSnapshot`. + * + * The last token in a Database location is considered its key. For example, + * "ada" is the key for the `/users/ada/` node. Accessing the key on any + * `DataSnapshot` will return the key for the location that generated it. + * However, accessing the key on the root URL of a Database will return `null`. + */ get key(): string { const last = _.last(pathParts(this._fullPath())); return !last || last === '' ? null : last; } + /** + * Extracts a JavaScript value from a `DataSnapshot`. + * + * Depending on the data in a `DataSnapshot`, the `val()` method may return a + * scalar type (string, number, or boolean), an array, or an object. It may also + * return `null`, indicating that the `DataSnapshot` is empty (contains no + * data). + * + * @return The DataSnapshot's contents as a JavaScript value (Object, + * Array, string, number, boolean, or `null`). + */ val(): any { const parts = pathParts(this._childPath); const source = this._data; @@ -315,20 +404,52 @@ export class DataSnapshot { return this._checkAndConvertToArray(node); } - // TODO(inlined): figure out what to do here + /** + * Exports the entire contents of the `DataSnapshot` as a JavaScript object. + * + * The `exportVal()` method is similar to `val()`, except priority information + * is included (if available), making it suitable for backing up your data. + * + * @return The contents of the `DataSnapshot` as a JavaScript value + * (Object, Array, string, number, boolean, or `null`). + */ exportVal(): any { return this.val(); } - // TODO(inlined): figure out what to do here + /** + * Gets the priority value of the data in this `DataSnapshot`. + * + * As an alternative to using priority, applications can order collections by + * ordinary properties. See [Sorting and filtering + * data](/docs/database/web/lists-of-data#sorting_and_filtering_data). + * + * @return The priority value of the data. + */ getPriority(): string | number | null { return 0; } + /** + * Returns `true` if this `DataSnapshot` contains any data. It is slightly more + * efficient than using `snapshot.val() !== null`. + * + * @return `true` if this `DataSnapshot` contains any data; otherwise, `false`. + */ exists(): boolean { return !_.isNull(this.val()); } + /** + * Gets a `DataSnapshot` for the location at the specified relative path. + * + * The relative path can either be a simple child name (for example, "ada") or + * a deeper slash-separated path (for example, "ada/name/first"). + * + * @param path A relative path from this location to the desired child + * location. + * @return The specified child location. + */ child(childPath: string): DataSnapshot { if (!childPath) { return this; @@ -336,6 +457,25 @@ export class DataSnapshot { return this._dup(childPath); } + /** + * Enumerates the `DataSnapshot`s of the children items. + * + * Because of the way JavaScript objects work, the ordering of data in the + * JavaScript object returned by `val()` is not guaranteed to match the ordering + * on the server nor the ordering of `child_added` events. That is where + * `forEach()` comes in handy. It guarantees the children of a `DataSnapshot` + * will be iterated in their query order. + * + * If no explicit `orderBy*()` method is used, results are returned + * ordered by key (unless priorities are used, in which case, results are + * returned by priority). + * + * @param action A function that will be called for each child `DataSnapshot`. + * The callback can return `true` to cancel further enumeration. + * + * @return `true` if enumeration was canceled due to your callback + * returning `true`. + */ forEach(action: (a: DataSnapshot) => boolean): boolean { const val = this.val(); if (_.isPlainObject(val)) { @@ -347,29 +487,57 @@ export class DataSnapshot { return false; } + /** + * Returns `true` if the specified child path has (non-`null`) data. + * + * @param path A relative path to the location of a potential child. + * @return `true` if data exists at the specified child path; otherwise, + * `false`. + */ hasChild(childPath: string): boolean { return this.child(childPath).exists(); } + /** + * Returns whether or not the `DataSnapshot` has any non-`null` child + * properties. + * + * You can use `hasChildren()` to determine if a `DataSnapshot` has any + * children. If it does, you can enumerate them using `forEach()`. If it + * doesn't, then either this snapshot contains a primitive value (which can be + * retrieved with `val()`) or it is empty (in which case, `val()` will return + * `null`). + * + * @return `true` if this snapshot has any children; else `false`. + */ hasChildren(): boolean { const val = this.val(); return _.isPlainObject(val) && _.keys(val).length > 0; } + /** + * Returns the number of child properties of this `DataSnapshot`. + * + * @return Number of child properties of this `DataSnapshot`. + */ numChildren(): number { const val = this.val(); return _.isPlainObject(val) ? Object.keys(val).length : 0; } /** - * Prints the value of the snapshot; use '.previous.toJSON()' and '.current.toJSON()' to explicitly see - * the previous and current values of the snapshot. + * Returns a JSON-serializable representation of this object. + * + * @return A JSON-serializable representation of this object. */ toJSON(): Object { return this.val(); } - /* Recursive function to check if keys are numeric & convert node object to array if they are */ + /** Recursive function to check if keys are numeric & convert node object to array if they are + * + * @hidden + */ private _checkAndConvertToArray(node: any): any { if (node === null || typeof node === 'undefined') { return null; @@ -408,6 +576,7 @@ export class DataSnapshot { return obj; } + /** @hidden */ private _dup(childPath?: string): DataSnapshot { const dup = new DataSnapshot( this._data, @@ -424,6 +593,7 @@ export class DataSnapshot { return dup; } + /** @hidden */ private _fullPath(): string { const out = (this._path || '') + '/' + (this._childPath || ''); return out; From 4e043af87459ee5d1ebd627ddc2c1db4f5012ff6 Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Mon, 22 Jul 2019 22:03:41 -0700 Subject: [PATCH 182/705] Adding code comments to src/providers/crashlytics.ts (#534) * Adding code comments to src/providers/crashlytics.ts from production docs * Fixing some small documentation format nits found by Diana for VelocityAlert and Issue.resolvedTime --- src/providers/crashlytics.ts | 87 +++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index 89701d42f..e7a6fe882 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -33,8 +33,9 @@ export const provider = 'google.firebase.crashlytics'; export const service = 'fabric.io'; /** - * Handle events related to Crashlytics issues. An issue in Crashlytics is an - * aggregation of crashes which have a shared root cause. + * Registers a Cloud Function to handle Crashlytics issue events. + * + * @returns Crashlytics issue event builder interface. */ export function issue() { return _issueWithOptions({}); @@ -50,7 +51,7 @@ export function _issueWithOptions(options: DeploymentOptions) { }, options); } -/** Builder used to create Cloud Functions for Crashlytics issue events. */ +/** The Firebase Crashlytics issue builder interface. */ export class IssueBuilder { /** @hidden */ constructor( @@ -63,21 +64,46 @@ export class IssueBuilder { throw new Error('"onNewDetected" is now deprecated, please use "onNew"'); } - /** Handle Crashlytics New Issue events. */ + /** + * Event handler that fires every time a new issue occurs in a project. + * + * @param handler Event handler that fires every time a new issue event occurs. + * @example + * ```javascript + * exports.postOnNewIssue = functions.crashlytics.issue().onNew(event => { + * const { data } = event; + * issueId = data.issueId; + * issueTitle = data.issueTitle; + * const slackMessage = ` There's a new issue (${issueId}) ` + + * `in your app - ${issueTitle}`; + * return notifySlack(slackMessage).then(() => { + * console.log(`Posted new issue ${issueId} successfully to Slack`); + * }); + * }); + * ``` + */ onNew( handler: (issue: Issue, context: EventContext) => PromiseLike | any ): CloudFunction { return this.onEvent(handler, 'issue.new'); } - /** Handle Crashlytics Regressed Issue events. */ + /** + * Event handler that fires every time a regressed issue reoccurs in a project. + * + * @param handler Event handler that fires every time a regressed issue event occurs. + */ onRegressed( handler: (issue: Issue, context: EventContext) => PromiseLike | any ): CloudFunction { return this.onEvent(handler, 'issue.regressed'); } - /** Handle Crashlytics Velocity Alert events. */ + /** + * Event handler that fires every time a velocity alert occurs in a project. + * + * @param handler handler that fires every time a velocity alert issue event occurs. + */ onVelocityAlert( handler: (issue: Issue, context: EventContext) => PromiseLike | any ): CloudFunction { @@ -101,52 +127,71 @@ export class IssueBuilder { } /** - * Interface representing a Crashlytics issue event that was logged for a specific issue. + * Interface representing a Firebase Crashlytics event that was logged for a specific issue. */ export interface Issue { - /** Fabric Issue ID. */ + /** Crashlytics-provided issue ID. */ issueId: string; - /** Issue title. */ + /** Crashlytics-provided issue title. */ issueTitle: string; - /** App information. */ + /** AppInfo interface describing the App. */ appInfo: AppInfo; - /** When the issue was created (ISO8601 time stamp). */ + /** + * UTC when the issue occurred in ISO8601 standard representation. + * + * Example: 1970-01-17T10:52:15.661-08:00 + */ createTime: string; - /** When the issue was resolved, if the issue has been resolved (ISO8601 time stamp). */ + /** + * UTC When the issue was closed in ISO8601 standard representation. + * + * Example: 1970-01-17T10:52:15.661-08:00 + */ resolvedTime?: string; - /** Contains details about the velocity alert, if this event was triggered by a velocity alert. */ + /** Information about the velocity alert, like number of crashes and percentage of users affected by the issue. */ velocityAlert?: VelocityAlert; } +/** Interface representing Firebase Crashlytics VelocityAlert data. */ export interface VelocityAlert { - /** The percentage of sessions which have been impacted by this issue. Example: .04 */ + /** + * The percentage of sessions which have been impacted by this issue. + * + * Example: .04 + */ crashPercentage: number; /** The number of crashes that this issue has caused. */ crashes: number; } -/** - * Interface representing the application where this issue occurred. - */ +/** Interface representing Firebase Crashlytics AppInfo data. */ export interface AppInfo { - /** The app's name. Example: "My Awesome App". */ + /** + * The app's name. + * + * Example: "My Awesome App". + */ appName: string; - /** The app's platform. Examples: "android", "ios". */ + /** The app's platform. + * + * Examples: "android", "ios". + */ appPlatform: string; /** Unique application identifier within an app store, either the Android package name or the iOS bundle id. */ appId: string; /** - * The latest app version which is affected by the issue. - * Examples: "1.0", "4.3.1.1.213361", "2.3 (1824253)", "v1.8b22p6". + * The app's version name. + * + * Examples: "1.0", "4.3.1.1.213361", "2.3 (1824253)", "v1.8b22p6". */ latestAppVersion: string; } From 6e97877304441cc914302bfdff228a7f086a9262 Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Mon, 22 Jul 2019 22:07:18 -0700 Subject: [PATCH 183/705] Adding code comments to analytics.ts (#535) * Adding code comments to src/providers/analytics.ts * Tweaking some things requested by Eric, 'Function' instead of 'Cloud Function', and 'ID' instead of 'id' --- src/providers/analytics.ts | 113 ++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 40 deletions(-) diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 457307e46..43578f8b6 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -36,8 +36,12 @@ export const provider = 'google.analytics'; export const service = 'app-measurement.com'; /** - * Select analytics events to listen to for events. - * @param analyticsEventType Name of the analytics event type. + * Registers a function to handle analytics events. + * + * @param analyticsEventType Name of the analytics event type to which + * this Cloud Function is scoped. + * + * @return Analytics event builder interface. */ export function event(analyticsEventType: string) { return _eventWithOptions(analyticsEventType, {}); @@ -61,7 +65,7 @@ export function _eventWithOptions( /** * The Firebase Analytics event builder interface. * - * Access via [`functions.analytics.event()`](functions.analytics#event). + * Access via [`functions.analytics.event()`](functions.analytics#.event). */ export class AnalyticsEventBuilder { /** @hidden */ @@ -73,12 +77,10 @@ export class AnalyticsEventBuilder { /** * Event handler that fires every time a Firebase Analytics event occurs. * - * @param {!function(!functions.Event)} - * handler Event handler that fires every time a Firebase Analytics event + * @param handler Event handler that fires every time a Firebase Analytics event * occurs. * - * @return {!functions.CloudFunction} A - * Cloud Function you can export. + * @return A function that you can export and deploy. */ onLog( handler: ( @@ -102,13 +104,11 @@ export class AnalyticsEventBuilder { } } -/** - * Interface representing a Firebase Analytics event that was logged for a specific user. - */ +/** Interface representing a Firebase Analytics event that was logged for a specific user. */ export class AnalyticsEvent { /** - * The date on which the event.was logged. - * (`YYYYMMDD` format in the registered timezone of your app). + * The date on which the event.was logged. + * (`YYYYMMDD` format in the registered timezone of your app). */ reportingDate: string; @@ -232,11 +232,9 @@ export class UserDimensions { } } -/** - * Predefined or custom properties stored on the client side. - */ +/** Predefined or custom properties stored on the client side. */ export class UserPropertyValue { - /** Last set value of a user property. */ + /** The last set value of a user property. */ value: string; /** UTC client time when the user property was last set. */ @@ -250,47 +248,55 @@ export class UserPropertyValue { } /** - * Interface representing the device that triggered these Firebase Analytics events. + * Interface representing the device that triggered these + * Firebase Analytics events. */ export interface DeviceInfo { /** * Device category. + * * Examples: "tablet" or "mobile". */ deviceCategory?: string; /** * Device brand name. + * * Examples: "Samsung", "HTC" */ mobileBrandName?: string; /** * Device model name in human-readable format. + * * Example: "iPhone 7" */ mobileModelName?: string; /** * Device marketing name. + * * Example: "Galaxy S4 Mini" */ mobileMarketingName?: string; /** * Device model, as read from the OS. + * * Example: "iPhone9,1" */ deviceModel?: string; /** * Device OS version when data capture ended. + * * Example: "4.4.2" */ platformVersion?: string; /** * Vendor specific device identifier. This is IDFV on iOS. Not used for Android. + * * Example: '599F9C00-92DC-4B5C-9464-7971F01F8370' */ deviceId?: string; @@ -313,69 +319,86 @@ export interface DeviceInfo { /** * The time zone of the device when data was uploaded, as seconds skew from UTC. - * Use this to calculate the device's local time for [`event.timestamp`](functions.Event#timestamp)`. + * Use this to calculate the device's local time for [`event.timestamp`](functions.Event#timestamp). */ deviceTimeZoneOffsetSeconds: number; /** * The device's Limit Ad Tracking setting. * When `true`, you cannot use `resettableDeviceId` for remarketing, demographics or influencing ads serving - * behaviour. However, you can use resettableDeviceId for conversion tracking and campaign attribution. + * behaviour. However, you can use `resettableDeviceId` for conversion tracking and campaign attribution. */ limitedAdTracking: boolean; } -/** - * Interface representing the geographic origin of the events. - */ +/** Interface representing the geographic origin of the events. */ export interface GeoInfo { - /** The geographic continent. Example: "Americas". */ + /** + * The geographic continent. + * + * Example: "South America". + */ continent?: string; - /** The geographic country. Example: "Brazil". */ + /** + * The geographic country. + * + * Example: "Brazil". + */ country?: string; - /** The geographic region. Example: "State of Sao Paulo". */ + /** + * The geographic region. + * + * Example: "State of Sao Paulo". + */ region?: string; - /** The geographic city. Example: "Sao Paulo". */ + /** + * The geographic city. + * + * Example: "Sao Paulo". + */ city?: string; } -/** - * Interface representing the application that triggered these events. - */ +/** Interface representing the application that triggered these events. */ export interface AppInfo { /** - * The app's version name. - * Examples: "1.0", "4.3.1.1.213361", "2.3 (1824253)", "v1.8b22p6". + * The app's version name. + * + * Examples: "1.0", "4.3.1.1.213361", "2.3 (1824253)", "v1.8b22p6". */ appVersion?: string; /** - * Unique id for this instance of the app. - * Example: "71683BF9FA3B4B0D9535A1F05188BAF3". + * Unique ID for this instance of the app. + * + * Example: "71683BF9FA3B4B0D9535A1F05188BAF3". */ appInstanceId: string; /** - * The identifier of the store that installed the app. - * Examples: "com.sec.android.app.samsungapps", "com.amazon.venezia", "com.nokia.nstore". + * The identifier of the store that installed the app. + * + * Examples: "com.sec.android.app.samsungapps", "com.amazon.venezia", "com.nokia.nstore". */ appStore?: string; - /** The app platform. Examples: "ANDROID", "IOS". */ + /** + * The app platform. + * + * Examples: "ANDROID", "IOS". + */ appPlatform: string; /** Unique application identifier within an app store. */ appId?: string; } -/** - * Interface representing the bundle in which these events were uploaded. - */ +/** Interface representing the bundle these events were uploaded to. */ export class ExportBundleInfo { - /** Monotonically increasing index for each bundle set by the Analytics SDK. */ + /** Monotonically increasing index for each bundle set by the Analytics SDK. */ bundleSequenceId: number; /** Timestamp offset (in milliseconds) between collection time and upload time. */ @@ -393,6 +416,7 @@ export class ExportBundleInfo { } } +/** @hidden */ function copyFieldTo( from: any, to: T, @@ -405,6 +429,7 @@ function copyFieldTo( } } +/** @hidden */ function copyField( from: any, to: T, @@ -414,6 +439,7 @@ function copyField( copyFieldTo(from, to, field as string, field, transform); } +/** @hidden */ function copyFields(from: any, to: T, fields: K[]): void { for (const field of fields) { copyField(from, to, field); @@ -449,10 +475,12 @@ function copyFields(from: any, to: T, fields: K[]): void { // is due to the encoding library, which renders int64 values as strings to avoid loss of precision. This // method always returns a string, similarly to avoid loss of precision, unlike the less-conservative // 'unwrapValue' method just below. +/** @hidden */ function unwrapValueAsString(wrapped: any): string { const key: string = _.keys(wrapped)[0]; return _.toString(wrapped[key]); } + // Ditto as the method above, but returning the values in the idiomatic JavaScript type (string for strings, // number for numbers): // { @@ -466,7 +494,10 @@ function unwrapValueAsString(wrapped: any): string { // purposes can be divided into 'number' versus 'string'. This method will render all the numbers as // JavaScript's 'number' type, since we prefer using idiomatic types. Note that this may lead to loss // in precision for int64 fields, so use with care. +/** @hidden */ const xValueNumberFields = ['intValue', 'floatValue', 'doubleValue']; + +/** @hidden */ function unwrapValue(wrapped: any): any { const key: string = _.keys(wrapped)[0]; const value: string = unwrapValueAsString(wrapped); @@ -476,6 +507,7 @@ function unwrapValue(wrapped: any): any { // The JSON payload delivers timestamp fields as strings of timestamps denoted in microseconds. // The JavaScript convention is to use numbers denoted in milliseconds. This method // makes it easy to convert a field of one type into the other. +/** @hidden */ function copyTimestampToMillis( from: any, to: T, @@ -490,6 +522,7 @@ function copyTimestampToMillis( // The JSON payload delivers timestamp fields as strings of timestamps denoted in microseconds. // In our SDK, we'd like to present timestamp as ISO-format strings. This method makes it easy // to convert a field of one type into the other. +/** @hidden */ function copyTimestampToString( from: any, to: T, From e5466959ea4f5a0729d6a0a241e65301f2ec29d7 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Wed, 24 Jul 2019 13:35:00 -0700 Subject: [PATCH 184/705] add timestamp to the .tgz bundle name to avoid GCF caching old versions of it (#539) --- integration_test/run_tests.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index d7017af52..765e3b0d7 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -20,6 +20,7 @@ if [[ "${1}" == "" ]]; then fi PROJECT_ID="${1}" +TIMESTAMP=$(date +%s) TOKEN="${2}" # Directory where this script lives. @@ -34,17 +35,19 @@ function build_sdk { cd "${DIR}/.." rm -f firebase-functions-*.tgz npm run build:pack - mv firebase-functions-*.tgz integration_test/functions/firebase-functions.tgz + mv firebase-functions-*.tgz "integration_test/functions/firebase-functions-${TIMESTAMP}.tgz" } function pick_node8 { cd "${DIR}" cp package.node8.json functions/package.json + sed -i '' "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json } function pick_node10 { cd "${DIR}" cp package.node10.json functions/package.json + sed -i '' "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json } function install_deps { @@ -98,7 +101,7 @@ function run_tests { function cleanup { announce "Performing cleanup..." delete_all_functions - rm "${DIR}/functions/firebase-functions.tgz" + rm "${DIR}/functions/firebase-functions-*.tgz" rm "${DIR}/functions/package.json" rm -f "${DIR}/functions/firebase-debug.log" rm -rf "${DIR}/functions/lib" From 8b84bf6f3f4bc66c03aa415d0cfead6ecc962f45 Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 24 Jul 2019 20:39:20 +0000 Subject: [PATCH 185/705] [firebase-release] Updated SDK for Cloud Functions to 3.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de58f1199..b50c25e99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.1.0", + "version": "3.2.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From a4266b7da1991eb14bd5afecbb31e709af36ed3c Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Wed, 24 Jul 2019 20:39:33 +0000 Subject: [PATCH 186/705] [firebase-release] Removed change log and reset repo after 3.2.0 release --- changelog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2dc41f3fa..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,2 +0,0 @@ -feature - Adds support for Test Lab triggered functions with `functions.testLab`. -fixed - Upgrade lodash dependency to resolve security vulnerability CVE-2019-10744. \ No newline at end of file From e32e8cc92993ed47fc665bbacf735e38d87cc7f4 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Wed, 24 Jul 2019 17:34:26 -0700 Subject: [PATCH 187/705] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 49f7349e0..bb94688b2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @kevinajian @thechenky +* @thechenky From 381c733c0b0f1df7fe7bb4811c0eb1a191b00b27 Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Thu, 1 Aug 2019 15:16:48 -0700 Subject: [PATCH 188/705] Fix sed command that breaks on linux (#545) * fix sed command that breaks on linux * fixing rm error --- integration_test/run_tests.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 765e3b0d7..903936b13 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -41,13 +41,19 @@ function build_sdk { function pick_node8 { cd "${DIR}" cp package.node8.json functions/package.json - sed -i '' "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json + # we have to do the -e flag here so that it work both on linux and mac os, but that creates an extra + # backup file called package.json-e that we should clean up afterwards. + sed -i -e "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json + rm -f functions/package.json-e } function pick_node10 { cd "${DIR}" cp package.node10.json functions/package.json - sed -i '' "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json + # we have to do the -e flag here so that it work both on linux and mac os, but that creates an extra + # backup file called package.json-e that we should clean up afterwards. + sed -i -e "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json + rm -f functions/package.json-e } function install_deps { @@ -101,7 +107,7 @@ function run_tests { function cleanup { announce "Performing cleanup..." delete_all_functions - rm "${DIR}/functions/firebase-functions-*.tgz" + rm "${DIR}/functions/firebase-functions-${TIMESTAMP}.tgz" rm "${DIR}/functions/package.json" rm -f "${DIR}/functions/firebase-debug.log" rm -rf "${DIR}/functions/lib" From 8057d116915ec293da0b67e07c09d8a1c3dacead Mon Sep 17 00:00:00 2001 From: Diana Tkachenko <31747099+thechenky@users.noreply.github.com> Date: Mon, 7 Oct 2019 20:03:29 +0200 Subject: [PATCH 189/705] Remove chenky from codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bb94688b2..8b1378917 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @thechenky + From a001a8537dd9704d1d1c089191ce2ab514d1e3fb Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Mon, 7 Oct 2019 13:56:45 -0700 Subject: [PATCH 190/705] Add emulator app override function (#565) --- changelog.txt | 1 + src/apps.ts | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changelog.txt b/changelog.txt index e69de29bb..c3be06fd4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +feature - Add a helper function for the Firebase Emulator suite. \ No newline at end of file diff --git a/src/apps.ts b/src/apps.ts index 43c8d705d..163cd4795 100644 --- a/src/apps.ts +++ b/src/apps.ts @@ -58,6 +58,7 @@ export namespace apps { export class Apps { private _refCounter: RefCounter; + private _emulatedAdminApp?: firebase.app.App; constructor() { this._refCounter = {}; @@ -105,12 +106,25 @@ export namespace apps { } get admin(): firebase.app.App { + if (this._emulatedAdminApp) { + return this._emulatedAdminApp; + } + if (this._appAlive('__admin__')) { return firebase.app('__admin__'); } return firebase.initializeApp(this.firebaseArgs, '__admin__'); } + /** + * This function allows the Firebase Emulator Suite to override the FirebaseApp instance + * used by the Firebase Functions SDK. Developers should never call this function for + * other purposes. + */ + setEmulatedAdminApp(app: firebase.app.App) { + this._emulatedAdminApp = app; + } + private get firebaseArgs() { return _.assign({}, firebaseConfig(), { credential: firebase.credential.applicationDefault(), From bf5f3b5073b2c70286265c19eeb320b3a5bd3f0c Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 10 Oct 2019 21:58:16 +0000 Subject: [PATCH 191/705] [firebase-release] Updated SDK for Cloud Functions to 3.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b50c25e99..70edbc1ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.2.0", + "version": "3.3.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 3018b60c05c349ceee62b5790898a3d7468f3abf Mon Sep 17 00:00:00 2001 From: Firebase Operations Date: Thu, 10 Oct 2019 21:58:27 +0000 Subject: [PATCH 192/705] [firebase-release] Removed change log and reset repo after 3.3.0 release --- changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index c3be06fd4..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -feature - Add a helper function for the Firebase Emulator suite. \ No newline at end of file From c5d3a7bf986e39af22d5f74e6c4e99fd432baa79 Mon Sep 17 00:00:00 2001 From: Erik Macik <42585523+esmacik@users.noreply.github.com> Date: Thu, 24 Oct 2019 14:55:21 -0600 Subject: [PATCH 193/705] Linking to external types - docgen (#549) * First version of addTypeAliasLinks that will scan TypeDoc HTML output and insert links to external library documentation. * Updated link for UserRecord and UserInfo * Resolving a few of Hiranya's comments. Removing unecessary debugging console log, JSDOM is now imported with one line, and Map of types and links is now created from a JSON file, Still need to resolve a couple of Hiranya's comments. * Ran npm run format:fix * Resolving more of Hiranya's comments. Loading JSON file uses 'require' rather than 'read file'. JSON file is now simpler. Script only replaces fully qualified names rather than aliases in document. * Adding comment as requested by thechenky. * Updating package.json to include JSDom module required by doc generation script. --- docgen/generate-docs.js | 34 ++++++++++++++++++++++++++++++++++ docgen/type-aliases.json | 5 +++++ package.json | 1 + 3 files changed, 40 insertions(+) create mode 100644 docgen/type-aliases.json diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index 299250e64..01275ae2d 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -39,6 +39,10 @@ const contentPath = path.resolve(`${__dirname}/content-sources`); const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`); const devsitePath = `/docs/reference/functions/`; +const { JSDOM } = require("jsdom"); + +const typeMap = require('./type-aliases.json'); + /** * Strips path prefix and returns only filename. * @param {string} path @@ -103,6 +107,7 @@ function renameFiles() { */ function fixLinks(file) { return fs.readFile(file, 'utf8').then(data => { + data = addTypeAliasLinks(data); const flattenedLinks = data .replace(/\.\.\//g, '') .replace(/(modules|interfaces|classes)\//g, '') @@ -116,6 +121,35 @@ function fixLinks(file) { }); } +/** + * Adds links to external documentation for type aliases that + * reference an external library. + * + * @param data File data to add external library links to. + */ +function addTypeAliasLinks(data) { + const htmlDom = new JSDOM(data); + /** + * Select .tsd-signature-type because all potential external + * links will have this identifier. + */ + const fileTags = htmlDom.window.document.querySelectorAll(".tsd-signature-type"); + fileTags.forEach(tag => { + const mapping = typeMap[tag.textContent]; + if (mapping) { + console.log('Adding link to '+tag.textContent+" documentation."); + + // Add the corresponding document link to this type + const linkChild = htmlDom.window.document.createElement('a'); + linkChild.setAttribute('href', mapping); + linkChild.textContent = tag.textContent; + tag.textContent = null; + tag.appendChild(linkChild); + } + }); + return htmlDom.serialize(); +} + let tocText = ''; /** diff --git a/docgen/type-aliases.json b/docgen/type-aliases.json new file mode 100644 index 000000000..240c50269 --- /dev/null +++ b/docgen/type-aliases.json @@ -0,0 +1,5 @@ +{ + "firebase.firestore.DocumentSnapshot": "https://googleapis.dev/nodejs/firestore/latest/DocumentSnapshot.html", + "firebase.auth.UserRecord": "https://firebase.google.com/docs/reference/admin/node/admin.auth.UserRecord.html", + "firebase.auth.UserInfo": "https://firebase.google.com/docs/reference/admin/node/admin.auth.UserInfo.html" +} diff --git a/package.json b/package.json index 70edbc1ab..b9d7e31fc 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "firebase-admin": "^8.2.0", "istanbul": "^0.4.5", "js-yaml": "^3.13.1", + "jsdom": "^15.2.0", "mocha": "^6.1.4", "mock-require": "^3.0.3", "mz": "^2.7.0", From fd04eec120637477b776f4a755716d33c26ba23e Mon Sep 17 00:00:00 2001 From: egilmorez Date: Thu, 31 Oct 2019 11:28:54 -0700 Subject: [PATCH 194/705] I persist in trying to fix links. (#577) --- src/cloud-functions.ts | 2 +- src/providers/analytics.ts | 5 +++-- src/providers/database.ts | 4 ++-- src/providers/pubsub.ts | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index e8d099dca..1309aba61 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -114,7 +114,7 @@ export interface EventContext { /** * An object containing the values of the wildcards in the `path` parameter - * provided to the [`ref()`](functions.database#.ref) method for a Realtime + * provided to the [`ref()`](providers_database_.html#ref) method for a Realtime * Database trigger. Cannot be accessed while inside the handler namespace. */ params: { [option: string]: any }; diff --git a/src/providers/analytics.ts b/src/providers/analytics.ts index 43578f8b6..2d57d6f5e 100644 --- a/src/providers/analytics.ts +++ b/src/providers/analytics.ts @@ -184,7 +184,7 @@ export class UserDimensions { * A map of user properties set with the * [`setUserProperty`](https://firebase.google.com/docs/analytics/android/properties) API. * - * All values are [`UserPropertyValue`](functions.analytics.UserPropertyValue) objects. + * All values are [`UserPropertyValue`](providers_analytics_.userpropertyvalue) objects. */ userProperties: { [key: string]: UserPropertyValue }; @@ -319,7 +319,8 @@ export interface DeviceInfo { /** * The time zone of the device when data was uploaded, as seconds skew from UTC. - * Use this to calculate the device's local time for [`event.timestamp`](functions.Event#timestamp). + * Use this to calculate the device's local time for + * [`EventContext.timestamp`](cloud_functions_eventcontext.html#timestamp). */ deviceTimeZoneOffsetSeconds: number; diff --git a/src/providers/database.ts b/src/providers/database.ts index 8a2f9453a..e648be20e 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -75,7 +75,7 @@ export function instance(instance: string) { * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component * in curly brackets (`{}`) is a wildcard that matches all strings. The value * that matched a certain invocation of a Cloud Function is returned as part - * of the [`event.params`](functions.EventContext#params) object. For + * of the [`EventContext.params`](cloud_functions_eventcontext.html#params object. For * example, `ref("messages/{messageId}")` matches changes at * `/messages/message1` or `/messages/message2`, resulting in * `event.params.messageId` being set to `"message1"` or `"message2"`, @@ -104,7 +104,7 @@ export function _instanceWithOptions( /** * The Firebase Realtime Database instance builder interface. * - * Access via [`functions.database.instance()`](functions.database#.instance). + * Access via [`database.instance()`](providers_database_.html#instance). */ export class InstanceBuilder { /** @hidden */ diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index d1a687819..aee9e6c17 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -112,7 +112,7 @@ export function _scheduleWithOptions( /** * The Google Cloud Pub/Sub topic builder. * - * Access via [`functions.pubsub.topic()`](functions.pubsub#.topic). + * Access via [`functions.pubsub.topic()`](providers_pubsub_.html#topic). */ export class TopicBuilder { /** @hidden */ From dd6cde1a6d4121e0a3a7bdef8a29a89c4b030f3e Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Fri, 8 Nov 2019 14:06:45 -0800 Subject: [PATCH 195/705] Update typescript in integration tests (#581) --- integration_test/package.node10.json | 2 +- integration_test/package.node8.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test/package.node10.json b/integration_test/package.node10.json index f45bab456..cf5eeeb25 100644 --- a/integration_test/package.node10.json +++ b/integration_test/package.node10.json @@ -14,7 +14,7 @@ }, "main": "lib/index.js", "devDependencies": { - "typescript": "~3.5.0" + "typescript": "~3.6.0" }, "engines": { "node": "10" diff --git a/integration_test/package.node8.json b/integration_test/package.node8.json index 777c11a89..8803f2fdc 100644 --- a/integration_test/package.node8.json +++ b/integration_test/package.node8.json @@ -14,7 +14,7 @@ }, "main": "lib/index.js", "devDependencies": { - "typescript": "~3.5.0" + "typescript": "~3.6.0" }, "engines": { "node": "8" From edcb35dd042cf350d50dfb618d60d0a5686e06fd Mon Sep 17 00:00:00 2001 From: egilmorez Date: Tue, 19 Nov 2019 10:01:41 -0800 Subject: [PATCH 196/705] Porting in minimal content for functions.config() reference (#582) * I persist in trying to fix links. * Adding comments for functions.config() along with a change that somehow evaded my last update to storage.ts. * Adding new entry for new config.Config.html file. * Removing circular link per review. --- docgen/content-sources/toc.yaml | 2 ++ src/config.ts | 13 +++++++++++-- src/providers/storage.ts | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 9ba761c15..378af2eef 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -20,6 +20,8 @@ toc: section: - title: 'Config' path: /docs/reference/functions/config_.config.html + - title: 'config.Config' + path: /docs/reference/functions/config_.config.config.html - title: 'functions.analytics' path: /docs/reference/functions/providers_analytics_.html diff --git a/src/config.ts b/src/config.ts index 9823b3746..8cd4d3dd1 100644 --- a/src/config.ts +++ b/src/config.ts @@ -29,9 +29,18 @@ export function config(): config.Config { return config.singleton; } +/** + * Store and retrieve project configuration data such as third-party API + * keys or other settings. You can set configuration values using the + * Firebase CLI as described in + * [Environment Configuration](/docs/functions/config-env). + */ export namespace config { - // Config type is usable as a object (dot notation allowed), and firebase - // property will also code complete. + /** + * The Functions configuration interface. + * + * Access via `functions.config()`. + */ export interface Config { [key: string]: any; } diff --git a/src/providers/storage.ts b/src/providers/storage.ts index 3ba98ea72..33b2a64eb 100644 --- a/src/providers/storage.ts +++ b/src/providers/storage.ts @@ -84,7 +84,7 @@ export function _objectWithOptions(options: DeploymentOptions): ObjectBuilder { /** * The Google Cloud Storage bucket builder interface. * - * Access via [`functions.storage.bucket()`](functions.storage#.bucket). + * Access via [`functions.storage.bucket()`](providers_storage_.html#bucket). */ export class BucketBuilder { /** @hidden */ @@ -107,7 +107,7 @@ export class BucketBuilder { /** * The Google Cloud Storage object builder interface. * - * Access via [`functions.storage.object()`](functions.storage#.object). + * Access via [`functions.storage.object()`](providers_storage_.html#object). */ export class ObjectBuilder { /** @hidden */ From 8039e0286eebb054275dae6763e50e76c2e05d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Wed, 27 Nov 2019 22:46:27 +0100 Subject: [PATCH 197/705] Allow specifying failure policies (#482) * Define an interface for FailurePolicy * Extract functions config to avoid dependency cycles, assign failure policy to triggers * Add a changelog entry * Update dependencies, minor version bump * Reformat * Fix a typo: allows -> allow * Avoid abbreviations to improve readability * Rename remaining Opts to Options * Add tests for specifying failure policy * Reformat * Change format of an entry in the changelog * Revert version bump * Extract configuration to break dependency cycle * Add comments to Schedule and ScheduleRetryConfig * Stricten regions definition * Fix tests broken due to strict typings * More strict types for regions - reverse order * Reformat * Remove unused import * Conform with npm formatting * Reintroduce unused variable to minimize diff size * Import lodash using _ exclusively * Kepp @hidden tags in one line if no other JSDoc is present * Fix a typo - sentence ending with a comma * Wrap JSDoc as specified in Google JavaScript Style Guide * Move memory lookup table to functions-configuration and stricten type definition * Move default failure policy to functions-configuration * Separate standarization of options from construction of the options object * Rephrase failure policy description * Rephrase description of memory and timeoutSeconds options * Simplify tests for invalid failure policies * Align public description of failure policies with a documentation of its interface * Add a missing dot in the Changelog * Minor stylistic changes to the documentation * Make a test case more understandable * Reformat --- changelog.txt | 1 + spec/function-builder.spec.ts | 42 +++++++++- spec/providers/auth.spec.ts | 4 +- src/cloud-functions.ts | 73 ++++++++++------- src/function-builder.ts | 148 +++++++++++++++++++++++----------- src/function-configuration.ts | 26 ++++++ 6 files changed, 212 insertions(+), 82 deletions(-) diff --git a/changelog.txt b/changelog.txt index e69de29bb..404ffb503 100644 --- a/changelog.txt +++ b/changelog.txt @@ -0,0 +1 @@ +feature - Allow specifying retry policies for event triggered functions. diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index b0c4d4c28..1ba12c7fa 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -79,14 +79,29 @@ describe('FunctionBuilder', () => { it('should allow valid runtime options to be set', () => { const fn = functions .runWith({ - timeoutSeconds: 90, + failurePolicy: { retry: {} }, memory: '256MB', + timeoutSeconds: 90, }) .auth.user() .onCreate((user) => user); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); + }); + + it("should apply a default failure policy if it's aliased with `true`", () => { + const fn = functions + .runWith({ + failurePolicy: true, + memory: '256MB', + timeoutSeconds: 90, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); }); it('should allow both supported region and valid runtime options to be set', () => { @@ -132,7 +147,26 @@ describe('FunctionBuilder', () => { functions .region('asia-northeast1') .runWith({ timeoutSeconds: 600, memory: '256MB' }); - }).to.throw(Error, 'TimeoutSeconds'); + }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); + }); + + it('should throw an error if user chooses a failurePolicy which is neither an object nor a boolean', () => { + expect(() => + functions.runWith({ + failurePolicy: (1234 as unknown) as functions.RuntimeOptions['failurePolicy'], + }) + ).to.throw( + Error, + 'RuntimeOptions.failurePolicy must be a boolean or an object' + ); + }); + + it('should throw an error if user chooses a failurePolicy.retry which is not an object', () => { + expect(() => + functions.runWith({ + failurePolicy: { retry: (1234 as unknown) as object }, + }) + ).to.throw(Error, 'RuntimeOptions.failurePolicy.retry'); }); it('should throw an error if user chooses an invalid memory allocation', () => { @@ -154,13 +188,13 @@ describe('FunctionBuilder', () => { return functions.runWith({ timeoutSeconds: 1000000, } as any); - }).to.throw(Error, 'TimeoutSeconds'); + }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); expect(() => { return functions.region('asia-east2').runWith({ timeoutSeconds: 1000000, } as any); - }).to.throw(Error, 'TimeoutSeconds'); + }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); }); it('should throw an error if user chooses an invalid region', () => { diff --git a/spec/providers/auth.spec.ts b/spec/providers/auth.spec.ts index 769bc03bf..bb2ab7761 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/providers/auth.spec.ts @@ -197,9 +197,7 @@ describe('Auth Functions', () => { }); describe('#onDelete', () => { - const cloudFunctionDelete: CloudFunction< - firebase.auth.UserRecord - > = functions.handler.auth.user.onDelete( + const cloudFunctionDelete: CloudFunction = functions.handler.auth.user.onDelete( (data: firebase.auth.UserRecord) => data ); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 1309aba61..b18c965d7 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -22,7 +22,13 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; -import { DeploymentOptions, Schedule } from './function-configuration'; +import { + DEFAULT_FAILURE_POLICY, + DeploymentOptions, + FailurePolicy, + MEMORY_LOOKUP, + Schedule, +} from './function-configuration'; export { Request, Response }; /** @hidden */ @@ -202,6 +208,7 @@ export namespace Change { if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); } + return Change.fromObjects( customizer(before || {}), customizer(json.after || {}) @@ -216,7 +223,8 @@ export namespace Change { ) { const before = _.assign({}, after); const masks = fieldMask.split(','); - _.forEach(masks, (mask) => { + + masks.forEach((mask) => { const val = _.get(sparseBefore, mask); if (typeof val === 'undefined') { _.unset(before, mask); @@ -224,6 +232,7 @@ export namespace Change { _.set(before, mask, val); } }); + return before; } } @@ -253,6 +262,7 @@ export interface TriggerAnnotated { resource: string; service: string; }; + failurePolicy?: FailurePolicy; httpsTrigger?: {}; labels?: { [key: string]: string }; regions?: string[]; @@ -312,6 +322,40 @@ export interface MakeCloudFunctionArgs { triggerResource: () => string; } +/** @hidden */ +export function optionsToTrigger({ + failurePolicy: failurePolicyOrAlias, + memory, + regions, + schedule, + timeoutSeconds, +}: DeploymentOptions): TriggerAnnotated['__trigger'] { + /* + * FailurePolicy can be aliased with a boolean value in the public API. + * Convert aliases `true` and `false` to a standardized interface. + */ + const failurePolicy: FailurePolicy | undefined = + failurePolicyOrAlias === false + ? undefined + : failurePolicyOrAlias === true + ? DEFAULT_FAILURE_POLICY + : failurePolicyOrAlias; + + const availableMemoryMb: number | undefined = + memory === undefined ? undefined : MEMORY_LOOKUP[memory]; + + const timeout: string | undefined = + timeoutSeconds === undefined ? undefined : `${timeoutSeconds}s`; + + return { + ...(failurePolicy === undefined ? {} : { failurePolicy }), + ...(availableMemoryMb === undefined ? {} : { availableMemoryMb }), + ...(regions === undefined ? {} : { regions }), + ...(schedule === undefined ? {} : { schedule }), + ...(timeout === undefined ? {} : { timeout }), + }; +} + /** @hidden */ export function makeCloudFunction({ after = () => {}, @@ -463,28 +507,3 @@ function _detectAuthType(event: Event) { } return 'UNAUTHENTICATED'; } - -/** @hidden */ -export function optionsToTrigger(options: DeploymentOptions) { - const trigger: any = {}; - if (options.regions) { - trigger.regions = options.regions; - } - if (options.timeoutSeconds) { - trigger.timeout = options.timeoutSeconds.toString() + 's'; - } - if (options.memory) { - const memoryLookup = { - '128MB': 128, - '256MB': 256, - '512MB': 512, - '1GB': 1024, - '2GB': 2048, - }; - trigger.availableMemoryMb = _.get(memoryLookup, options.memory); - } - if (options.schedule) { - trigger.schedule = options.schedule; - } - return trigger; -} diff --git a/src/function-builder.ts b/src/function-builder.ts index 580e0498b..13fd30990 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -27,6 +27,7 @@ import { CloudFunction, EventContext } from './cloud-functions'; import { DeploymentOptions, MAX_TIMEOUT_SECONDS, + MIN_TIMEOUT_SECONDS, RuntimeOptions, SUPPORTED_REGIONS, VALID_MEMORY_OPTIONS, @@ -45,28 +46,62 @@ import * as testLab from './providers/testLab'; /** * Assert that the runtime options passed in are valid. * @param runtimeOptions object containing memory and timeout information. - * @throws { Error } Memory and TimeoutSeconds values must be valid. + * @throws { Error } FailurePolicy, Memory and TimeoutSeconds values must be + * valid. */ -function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { - if ( - runtimeOptions.memory && - !_.includes(VALID_MEMORY_OPTIONS, runtimeOptions.memory) - ) { - throw new Error( - `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join( - ', ' - )}` - ); +function assertRuntimeOptionsValidity(runtimeOptions: RuntimeOptions): void { + if (_.isObjectLike(runtimeOptions) === false) { + throw new Error('RuntimeOptions must be an object.'); } - if ( - runtimeOptions.timeoutSeconds > MAX_TIMEOUT_SECONDS || - runtimeOptions.timeoutSeconds < 0 - ) { - throw new Error( - `TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}` - ); + + const { failurePolicy, memory, timeoutSeconds } = runtimeOptions; + + if (failurePolicy !== undefined) { + if ( + _.isBoolean(failurePolicy) === false && + _.isObjectLike(failurePolicy) === false + ) { + throw new Error( + `RuntimeOptions.failurePolicy must be a boolean or an object.` + ); + } + + if (typeof failurePolicy === 'object') { + if ( + _.isObjectLike(failurePolicy.retry) === false || + _.isEmpty(failurePolicy.retry) === false + ) { + throw new Error( + 'RuntimeOptions.failurePolicy.retry must be an empty object.' + ); + } + } + } + + if (memory !== undefined) { + if (_.includes(VALID_MEMORY_OPTIONS, memory) === false) { + throw new Error( + `RuntimeOptions.memory must be one of: ${VALID_MEMORY_OPTIONS.join( + ', ' + )}.` + ); + } + } + + if (timeoutSeconds !== undefined) { + if (typeof timeoutSeconds !== 'number') { + throw new Error('RuntimeOptions.timeoutSeconds must be a number.'); + } + + if ( + timeoutSeconds < MIN_TIMEOUT_SECONDS || + timeoutSeconds > MAX_TIMEOUT_SECONDS + ) { + throw new Error( + `RuntimeOptions.timeoutSeconds must be between ${MIN_TIMEOUT_SECONDS} and ${MAX_TIMEOUT_SECONDS}.` + ); + } } - return true; } /** @@ -74,16 +109,16 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { * @param regions list of regions. * @throws { Error } Regions must be in list of supported regions. */ -function assertRegionsAreValid(regions: string[]): boolean { - if (!regions.length) { - throw new Error('You must specify at least one region'); +function assertRegionsValidity(regions: string[]): void { + if (regions.length === 0) { + throw new Error('You must specify at least one region.'); } - if (_.difference(regions, SUPPORTED_REGIONS).length) { + + if (_.difference(regions, SUPPORTED_REGIONS).length !== 0) { throw new Error( - `The only valid regions are: ${SUPPORTED_REGIONS.join(', ')}` + `The only valid regions are: ${SUPPORTED_REGIONS.join(', ')}.` ); } - return true; } /** @@ -97,23 +132,27 @@ function assertRegionsAreValid(regions: string[]): boolean { export function region( ...regions: Array ): FunctionBuilder { - if (assertRegionsAreValid(regions)) { - return new FunctionBuilder({ regions }); - } + assertRegionsValidity(regions); + + return new FunctionBuilder({ regions }); } /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. memory: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 2. timeoutSeconds: timeout for the function in seconds, possible values are - * 0 to 540. + * 1. failurePolicy: failure policy of the function, with boolean `true` being + * equivalent to providing an empty retry object. + * 2. memory: amount of memory to allocate to the function, with possible + * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 3. timeoutSeconds: timeout for the function in seconds, with possible + * values being 0 to 540. + * + * Value must not be null. */ export function runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { - if (assertRuntimeOptionsValid(runtimeOptions)) { - return new FunctionBuilder(runtimeOptions); - } + assertRuntimeOptionsValidity(runtimeOptions); + + return new FunctionBuilder(runtimeOptions); } export class FunctionBuilder { @@ -128,28 +167,40 @@ export class FunctionBuilder { * functions.region('us-east1', 'us-central1') */ region(...regions: Array): FunctionBuilder { - if (assertRegionsAreValid(regions)) { - this.options.regions = regions; - return this; - } + assertRegionsValidity(regions); + + this.options.regions = regions; + + return this; } /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. memory: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 2. timeoutSeconds: timeout for the function in seconds, possible values are - * 0 to 540. + * 1. failurePolicy: failure policy of the function, with boolean `true` being + * equivalent to providing an empty retry object. + * 2. memory: amount of memory to allocate to the function, with possible + * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 3. timeoutSeconds: timeout for the function in seconds, with possible + * values being 0 to 540. + * + * Value must not be null. */ runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { - if (assertRuntimeOptionsValid(runtimeOptions)) { - this.options = _.assign(this.options, runtimeOptions); - return this; - } + assertRuntimeOptionsValidity(runtimeOptions); + + this.options = _.assign(this.options, runtimeOptions); + + return this; } get https() { + if (this.options.failurePolicy !== undefined) { + console.warn( + 'RuntimeOptions.failurePolicy is not supported in https functions.' + ); + } + return { /** * Handle HTTP requests. @@ -161,7 +212,8 @@ export class FunctionBuilder { ) => https._onRequestWithOptions(handler, this.options), /** * Declares a callable method for clients to call using a Firebase SDK. - * @param handler A method that takes a data and context and returns a value. + * @param handler A method that takes a data and context and returns + * a value. */ onCall: ( handler: ( diff --git a/src/function-configuration.ts b/src/function-configuration.ts index ec1695ccd..f3883155b 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -32,6 +32,19 @@ export const VALID_MEMORY_OPTIONS = [ '2GB', ] as const; +/** + * A mapping of memory options to its representation in the Cloud Functions API. + */ +export const MEMORY_LOOKUP: { + [Name in typeof VALID_MEMORY_OPTIONS[number]]: number; +} = { + '128MB': 128, + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, +}; + /** * Scheduler retry options. Applies only to scheduled functions. */ @@ -52,7 +65,20 @@ export interface Schedule { retryConfig?: ScheduleRetryConfig; } +export interface FailurePolicy { + retry: {}; +} + +export const DEFAULT_FAILURE_POLICY: FailurePolicy = { + retry: {}, +}; + export interface RuntimeOptions { + /** + * Failure policy of the function, with boolean `true` being equivalent to + * providing an empty retry object. + */ + failurePolicy?: FailurePolicy | boolean; /** * Amount of memory to allocate to the function. */ From 9df27f44c0c96b3dc83e2e30ee93ff45809e8374 Mon Sep 17 00:00:00 2001 From: Tina Liang Date: Mon, 13 Jan 2020 11:52:31 -0800 Subject: [PATCH 198/705] adding scheduled function to handler builder (#230) * adding scheduled function to handler builder --- spec/providers/pubsub.spec.ts | 106 +++++++++++++++++++++++----------- src/handler-builder.ts | 6 ++ src/providers/pubsub.ts | 99 ++++++++++++++++--------------- 3 files changed, 131 insertions(+), 80 deletions(-) diff --git a/spec/providers/pubsub.spec.ts b/spec/providers/pubsub.spec.ts index 53776c357..f64cd2119 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/providers/pubsub.spec.ts @@ -311,45 +311,83 @@ describe('Pubsub Functions', () => { describe('handler namespace', () => { describe('#onPublish', () => { - it('should return an empty trigger', () => { - const result = functions.handler.pubsub.topic.onPublish(() => null); - expect(result.__trigger).to.deep.equal({}); - }); + describe('#topic', () => { + it('should return an empty trigger', () => { + const result = functions.handler.pubsub.topic.onPublish(() => null); + expect(result.__trigger).to.deep.equal({}); + }); - it('should properly handle a new-style event', () => { - const raw = new Buffer('{"hello":"world"}', 'utf8').toString('base64'); - const event = { - data: { - data: raw, - attributes: { - foo: 'bar', + it('should properly handle a new-style event', () => { + const raw = new Buffer('{"hello":"world"}', 'utf8').toString( + 'base64' + ); + const event = { + data: { + data: raw, + attributes: { + foo: 'bar', + }, }, - }, - context: { - eventId: '70172329041928', - timestamp: '2018-04-09T07:56:12.975Z', - eventType: 'google.pubsub.topic.publish', - resource: { - service: 'pubsub.googleapis.com', - name: 'projects/project1/topics/toppy', + context: { + eventId: '70172329041928', + timestamp: '2018-04-09T07:56:12.975Z', + eventType: 'google.pubsub.topic.publish', + resource: { + service: 'pubsub.googleapis.com', + name: 'projects/project1/topics/toppy', + }, }, - }, - }; - - const result = functions.handler.pubsub.topic.onPublish((data) => { - return { - raw: data.data, - json: data.json, - attributes: data.attributes, }; - }); - return expect( - result(event.data, event.context) - ).to.eventually.deep.equal({ - raw, - json: { hello: 'world' }, - attributes: { foo: 'bar' }, + const result = functions.handler.pubsub.topic.onPublish((data) => { + return { + raw: data.data, + json: data.json, + attributes: data.attributes, + }; + }); + + return expect( + result(event.data, event.context) + ).to.eventually.deep.equal({ + raw, + json: { hello: 'world' }, + attributes: { foo: 'bar' }, + }); + }); + }); + describe('#schedule', () => { + it('should return an empty trigger', () => { + const result = functions.handler.pubsub.schedule.onRun(() => null); + expect(result.__trigger).to.deep.equal({}); + }); + it('should return a handler with a proper event context', () => { + const raw = new Buffer('{"hello":"world"}', 'utf8').toString( + 'base64' + ); + const event = { + data: { + data: raw, + attributes: { + foo: 'bar', + }, + }, + context: { + eventId: '70172329041928', + timestamp: '2018-04-09T07:56:12.975Z', + eventType: 'google.pubsub.topic.publish', + resource: { + service: 'pubsub.googleapis.com', + name: 'projects/project1/topics/toppy', + }, + }, + }; + const result = functions.handler.pubsub.schedule.onRun( + (context) => context.eventId + ); + return expect(result(event.data, event.context)).to.eventually.equal( + '70172329041928' + ); }); }); }); diff --git a/src/handler-builder.ts b/src/handler-builder.ts index 22b2268aa..5d7c122d7 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -201,6 +201,12 @@ export class HandlerBuilder { get topic() { return new pubsub.TopicBuilder(() => null, {}); }, + /** + * Handle periodic events triggered by Cloud Scheduler. + */ + get schedule() { + return new pubsub.ScheduleBuilder(() => null, {}); + }, }; } diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index aee9e6c17..0f12f669c 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -63,52 +63,6 @@ export function _topicWithOptions( }, options); } -export function schedule(schedule: string): ScheduleBuilder { - return _scheduleWithOptions(schedule, {}); -} - -export class ScheduleBuilder { - /** @hidden */ - constructor(private options: DeploymentOptions) {} - - retryConfig(config: ScheduleRetryConfig): ScheduleBuilder { - this.options.schedule.retryConfig = config; - return this; - } - - timeZone(timeZone: string): ScheduleBuilder { - this.options.schedule.timeZone = timeZone; - return this; - } - - onRun(handler: (context: EventContext) => PromiseLike | any) { - const triggerResource = () => { - if (!process.env.GCLOUD_PROJECT) { - throw new Error('process.env.GCLOUD_PROJECT is not set.'); - } - return `projects/${process.env.GCLOUD_PROJECT}/topics`; // The CLI will append the correct topic name based on region and function name - }; - const cloudFunction = makeCloudFunction({ - contextOnlyHandler: handler, - provider, - service, - triggerResource, - eventType: 'topic.publish', - options: this.options, - labels: { 'deployment-scheduled': 'true' }, - }); - return cloudFunction; - } -} - -/** @hidden */ -export function _scheduleWithOptions( - schedule: string, - options: DeploymentOptions -): ScheduleBuilder { - return new ScheduleBuilder({ ...options, schedule: { schedule } }); -} - /** * The Google Cloud Pub/Sub topic builder. * @@ -144,6 +98,59 @@ export class TopicBuilder { } } +export function schedule(schedule: string): ScheduleBuilder { + return _scheduleWithOptions(schedule, {}); +} + +/** @hidden */ +export function _scheduleWithOptions( + schedule: string, + options: DeploymentOptions +): ScheduleBuilder { + const triggerResource = () => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error('process.env.GCLOUD_PROJECT is not set.'); + } + // The CLI will append the correct topic name based on region and function name + return `projects/${process.env.GCLOUD_PROJECT}/topics`; + }; + return new ScheduleBuilder(triggerResource, { + ...options, + schedule: { schedule }, + }); +} + +export class ScheduleBuilder { + /** @hidden */ + constructor( + private triggerResource: () => string, + private options: DeploymentOptions + ) {} + + retryConfig(config: ScheduleRetryConfig): ScheduleBuilder { + this.options.schedule.retryConfig = config; + return this; + } + + timeZone(timeZone: string): ScheduleBuilder { + this.options.schedule.timeZone = timeZone; + return this; + } + + onRun(handler: (context: EventContext) => PromiseLike | any) { + const cloudFunction = makeCloudFunction({ + contextOnlyHandler: handler, + provider, + service, + triggerResource: this.triggerResource, + eventType: 'topic.publish', + options: this.options, + labels: { 'deployment-scheduled': 'true' }, + }); + return cloudFunction; + } +} + /** * Interface representing a Google Cloud Pub/Sub message. * From ae902790ecc53ee6344726c08af4255adc0de783 Mon Sep 17 00:00:00 2001 From: Kevin Jian Date: Wed, 5 Feb 2020 12:50:06 -0800 Subject: [PATCH 199/705] Update type to fix tests (#620) --- spec/fixtures/mockrequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index 2139c71ce..fff2ce1a9 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -68,7 +68,7 @@ export function mockFetchPublicKeys(): nock.Scope { */ export function generateIdToken(projectId: string): string { const claims = {}; - const options = { + const options: jwt.SignOptions = { audience: projectId, expiresIn: 60 * 60, // 1 hour in seconds issuer: 'https://securetoken.google.com/' + projectId, From d9fc8a6bb6e6a34e478bb6de98c64514e16ff1fa Mon Sep 17 00:00:00 2001 From: Tina Liang Date: Wed, 5 Feb 2020 14:37:44 -0800 Subject: [PATCH 200/705] Revert "Allow specifying failure policies" (#623) * Revert "Allow specifying failure policies (#482) --- changelog.txt | 1 - spec/function-builder.spec.ts | 42 +--------- src/cloud-functions.ts | 73 +++++++---------- src/function-builder.ts | 148 +++++++++++----------------------- src/function-configuration.ts | 26 ------ 5 files changed, 79 insertions(+), 211 deletions(-) diff --git a/changelog.txt b/changelog.txt index 404ffb503..e69de29bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +0,0 @@ -feature - Allow specifying retry policies for event triggered functions. diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 1ba12c7fa..b0c4d4c28 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -79,29 +79,14 @@ describe('FunctionBuilder', () => { it('should allow valid runtime options to be set', () => { const fn = functions .runWith({ - failurePolicy: { retry: {} }, - memory: '256MB', timeoutSeconds: 90, + memory: '256MB', }) .auth.user() .onCreate((user) => user); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); - expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); - }); - - it("should apply a default failure policy if it's aliased with `true`", () => { - const fn = functions - .runWith({ - failurePolicy: true, - memory: '256MB', - timeoutSeconds: 90, - }) - .auth.user() - .onCreate((user) => user); - - expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); }); it('should allow both supported region and valid runtime options to be set', () => { @@ -147,26 +132,7 @@ describe('FunctionBuilder', () => { functions .region('asia-northeast1') .runWith({ timeoutSeconds: 600, memory: '256MB' }); - }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); - }); - - it('should throw an error if user chooses a failurePolicy which is neither an object nor a boolean', () => { - expect(() => - functions.runWith({ - failurePolicy: (1234 as unknown) as functions.RuntimeOptions['failurePolicy'], - }) - ).to.throw( - Error, - 'RuntimeOptions.failurePolicy must be a boolean or an object' - ); - }); - - it('should throw an error if user chooses a failurePolicy.retry which is not an object', () => { - expect(() => - functions.runWith({ - failurePolicy: { retry: (1234 as unknown) as object }, - }) - ).to.throw(Error, 'RuntimeOptions.failurePolicy.retry'); + }).to.throw(Error, 'TimeoutSeconds'); }); it('should throw an error if user chooses an invalid memory allocation', () => { @@ -188,13 +154,13 @@ describe('FunctionBuilder', () => { return functions.runWith({ timeoutSeconds: 1000000, } as any); - }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); + }).to.throw(Error, 'TimeoutSeconds'); expect(() => { return functions.region('asia-east2').runWith({ timeoutSeconds: 1000000, } as any); - }).to.throw(Error, 'RuntimeOptions.timeoutSeconds'); + }).to.throw(Error, 'TimeoutSeconds'); }); it('should throw an error if user chooses an invalid region', () => { diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index b18c965d7..1309aba61 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -22,13 +22,7 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; -import { - DEFAULT_FAILURE_POLICY, - DeploymentOptions, - FailurePolicy, - MEMORY_LOOKUP, - Schedule, -} from './function-configuration'; +import { DeploymentOptions, Schedule } from './function-configuration'; export { Request, Response }; /** @hidden */ @@ -208,7 +202,6 @@ export namespace Change { if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); } - return Change.fromObjects( customizer(before || {}), customizer(json.after || {}) @@ -223,8 +216,7 @@ export namespace Change { ) { const before = _.assign({}, after); const masks = fieldMask.split(','); - - masks.forEach((mask) => { + _.forEach(masks, (mask) => { const val = _.get(sparseBefore, mask); if (typeof val === 'undefined') { _.unset(before, mask); @@ -232,7 +224,6 @@ export namespace Change { _.set(before, mask, val); } }); - return before; } } @@ -262,7 +253,6 @@ export interface TriggerAnnotated { resource: string; service: string; }; - failurePolicy?: FailurePolicy; httpsTrigger?: {}; labels?: { [key: string]: string }; regions?: string[]; @@ -322,40 +312,6 @@ export interface MakeCloudFunctionArgs { triggerResource: () => string; } -/** @hidden */ -export function optionsToTrigger({ - failurePolicy: failurePolicyOrAlias, - memory, - regions, - schedule, - timeoutSeconds, -}: DeploymentOptions): TriggerAnnotated['__trigger'] { - /* - * FailurePolicy can be aliased with a boolean value in the public API. - * Convert aliases `true` and `false` to a standardized interface. - */ - const failurePolicy: FailurePolicy | undefined = - failurePolicyOrAlias === false - ? undefined - : failurePolicyOrAlias === true - ? DEFAULT_FAILURE_POLICY - : failurePolicyOrAlias; - - const availableMemoryMb: number | undefined = - memory === undefined ? undefined : MEMORY_LOOKUP[memory]; - - const timeout: string | undefined = - timeoutSeconds === undefined ? undefined : `${timeoutSeconds}s`; - - return { - ...(failurePolicy === undefined ? {} : { failurePolicy }), - ...(availableMemoryMb === undefined ? {} : { availableMemoryMb }), - ...(regions === undefined ? {} : { regions }), - ...(schedule === undefined ? {} : { schedule }), - ...(timeout === undefined ? {} : { timeout }), - }; -} - /** @hidden */ export function makeCloudFunction({ after = () => {}, @@ -507,3 +463,28 @@ function _detectAuthType(event: Event) { } return 'UNAUTHENTICATED'; } + +/** @hidden */ +export function optionsToTrigger(options: DeploymentOptions) { + const trigger: any = {}; + if (options.regions) { + trigger.regions = options.regions; + } + if (options.timeoutSeconds) { + trigger.timeout = options.timeoutSeconds.toString() + 's'; + } + if (options.memory) { + const memoryLookup = { + '128MB': 128, + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, + }; + trigger.availableMemoryMb = _.get(memoryLookup, options.memory); + } + if (options.schedule) { + trigger.schedule = options.schedule; + } + return trigger; +} diff --git a/src/function-builder.ts b/src/function-builder.ts index 13fd30990..580e0498b 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -27,7 +27,6 @@ import { CloudFunction, EventContext } from './cloud-functions'; import { DeploymentOptions, MAX_TIMEOUT_SECONDS, - MIN_TIMEOUT_SECONDS, RuntimeOptions, SUPPORTED_REGIONS, VALID_MEMORY_OPTIONS, @@ -46,62 +45,28 @@ import * as testLab from './providers/testLab'; /** * Assert that the runtime options passed in are valid. * @param runtimeOptions object containing memory and timeout information. - * @throws { Error } FailurePolicy, Memory and TimeoutSeconds values must be - * valid. + * @throws { Error } Memory and TimeoutSeconds values must be valid. */ -function assertRuntimeOptionsValidity(runtimeOptions: RuntimeOptions): void { - if (_.isObjectLike(runtimeOptions) === false) { - throw new Error('RuntimeOptions must be an object.'); - } - - const { failurePolicy, memory, timeoutSeconds } = runtimeOptions; - - if (failurePolicy !== undefined) { - if ( - _.isBoolean(failurePolicy) === false && - _.isObjectLike(failurePolicy) === false - ) { - throw new Error( - `RuntimeOptions.failurePolicy must be a boolean or an object.` - ); - } - - if (typeof failurePolicy === 'object') { - if ( - _.isObjectLike(failurePolicy.retry) === false || - _.isEmpty(failurePolicy.retry) === false - ) { - throw new Error( - 'RuntimeOptions.failurePolicy.retry must be an empty object.' - ); - } - } - } - - if (memory !== undefined) { - if (_.includes(VALID_MEMORY_OPTIONS, memory) === false) { - throw new Error( - `RuntimeOptions.memory must be one of: ${VALID_MEMORY_OPTIONS.join( - ', ' - )}.` - ); - } +function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { + if ( + runtimeOptions.memory && + !_.includes(VALID_MEMORY_OPTIONS, runtimeOptions.memory) + ) { + throw new Error( + `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join( + ', ' + )}` + ); } - - if (timeoutSeconds !== undefined) { - if (typeof timeoutSeconds !== 'number') { - throw new Error('RuntimeOptions.timeoutSeconds must be a number.'); - } - - if ( - timeoutSeconds < MIN_TIMEOUT_SECONDS || - timeoutSeconds > MAX_TIMEOUT_SECONDS - ) { - throw new Error( - `RuntimeOptions.timeoutSeconds must be between ${MIN_TIMEOUT_SECONDS} and ${MAX_TIMEOUT_SECONDS}.` - ); - } + if ( + runtimeOptions.timeoutSeconds > MAX_TIMEOUT_SECONDS || + runtimeOptions.timeoutSeconds < 0 + ) { + throw new Error( + `TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}` + ); } + return true; } /** @@ -109,16 +74,16 @@ function assertRuntimeOptionsValidity(runtimeOptions: RuntimeOptions): void { * @param regions list of regions. * @throws { Error } Regions must be in list of supported regions. */ -function assertRegionsValidity(regions: string[]): void { - if (regions.length === 0) { - throw new Error('You must specify at least one region.'); +function assertRegionsAreValid(regions: string[]): boolean { + if (!regions.length) { + throw new Error('You must specify at least one region'); } - - if (_.difference(regions, SUPPORTED_REGIONS).length !== 0) { + if (_.difference(regions, SUPPORTED_REGIONS).length) { throw new Error( - `The only valid regions are: ${SUPPORTED_REGIONS.join(', ')}.` + `The only valid regions are: ${SUPPORTED_REGIONS.join(', ')}` ); } + return true; } /** @@ -132,27 +97,23 @@ function assertRegionsValidity(regions: string[]): void { export function region( ...regions: Array ): FunctionBuilder { - assertRegionsValidity(regions); - - return new FunctionBuilder({ regions }); + if (assertRegionsAreValid(regions)) { + return new FunctionBuilder({ regions }); + } } /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. failurePolicy: failure policy of the function, with boolean `true` being - * equivalent to providing an empty retry object. - * 2. memory: amount of memory to allocate to the function, with possible - * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 3. timeoutSeconds: timeout for the function in seconds, with possible - * values being 0 to 540. - * - * Value must not be null. + * 1. memory: amount of memory to allocate to the function, possible values + * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 2. timeoutSeconds: timeout for the function in seconds, possible values are + * 0 to 540. */ export function runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { - assertRuntimeOptionsValidity(runtimeOptions); - - return new FunctionBuilder(runtimeOptions); + if (assertRuntimeOptionsValid(runtimeOptions)) { + return new FunctionBuilder(runtimeOptions); + } } export class FunctionBuilder { @@ -167,40 +128,28 @@ export class FunctionBuilder { * functions.region('us-east1', 'us-central1') */ region(...regions: Array): FunctionBuilder { - assertRegionsValidity(regions); - - this.options.regions = regions; - - return this; + if (assertRegionsAreValid(regions)) { + this.options.regions = regions; + return this; + } } /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. failurePolicy: failure policy of the function, with boolean `true` being - * equivalent to providing an empty retry object. - * 2. memory: amount of memory to allocate to the function, with possible - * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 3. timeoutSeconds: timeout for the function in seconds, with possible - * values being 0 to 540. - * - * Value must not be null. + * 1. memory: amount of memory to allocate to the function, possible values + * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 2. timeoutSeconds: timeout for the function in seconds, possible values are + * 0 to 540. */ runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { - assertRuntimeOptionsValidity(runtimeOptions); - - this.options = _.assign(this.options, runtimeOptions); - - return this; + if (assertRuntimeOptionsValid(runtimeOptions)) { + this.options = _.assign(this.options, runtimeOptions); + return this; + } } get https() { - if (this.options.failurePolicy !== undefined) { - console.warn( - 'RuntimeOptions.failurePolicy is not supported in https functions.' - ); - } - return { /** * Handle HTTP requests. @@ -212,8 +161,7 @@ export class FunctionBuilder { ) => https._onRequestWithOptions(handler, this.options), /** * Declares a callable method for clients to call using a Firebase SDK. - * @param handler A method that takes a data and context and returns - * a value. + * @param handler A method that takes a data and context and returns a value. */ onCall: ( handler: ( diff --git a/src/function-configuration.ts b/src/function-configuration.ts index f3883155b..ec1695ccd 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -32,19 +32,6 @@ export const VALID_MEMORY_OPTIONS = [ '2GB', ] as const; -/** - * A mapping of memory options to its representation in the Cloud Functions API. - */ -export const MEMORY_LOOKUP: { - [Name in typeof VALID_MEMORY_OPTIONS[number]]: number; -} = { - '128MB': 128, - '256MB': 256, - '512MB': 512, - '1GB': 1024, - '2GB': 2048, -}; - /** * Scheduler retry options. Applies only to scheduled functions. */ @@ -65,20 +52,7 @@ export interface Schedule { retryConfig?: ScheduleRetryConfig; } -export interface FailurePolicy { - retry: {}; -} - -export const DEFAULT_FAILURE_POLICY: FailurePolicy = { - retry: {}, -}; - export interface RuntimeOptions { - /** - * Failure policy of the function, with boolean `true` being equivalent to - * providing an empty retry object. - */ - failurePolicy?: FailurePolicy | boolean; /** * Amount of memory to allocate to the function. */ From 2940a4b5230e6469ebca3102b11d45915a3a8939 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 19 Mar 2020 10:40:58 -0700 Subject: [PATCH 201/705] Use process.env.PWD for finding .runtimeconfig.json (#634) --- CHANGELOG.md | 4 ++++ changelog.txt | 0 spec/config.spec.ts | 12 +++++++++--- src/config.ts | 15 +++++++++------ 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 changelog.txt diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..69ffc7120 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +**IMPORTANT: Please update to this version of `firebase-functions` if you are using Node.js 10 functions, otherwise your functions will break in production.** + +- Prevents deployment and runtime issues caused by upcoming changes to Cloud Functions infrastructure for Node.js 10 functions. (Issue #630) +- Adds support for writing scheduled functions under handler namespace. diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/config.spec.ts b/spec/config.spec.ts index 64963be4e..b721dc3a5 100644 --- a/spec/config.spec.ts +++ b/spec/config.spec.ts @@ -25,6 +25,12 @@ import * as mockRequire from 'mock-require'; import { config, firebaseConfig } from '../src/config'; describe('config()', () => { + before(() => { + process.env.PWD = '/srv'; + }); + after(() => { + delete process.env.PWD; + }); afterEach(() => { mockRequire.stopAll(); delete config.singleton; @@ -33,19 +39,19 @@ describe('config()', () => { }); it('loads config values from .runtimeconfig.json', () => { - mockRequire('../../../.runtimeconfig.json', { foo: 'bar', firebase: {} }); + mockRequire('/srv/.runtimeconfig.json', { foo: 'bar', firebase: {} }); const loaded = config(); expect(loaded).to.not.have.property('firebase'); expect(loaded).to.have.property('foo', 'bar'); }); it('does not provide firebase config if .runtimeconfig.json not invalid', () => { - mockRequire('../../../.runtimeconfig.json', 'does-not-exist'); + mockRequire('/srv/.runtimeconfig.json', 'does-not-exist'); expect(firebaseConfig()).to.be.null; }); it('does not provide firebase config if .ruuntimeconfig.json has no firebase property', () => { - mockRequire('../../../.runtimeconfig.json', {}); + mockRequire('/srv/.runtimeconfig.json', {}); expect(firebaseConfig()).to.be.null; }); diff --git a/src/config.ts b/src/config.ts index 8cd4d3dd1..8925ff940 100644 --- a/src/config.ts +++ b/src/config.ts @@ -21,6 +21,7 @@ // SOFTWARE. import * as firebase from 'firebase-admin'; +import * as path from 'path'; export function config(): config.Config { if (typeof config.singleton === 'undefined') { @@ -68,9 +69,10 @@ export function firebaseConfig(): firebase.AppOptions | null { // Could have Runtime Config with Firebase in it as an ENV location or default. try { - const path = - process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; - const config = require(path); + const configPath = + process.env.CLOUD_RUNTIME_CONFIG || + path.join(process.env.PWD, '.runtimeconfig.json'); + const config = require(configPath); if (config.firebase) { return config.firebase; } @@ -92,9 +94,10 @@ function init() { } try { - const path = - process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json'; - const parsed = require(path); + const configPath = + process.env.CLOUD_RUNTIME_CONFIG || + path.join(process.env.PWD, '.runtimeconfig.json'); + const parsed = require(configPath); delete parsed.firebase; config.singleton = parsed; return; From 6873662f9814ed9262f0b2ac606bde1b3d1e0aea Mon Sep 17 00:00:00 2001 From: Bryan Kendall Date: Thu, 19 Mar 2020 11:02:30 -0700 Subject: [PATCH 202/705] New Publish Path (#231) --- package.json | 7 +- scripts/publish-container/Dockerfile | 12 ++ scripts/publish-container/cloudbuild.yaml | 4 + scripts/publish.sh | 135 ++++++++++++++++++++++ scripts/publish/cloudbuild.yaml | 114 ++++++++++++++++++ scripts/publish/deploy_key.enc | Bin 0 -> 3505 bytes scripts/publish/hub.enc | Bin 0 -> 191 bytes scripts/publish/npmrc.enc | Bin 0 -> 185 bytes scripts/publish/twitter.json.enc | Bin 0 -> 337 bytes scripts/tweet.js | 52 +++++++++ 10 files changed, 322 insertions(+), 2 deletions(-) create mode 100644 scripts/publish-container/Dockerfile create mode 100644 scripts/publish-container/cloudbuild.yaml create mode 100644 scripts/publish.sh create mode 100644 scripts/publish/cloudbuild.yaml create mode 100644 scripts/publish/deploy_key.enc create mode 100644 scripts/publish/hub.enc create mode 100644 scripts/publish/npmrc.enc create mode 100644 scripts/publish/twitter.json.enc create mode 100644 scripts/tweet.js diff --git a/package.json b/package.json index b9d7e31fc..35f0517b7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/firebase/firebase-functions.git" + "url": "https://github.com/firebase/firebase-functions.git" }, "license": "MIT", "author": "Firebase Team", @@ -23,10 +23,13 @@ ], "main": "lib/index.js", "types": "lib/index.d.ts", + "publishConfig": { + "registry": "https://wombat-dressing-room.appspot.com" + }, "scripts": { "apidocs": "node docgen/generate-docs.js", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", - "build:release": "npm install --production && npm install typescript firebase-admin && tsc -p tsconfig.release.json", + "build:release": "npm install --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", "format": "prettier --check '**/*.{json,md,ts,yml,yaml}'", "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", diff --git a/scripts/publish-container/Dockerfile b/scripts/publish-container/Dockerfile new file mode 100644 index 000000000..c8ba24c12 --- /dev/null +++ b/scripts/publish-container/Dockerfile @@ -0,0 +1,12 @@ +FROM node:8 + +# Install dependencies +RUN apt-get update && \ + apt-get install -y curl git jq + +# Install npm at latest. +RUN npm install --global npm@latest + +# Install hub +RUN curl -fsSL --output hub.tgz https://github.com/github/hub/releases/download/v2.13.0/hub-linux-amd64-2.13.0.tgz +RUN tar --strip-components=2 -C /usr/bin -xf hub.tgz hub-linux-amd64-2.13.0/bin/hub diff --git a/scripts/publish-container/cloudbuild.yaml b/scripts/publish-container/cloudbuild.yaml new file mode 100644 index 000000000..7a99a8cab --- /dev/null +++ b/scripts/publish-container/cloudbuild.yaml @@ -0,0 +1,4 @@ +steps: + - name: 'gcr.io/cloud-builders/docker' + args: ['build', '-t', 'gcr.io/$PROJECT_ID/package-builder', '.'] +images: ['gcr.io/$PROJECT_ID/package-builder'] diff --git a/scripts/publish.sh b/scripts/publish.sh new file mode 100644 index 000000000..a1498460e --- /dev/null +++ b/scripts/publish.sh @@ -0,0 +1,135 @@ +#!/bin/bash +set -e + +printusage() { + echo "publish.sh " + echo "REPOSITORY_ORG and REPOSITORY_NAME should be set in the environment." + echo "e.g. REPOSITORY_ORG=user, REPOSITORY_NAME=repo" + echo "" + echo "Arguments:" + echo " version: 'patch', 'minor', or 'major'." +} + +VERSION=$1 +if [[ $VERSION == "" ]]; then + printusage + exit 1 +elif [[ ! ($VERSION == "patch" || $VERSION == "minor" || $VERSION == "major") ]]; then + printusage + exit 1 +fi + +if [[ $REPOSITORY_ORG == "" ]]; then + printusage + exit 1 +fi +if [[ $REPOSITORY_NAME == "" ]]; then + printusage + exit 1 +fi + +WDIR=$(pwd) + +echo "Checking for commands..." +trap "echo 'Missing hub.'; exit 1" ERR +which hub &> /dev/null +trap - ERR + +trap "echo 'Missing node.'; exit 1" ERR +which node &> /dev/null +trap - ERR + +trap "echo 'Missing jq.'; exit 1" ERR +which jq &> /dev/null +trap - ERR +echo "Checked for commands." + +echo "Checking for Twitter credentials..." +trap "echo 'Missing Twitter credentials.'; exit 1" ERR +test -f "${WDIR}/scripts/twitter.json" +trap - ERR +echo "Checked for Twitter credentials..." + +echo "Checking for logged-in npm user..." +trap "echo 'Please login to npm using \`npm login --registry https://wombat-dressing-room.appspot.com\`'; exit 1" ERR +npm whoami --registry https://wombat-dressing-room.appspot.com +trap - ERR +echo "Checked for logged-in npm user." + +echo "Moving to temporary directory.." +TEMPDIR=$(mktemp -d) +echo "[DEBUG] ${TEMPDIR}" +cd "${TEMPDIR}" +echo "Moved to temporary directory." + +echo "Cloning repository..." +git clone "git@github.com:${REPOSITORY_ORG}/${REPOSITORY_NAME}.git" +cd "${REPOSITORY_NAME}" +echo "Cloned repository." + +echo "Making sure there is a changelog..." +if [ ! -s CHANGELOG.md ]; then + echo "CHANGELOG.md is empty. aborting." + exit 1 +fi +echo "Made sure there is a changelog." + +echo "Running npm install..." +npm install +echo "Ran npm install." + +echo "Running tests..." +npm test +echo "Ran tests." + +echo "Running publish build..." +npm run build:release +echo "Ran publish build." + +echo "Making a $VERSION version..." +npm version $VERSION +NEW_VERSION=$(jq -r ".version" package.json) +echo "Made a $VERSION version." + +echo "Making the release notes..." +RELEASE_NOTES_FILE=$(mktemp) +echo "[DEBUG] ${RELEASE_NOTES_FILE}" +echo "v${NEW_VERSION}" >> "${RELEASE_NOTES_FILE}" +echo "" >> "${RELEASE_NOTES_FILE}" +cat CHANGELOG.md >> "${RELEASE_NOTES_FILE}" +echo "Made the release notes." + +echo "Publishing to npm..." +if [[ $DRY_RUN == "" ]]; then + npm publish +else + echo "DRY RUN: running publish with --dry-run" + npm publish --dry-run +fi +echo "Published to npm." + +if [[ $DRY_RUN != "" ]]; then + echo "All other commands are mutations, and we are doing a dry run." + echo "Terminating." + exit +fi + +echo "Cleaning up release notes..." +rm CHANGELOG.md +touch CHANGELOG.md +git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md +echo "Cleaned up release notes." + +echo "Pushing to GitHub..." +git push origin master --tags +echo "Pushed to GitHub." + +echo "Publishing release notes..." +hub release create --file "${RELEASE_NOTES_FILE}" "v${NEW_VERSION}" +echo "Published release notes." + +echo "Making the tweet..." +npm install --no-save twitter@1.7.1 +cp -v "${WDIR}/scripts/twitter.json" "${TEMPDIR}/${REPOSITORY_NAME}/scripts/" +node ./scripts/tweet.js ${NEW_VERSION} +echo "Made the tweet." diff --git a/scripts/publish/cloudbuild.yaml b/scripts/publish/cloudbuild.yaml new file mode 100644 index 000000000..d04fec25c --- /dev/null +++ b/scripts/publish/cloudbuild.yaml @@ -0,0 +1,114 @@ +steps: + # Decrypt the SSH key. + - name: 'gcr.io/cloud-builders/gcloud' + args: + [ + 'kms', + 'decrypt', + '--ciphertext-file=deploy_key.enc', + '--plaintext-file=/root/.ssh/id_rsa', + '--location=global', + '--keyring=${_KEY_RING}', + '--key=${_KEY_NAME}', + ] + + # Decrypt the Twitter credentials. + - name: 'gcr.io/cloud-builders/gcloud' + args: + [ + 'kms', + 'decrypt', + '--ciphertext-file=twitter.json.enc', + '--plaintext-file=twitter.json', + '--location=global', + '--keyring=${_KEY_RING}', + '--key=${_KEY_NAME}', + ] + + # Decrypt the npm credentials. + - name: 'gcr.io/cloud-builders/gcloud' + args: + [ + 'kms', + 'decrypt', + '--ciphertext-file=npmrc.enc', + '--plaintext-file=npmrc', + '--location=global', + '--keyring=${_KEY_RING}', + '--key=${_KEY_NAME}', + ] + + # Decrypt the hub (GitHub) credentials. + - name: 'gcr.io/cloud-builders/gcloud' + args: + [ + 'kms', + 'decrypt', + '--ciphertext-file=hub.enc', + '--plaintext-file=hub', + '--location=global', + '--keyring=${_KEY_RING}', + '--key=${_KEY_NAME}', + ] + + # Set up git with key and domain. + - name: 'gcr.io/cloud-builders/git' + entrypoint: 'bash' + args: + - '-c' + - | + chmod 600 /root/.ssh/id_rsa + cat </root/.ssh/config + Hostname github.com + IdentityFile /root/.ssh/id_rsa + EOF + ssh-keyscan github.com >> /root/.ssh/known_hosts + + # Clone the repository. + - name: 'gcr.io/cloud-builders/git' + args: ['clone', 'git@github.com:${_REPOSITORY_ORG}/${_REPOSITORY_NAME}'] + + # Set up the Git configuration. + - name: 'gcr.io/cloud-builders/git' + dir: '${_REPOSITORY_NAME}' + args: ['config', '--global', 'user.email', 'firebase-oss-bot@google.com'] + - name: 'gcr.io/cloud-builders/git' + dir: '${_REPOSITORY_NAME}' + args: ['config', '--global', 'user.name', 'Google Open Source Bot'] + + # Set up the Twitter credentials. + - name: 'gcr.io/$PROJECT_ID/package-builder' + entrypoint: 'cp' + args: ['-v', 'twitter.json', '${_REPOSITORY_NAME}/scripts/twitter.json'] + + # Set up the npm credentials. + - name: 'gcr.io/$PROJECT_ID/package-builder' + entrypoint: 'bash' + args: ['-c', 'cp -v npmrc ~/.npmrc'] + + # Set up the hub credentials for package-builder. + - name: 'gcr.io/$PROJECT_ID/package-builder' + entrypoint: 'bash' + args: ['-c', 'mkdir -vp ~/.config && cp -v hub ~/.config/hub'] + + # Publish the package. + - name: 'gcr.io/$PROJECT_ID/package-builder' + dir: '${_REPOSITORY_NAME}' + args: ['bash', './scripts/publish.sh', '${_VERSION}'] + env: + - 'REPOSITORY_ORG=${_REPOSITORY_ORG}' + - 'REPOSITORY_NAME=${_REPOSITORY_NAME}' + - 'DRY_RUN=${_DRY_RUN}' + +options: + volumes: + - name: 'ssh' + path: /root/.ssh + +substitutions: + _VERSION: '' + _DRY_RUN: '' + _KEY_RING: 'npm-publish-keyring' + _KEY_NAME: 'publish' + _REPOSITORY_ORG: 'firebase' + _REPOSITORY_NAME: 'firebase-functions' diff --git a/scripts/publish/deploy_key.enc b/scripts/publish/deploy_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..127551f08a284b04645c1979c5e7582ff6d87cc2 GIT binary patch literal 3505 zcmV;i4Nme3Bmgb?`&t@CANF6;R;o>u7LKpmI5M&PT05}Z%Fvpli)}500uqQD0I@1* zqHJtSSX}$k?Rd7LKh&;a=vnd$={xB*q> zA&%j))nL-jB=2Pj(Wz1seZ^pKpHctdh-YHXB0r^La?C?~Mf9%}Ccsy^HCF zOb#!mG@W>%81NyFz!emyLQSG!Uddt)!yBRud|uy3``LlrL%;ZxRwax>PWc|VwwAFv z9OMa-Z9qqPEP|7LJu|tL`CKbh#O-KYZ2NW|tK~YPfT})dHaPHK#q>)nGZvxUV3?sg z(y{|s@DGBI4I2S0?@HJA*}p?tQT_02T_90NWwFME7-!aglgC0xKGiF?>tLU`mY$-@ zYl4i49l`mxevU$MQ51F82-l~~^2ci>=1!x1&Gr~KL&r69Z&ci^AJR^Rug*fdq8!F2 zvak|`Mi^klfVOdMIZH`>QPOo@2m^$C6=PwK|1+NC=iMZ}fMqrR;#b{dcw~YygKR_x zJ-NodT=TW8sb1C()1P?fZh6N9F^w|7@#8UifxZqLNsdPq@%;0u^K(Ae;M>JnAL1Sj zw%WcTocg@=05m^ixPm)pc~|YYLG8>kpRiejk7Z7^jnhVJF#h`%a~m>sMTZwih(#a^ zFy6_w{alNDyjwd9!NG@h#_pnsrgt&olf_5f3jkB4JPKk2HlEp%P@REPmRRLoYIQh$ zq(W3tr#&hus>2>|8z`zMxir(_zRWt6o+r(01v4P9bZRLJR`MGQMhHxZ8|L!jY`!~y zup{RtT&1eO^D`$qDX*%l1f8gaozR}|M+W}PSDVT)UkYCPMPMn*VbHK-?JeQO#e72- zi(o|L&s1b;-A8_)o$c#5Dn~m|tc67XXD9p{KCw6KabQCa6n{~4!%!OFGi$RER`}lb zp7wu)GL#sd79Z+Fj4lZ~cBhBAyV$=p)w1BnpIv1Y%+8{j*y>p;TQxlo9XbJ-dO$(z{FE2P6Z4-A2afjbAhPH&+>TXEfKrAxn)J0 zU>>UZyy@&BtJvRa8UOnOKlI9jQ*q3aSOy3OvZL2$dK z%PrOHR3^w^AO}8zlJz&VnII*NcS|L5AUq^QCb72fo!+YJ3!TD2pPk72$j}k+F)30CK5yHBPVm5Qu*Z`iKlVd4I+_+Z< zMjr6TP;kDgh5E+lkVIRzO>Y^L+}uv_WSmd1|*{CSVxYAM8o1ce0Gg3FU^@i zW5?gDOW3=>oI{o&@rcAZj+bwetel^sIqlf5vMInpHVA zA%ag{Tag1RdhuFY;9%^WbI*XZnel2VjPR=Sn@rH@Ap9?ODfff)c?i_YXE$w&i(f0l zwc*&T=X0E6eea)*?yo9@;bM=S!#GUs&lGUOaprtq;M^}kG<>l{3pT%o(f+C?Z!K4% zH%@F=RfezqRr=pJXw(x=puymA-n%mrFKx&ciEu}GE{yK0zAUsX4!h!?(%|D?cqW%D zaI)ZgAOg|&m$RSDQ0&wFmq#m%^6@7iSK#DmB76DU5nR3H6d!XyGF^j^ue7!~nOguMEA=l6h@uAsSL_S$%w`)dABi;=Q)a?I##7)Gx=$0(#Yz^@-2 zP}wb;T_!c>lO!ob%$VdSVSU$KE(~6vxAPJ~j`9I`$z4%%W!$TdVL@;qr7T6S!S@9= zNl;;06mDnka*i}jPE+TDX%%r=SE8CYW|ek`0Cpchp;Hm`>uyH!YNEhvbsze$S2=yp z8s=oVffyvYx+W>-{)@+dI_l-($R5pZWs~mL#^u7B;Gs$WSCc(wg`V#=seLPw6WYZ) zYUIJ1CfeJ^4+LM&!aaDDAP}?wt5w!OrzWfiJ}5Od){VA<#=G~0^9*JV%Ni9__nHB2 zkQ^%e*>!@ADxVe?f&xrC;_zUa`8BmXoJ?k_@?R0us*4s~m{(*lpf+#dO&k<^r~n*< z&<|y!znIMP#nt$PXi^*)<+;YHFSz=^w~JMwY;sL1k%Trl>;-*2C%Shwlv5V*L(W&5 zXZ-|v=@#Ye(O|~3?y{zGxa8oPt62rI5fC+S3*`2r|9LDt78?Z1m~^xYa<;VxzSGTY zM3S4T^Y@)f3!tL)?;FEB8ZkSg`;qQfwe7=xZ2?gJ0LL2xSk5ridpLYex&D;fYiViq zn+v(hY+#sHFYH2Dg$J}Fg1DI-)?be{T)hS+69w!*k@cOHuFI;!Unr)S`lV;iy1w=M zscVhlRjt0FKRnUSLc`2sRIZlBtqdpjTB1dPVsNGpW`c=Uv>%bFjVEppPHOqhH~-l^ zOIyetr4Qa~BW3IlHn(es;M5$k28lm1D#B-7>!g^ROUx7vCO*Z!>9H3KR))r9#Ez05 z9jDV8==JApZeN`V(M^%TyGfccf42us*()JpzY%OO{Vj=OoWK$yyzJA=c;5pG3R_ea z?f^pQ(rx3efxj@J0KHk-YVE@?K^L&uXiu5zcq(}?BZu5pIQ2y!MUx^t-SZJ8oB+s> z*j`FmRguK31g^$7Ln0D6Pp&|@4q0`qy%R)>YbY&31G5EPZ#~3JRBKB^_L1Kj_ f4Ub|Hgeu)7h18+LKzH?pr3a9uFy{Epm(_|36Y1*QWJQfJT0MJ9zwMi%Kd3wn#dG_QbRhG-GIt!<8_$jzFOm|VQ-rR?2l}i2{p^L{_ tc<&{%BIKp@wGJNlQ#WkDi)Ew#{#^Qs@9VYVi;<-_|HPcgwp_ON(Ql0_WTgNA literal 0 HcmV?d00001 diff --git a/scripts/publish/npmrc.enc b/scripts/publish/npmrc.enc new file mode 100644 index 0000000000000000000000000000000000000000..da8ea49bb39b447cf82e476e2fbe5cbea9c73ab2 GIT binary patch literal 185 zcmV;q07m}`Bmgb?`&x`B3vTk#mH`EO%n0vbM?y@JnAJ literal 0 HcmV?d00001 diff --git a/scripts/publish/twitter.json.enc b/scripts/publish/twitter.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..82123a04d0ff081fb0e72b4ef55875715afc4a65 GIT binary patch literal 337 zcmV-X0j~ZEBmgb?`&w^yETddISLST9*Q73S3M0HD5u5QbgL|PqvifMB4-%*X0I@1* zqFru1Q`}3f;Ld){D@!s0@HGRmE3-;7)M2ircF{PyxjTknwRwMPZ9!f~Sxs)bbsh+J zE$e6}?hEB5or0?@>f=G5N#*klB1NbA$$(9y$E;0PSaEG%6=El1c4m^(o=8eGQkwhE zbx=AC2;_=16pQ2uAPJH6pLMi|Bf6za61;86Z|Mun0Z4f%*&wt5QAvta;5 jz>LyJ^e{Dl?7J^g|EMlTm%vy}Hf(R(%iC3z{0i>Dxt*iy literal 0 HcmV?d00001 diff --git a/scripts/tweet.js b/scripts/tweet.js new file mode 100644 index 000000000..be6229574 --- /dev/null +++ b/scripts/tweet.js @@ -0,0 +1,52 @@ +"use strict"; + +const fs = require("fs"); +const Twitter = require("twitter"); + +function printUsage() { + console.error( + ` +Usage: tweet.js + +Credentials must be stored in "twitter.json" in this directory. + +Arguments: + - version: Version of module that was released. e.g. "1.2.3" +` + ); + process.exit(1); +} + +function getUrl(version) { + return `https://github.com/firebase/firebase-functions/releases/tag/v${version}`; +} + +if (process.argv.length !== 3) { + console.error("Missing arguments."); + printUsage(); +} + +const version = process.argv.pop(); +if (!version.match(/^\d+\.\d+\.\d+$/)) { + console.error(`Version "${version}" not a version number.`); + printUsage(); +} + +if (!fs.existsSync(`${__dirname}/twitter.json`)) { + console.error("Missing credentials."); + printUsage(); +} +const creds = require("./twitter.json"); + +const client = new Twitter(creds); + +client.post( + "statuses/update", + { status: `v${version} of @Firebase SDK for Cloud Functions is available. Release notes: ${getUrl(version)}` }, + (err) => { + if (err) { + console.error(err); + process.exit(1); + } + } +); From f41bdaa9bd4adc479015ed9df2102a3c1bafc8bf Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 19 Mar 2020 18:10:16 +0000 Subject: [PATCH 203/705] 3.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35f0517b7..3fe70ac72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.3.0", + "version": "3.4.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 76bfc9c7563dc81dc65b9a3d90edbac9c0198ecf Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 19 Mar 2020 18:10:21 +0000 Subject: [PATCH 204/705] [firebase-release] Removed change log and reset repo after 3.4.0 release --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ffc7120..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +0,0 @@ -**IMPORTANT: Please update to this version of `firebase-functions` if you are using Node.js 10 functions, otherwise your functions will break in production.** - -- Prevents deployment and runtime issues caused by upcoming changes to Cloud Functions infrastructure for Node.js 10 functions. (Issue #630) -- Adds support for writing scheduled functions under handler namespace. From bf52fa3b85ef4210e04074afcd401c943879cdac Mon Sep 17 00:00:00 2001 From: efi shtain Date: Thu, 19 Mar 2020 22:50:58 +0200 Subject: [PATCH 205/705] add support for maxInstances in RuntimeOptions (#624) Co-authored-by: joehan --- src/cloud-functions.ts | 4 ++++ src/function-configuration.ts | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 1309aba61..ec2d64779 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -486,5 +486,9 @@ export function optionsToTrigger(options: DeploymentOptions) { if (options.schedule) { trigger.schedule = options.schedule; } + + if (options.maxInstances) { + trigger.maxInstances = options.maxInstances; + } return trigger; } diff --git a/src/function-configuration.ts b/src/function-configuration.ts index ec1695ccd..215ea81a8 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -61,6 +61,11 @@ export interface RuntimeOptions { * Timeout for the function in seconds, possible values are 0 to 540. */ timeoutSeconds?: number; + + /** + * Max number of actual instances allowed to be running in parallel + */ + maxInstances?: number; } export interface DeploymentOptions extends RuntimeOptions { From 9e05b7f4cf663e104c059e56b33ee0174d8dc086 Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 19 Mar 2020 15:14:55 -0700 Subject: [PATCH 206/705] Add entry for maxInstances (#636) * add entry for maxInstances * prettier --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..166198e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adds support for maxInstances. From df543dc04d14441ce65e82d342f1377f859ca758 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 20 Mar 2020 10:49:45 -0700 Subject: [PATCH 207/705] Update dependencies to fix TS build issue (#638) --- CHANGELOG.md | 12 +++++++++++- package.json | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 166198e9a..c459e5afc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,11 @@ -- Adds support for maxInstances. +- Adds support for defining max number of instances for a function. Example: + +``` +functions.runWith({ + maxInstances: 10 +}).https.onRequest(...); +``` + +Learn more about max instances in the [Google Cloud documentation.](https://cloud.google.com/functions/docs/max-instances) + +- Fixes TypeScript build error when `package-lock.json` is present by updating dependencies (Issue #637). diff --git a/package.json b/package.json index 3fe70ac72..20f7c8c38 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "test": "mocha" }, "dependencies": { - "@types/express": "^4.17.0", + "@types/express": "^4.17.3", "cors": "^2.8.5", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", @@ -61,7 +61,7 @@ "firebase-admin": "^8.2.0", "istanbul": "^0.4.5", "js-yaml": "^3.13.1", - "jsdom": "^15.2.0", + "jsdom": "^16.2.1", "mocha": "^6.1.4", "mock-require": "^3.0.3", "mz": "^2.7.0", @@ -73,9 +73,9 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "^0.14.2", + "typedoc": "^0.17.1", "typescript": "^3.5.2", - "yargs": "^13.2.4" + "yargs": "^15.3.1" }, "peerDependencies": { "firebase-admin": "^8.0.0" From 15bf0da3b489c4a31f97bc171aa9b2ef251c4abd Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Fri, 20 Mar 2020 11:16:18 -0700 Subject: [PATCH 208/705] Update CHANGELOG (#639) --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c459e5afc..5b7b4bfe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ - Adds support for defining max number of instances for a function. Example: -``` -functions.runWith({ - maxInstances: 10 -}).https.onRequest(...); -``` + ``` + functions.runWith({ + maxInstances: 10 + }).https.onRequest(...); + ``` -Learn more about max instances in the [Google Cloud documentation.](https://cloud.google.com/functions/docs/max-instances) + Learn more about max instances in the [Google Cloud documentation.](https://cloud.google.com/functions/docs/max-instances) - Fixes TypeScript build error when `package-lock.json` is present by updating dependencies (Issue #637). From 1ed73456250333274653f874246433f3df89e7d4 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 20 Mar 2020 18:18:21 +0000 Subject: [PATCH 209/705] 3.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20f7c8c38..0884f7af2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.4.0", + "version": "3.5.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 0921c78ea48c4aee260fa687b8e9c96baa916120 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 20 Mar 2020 18:18:26 +0000 Subject: [PATCH 210/705] [firebase-release] Removed change log and reset repo after 3.5.0 release --- CHANGELOG.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b7b4bfe2..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +0,0 @@ -- Adds support for defining max number of instances for a function. Example: - - ``` - functions.runWith({ - maxInstances: 10 - }).https.onRequest(...); - ``` - - Learn more about max instances in the [Google Cloud documentation.](https://cloud.google.com/functions/docs/max-instances) - -- Fixes TypeScript build error when `package-lock.json` is present by updating dependencies (Issue #637). From 5250110912dbe9e5ff00debe542e33e30089f1a8 Mon Sep 17 00:00:00 2001 From: Martin H Date: Mon, 23 Mar 2020 21:32:01 +0100 Subject: [PATCH 211/705] Add support for europe-west3 region. (#627) --- spec/function-builder.spec.ts | 2 ++ src/function-configuration.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index b0c4d4c28..0044e5661 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -59,6 +59,7 @@ describe('FunctionBuilder', () => { 'us-east4', 'europe-west1', 'europe-west2', + 'europe-west3', 'asia-east2', 'asia-northeast1' ) @@ -71,6 +72,7 @@ describe('FunctionBuilder', () => { 'us-east4', 'europe-west1', 'europe-west2', + 'europe-west3', 'asia-east2', 'asia-northeast1', ]); diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 215ea81a8..05d4517a8 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -7,6 +7,7 @@ export const SUPPORTED_REGIONS = [ 'us-east4', 'europe-west1', 'europe-west2', + 'europe-west3', 'asia-east2', 'asia-northeast1', ] as const; From 468455d6e6b9c7712e0615f667592ff207a6df69 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Wed, 25 Mar 2020 16:16:33 -0700 Subject: [PATCH 212/705] Updating docs TOC with Testlab paths. (#643) --- docgen/content-sources/toc.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 378af2eef..7b0b70347 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -116,3 +116,15 @@ toc: path: /docs/reference/functions/providers_storage_.objectbuilder.html - title: 'ObjectMetadata' path: /docs/reference/functions/providers_storage_.objectmetadata.html + + - title: 'functions.testLab' + path: /docs/reference/functions/providers_testlab_.html + section: + - title: 'testLab.clientInfo' + path: /docs/reference/functions/providers_testlab_.clientinfo.html + - title: 'testLab.resultStorage' + path: /docs/reference/functions/providers_testlab_.resultstorage.html + - title: 'testLab.testMatrix' + path: /docs/reference/functions/providers_testlab_.testmatrix.html + - title: 'testLab.testMatrixBuilder' + path: /docs/reference/functions/providers_testlab_.testmatrixbuilder.html From e1df8236604c37cee7486209c08f0eb9c291ab77 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Tue, 31 Mar 2020 14:23:10 -0700 Subject: [PATCH 213/705] Adding testlab event to eventTypes list (#649) --- src/cloud-functions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index ec2d64779..ea4acd7a2 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -104,11 +104,12 @@ export interface EventContext { * * `providers/cloud.firestore/eventTypes/document.update` * * `providers/cloud.firestore/eventTypes/document.delete` * * `google.pubsub.topic.publish` + * * `google.firebase.remoteconfig.update` * * `google.storage.object.finalize` * * `google.storage.object.archive` * * `google.storage.object.delete` * * `google.storage.object.metadataUpdate` - * * `google.firebase.remoteconfig.update` + * * `google.testing.testMatrix.complete` */ eventType: string; From 7f4c9572cb96881f9b0be7521799bcf6e73e42a1 Mon Sep 17 00:00:00 2001 From: Sebastian Kreft Date: Tue, 31 Mar 2020 18:29:20 -0300 Subject: [PATCH 214/705] Enable users to define async HTTP functions (#651) Fixes #606 --- src/providers/https.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/https.ts b/src/providers/https.ts index d941f67c8..36077affd 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -60,7 +60,7 @@ export function _onRequestWithOptions( ): HttpsFunction { // lets us add __trigger without altering handler: const cloudFunction: any = (req: Request, res: express.Response) => { - handler(req, res); + return handler(req, res); }; cloudFunction.__trigger = _.assign(optionsToTrigger(options), { httpsTrigger: {}, From 95d4a4a5b3850ddd69b14284f6823ec7cd66c36a Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Tue, 31 Mar 2020 15:56:48 -0700 Subject: [PATCH 215/705] Update CHANGELOG.md (#640) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..9b9881949 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Adds support for europe-west3 region (e.g. `functions.region("europe-west3")`). +- Adds support for async HTTP functions (Issue #606). From c9a3a0e06545171f3cc83361526773de44166a95 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 31 Mar 2020 23:02:56 +0000 Subject: [PATCH 216/705] 3.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0884f7af2..3fab11e33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.5.0", + "version": "3.6.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From d3e8951e151102e2b1ccbee7e826a31c014712ed Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 31 Mar 2020 23:03:02 +0000 Subject: [PATCH 217/705] [firebase-release] Removed change log and reset repo after 3.6.0 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b9881949..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Adds support for europe-west3 region (e.g. `functions.region("europe-west3")`). -- Adds support for async HTTP functions (Issue #606). From 2784d5dad6d48215e024aae4678a99a317f6e3dd Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 24 Apr 2020 10:20:17 -0700 Subject: [PATCH 218/705] Update TypeScript dependency to v3.8 to fix build issues (Issue #667) (#668) --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..e5a92e2f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Update TypeScript dependency to v.3.8 to fix build issues (Issue #667) diff --git a/package.json b/package.json index 3fab11e33..13c1e10c2 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", "typedoc": "^0.17.1", - "typescript": "^3.5.2", + "typescript": "^3.8.3", "yargs": "^15.3.1" }, "peerDependencies": { From 1fb57c58c15b3af9b14e6a0dab6678ebde35aa6b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 24 Apr 2020 17:29:31 +0000 Subject: [PATCH 219/705] 3.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13c1e10c2..2f45c7dc7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.6.0", + "version": "3.6.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 1dde3dbc9a7c2d7caae945e43cb11b602c968331 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 24 Apr 2020 17:29:37 +0000 Subject: [PATCH 220/705] [firebase-release] Removed change log and reset repo after 3.6.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5a92e2f7..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Update TypeScript dependency to v.3.8 to fix build issues (Issue #667) From df35c1b4b18b7f2cd6c2d0d21090793b3b153e8b Mon Sep 17 00:00:00 2001 From: Sebastian Kreft Date: Mon, 27 Apr 2020 17:48:07 -0400 Subject: [PATCH 221/705] fix: onCreate, onUpdate and onDelete receive a DocumentQuerySnapshopt (#670) The arguments of Firestore triggers `onCreate`, `onUpdate` and `onDelete` cannot have an undefined data by definition, so we changed the arguments of those handlers to reflect that by using DocumentQuerySnapshot. fixes #659 --- src/providers/firestore.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 291d7d7f9..f91e17306 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -42,6 +42,7 @@ export const service = 'firestore.googleapis.com'; export const defaultDatabase = '(default)'; let firestoreInstance: any; export type DocumentSnapshot = firebase.firestore.DocumentSnapshot; +export type QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot; /** * Select the Firestore document to listen to for events. @@ -204,30 +205,30 @@ export class DocumentBuilder { /** Respond only to document updates. */ onUpdate( handler: ( - change: Change, + change: Change, context: EventContext ) => PromiseLike | any - ): CloudFunction> { + ): CloudFunction> { return this.onOperation(handler, 'document.update', changeConstructor); } /** Respond only to document creations. */ onCreate( handler: ( - snapshot: DocumentSnapshot, + snapshot: QueryDocumentSnapshot, context: EventContext ) => PromiseLike | any - ): CloudFunction { + ): CloudFunction { return this.onOperation(handler, 'document.create', snapshotConstructor); } /** Respond only to document deletions. */ onDelete( handler: ( - snapshot: DocumentSnapshot, + snapshot: QueryDocumentSnapshot, context: EventContext ) => PromiseLike | any - ): CloudFunction { + ): CloudFunction { return this.onOperation( handler, 'document.delete', From 5c18afeb2d93881c90ab3bc91cab075dcd3b3a85 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Mon, 27 Apr 2020 22:57:07 +0100 Subject: [PATCH 222/705] Modify return type of DataSnapshot.forEach to `boolean | void` (#666) This is to match the Admin SDK: https://github.com/firebase/firebase-js-sdk/blob/37b98e9271c494a0fb58ca1960f8fcfaec49ade9/packages/database/src/api/DataSnapshot.ts#L137 Co-authored-by: joehan Co-authored-by: Lauren Long --- src/providers/database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/database.ts b/src/providers/database.ts index e648be20e..78614a152 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -476,7 +476,7 @@ export class DataSnapshot { * @return `true` if enumeration was canceled due to your callback * returning `true`. */ - forEach(action: (a: DataSnapshot) => boolean): boolean { + forEach(action: (a: DataSnapshot) => boolean | void): boolean { const val = this.val(); if (_.isPlainObject(val)) { return _.some( From b1f9b5ad3d7227132cff82542c6222b6b5edcea0 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 1 May 2020 10:20:04 -0700 Subject: [PATCH 223/705] Revise docs for handler namespace (#680) * Adding top-level comment and TOC for functions.handler. (#633) * Adding top-level comment and TOC for functions.handler. * Adding edits from feedback. * Refer specifically to Firebase CLI. * Adding top-level comment and TOC for functions.handler. (#633) * Adding top-level comment and TOC for functions.handler. * Adding edits from feedback. * Refer specifically to Firebase CLI. * Pin "typedoc" version to 0.14.2 (#655) * Add docstrings for handler.firestore, handler.database, and handler.https (#652) * Document a few providers * Remove extra sentence in http function docstring * Crashlytics handler details and example formatting (#656) * Adding comments for Crashlytics handler. * Removing parens for parameters per feedback. * Eg moar handlers (#657) * Adding RC and Analytics handlers. * Adding Storage object handler. * Adding Pub/Sub and Test Lab handlers. * Adding auth handler. * Fixing typo. * Removing async to be consistent among examples. (#658) * handler functions: copy-edits in comments only (#675) * Removing async syntax from Storage handlers. (#678) Co-authored-by: egilmorez Co-authored-by: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com> --- deploy_key.enc | Bin 0 -> 3497 bytes docgen/content-sources/toc.yaml | 5 + package.json | 2 +- src/handler-builder.ts | 280 ++++++++++++++++++++++++-------- 4 files changed, 215 insertions(+), 72 deletions(-) create mode 100644 deploy_key.enc diff --git a/deploy_key.enc b/deploy_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..4451e042b005ebc9eda67d58b62167f4c49daf6a GIT binary patch literal 3497 zcmV;a4Oa3BBmmVf@Zrdr)Xk)=bRAGj!{RH@SFgr^td|4+9tfBW^Z~L71QLK70H3|R zajlkRxfa@rcX>I9C~NhK{A6SLG=zTUY?Gzdo%dt4TzAs$G$%Eg94vVf6hVeHEUTRE z*3NSh~uGCn|R=X)&pZv zf?JJM(&zim_<}4u;>Hix(K|O{>gBe(_wgXp%R@{hrQ+rV1!o*KY{VK7t2b;&OO%0b zmaYzO>8gq1TJ?ijsfxS#HZp~m;M*N_*G2_GihAVKTbe<7ydAJ8h^=n59%!DAR`SO9 zI@%%3U4cW>uR!+LO^cgy?Wr5k9c0wZa`$%2mq_rksc_jcK#Gg0rzlv|%?n*j^8r=* z=1h@esuK?)h)e?Js&g0w9&cLyrb(2iv8E7NpVAxHa`ULDhM7cnp|+=Smq6(1kbA?h z)<00(wd_RMcR$nxp~F0an9CGc(l({P@_*@(?19xjFA8Ogqe=}f3=KRIYMSWzIjf+mz1Z;z;`Cqg7A5G(f34LOI%u8> zMSWL|1YP0t{PxWvP4EFE8&>1UH$R*G@S4))k_+vJ3L?a-poZq&k1%3(_iDGzPaC&` zKK&yBq`IUt!!f8nKY6|X^k43jD@_TTn%fEZA?-JMa3YF$H9GE_t5FTJlu-p$xaIX_ zO#I&Yw9uDWnpp2TOFR=GTal0yJmPiQ56t=aGbJfMlpU)V(byVZv~6;_(P^0w7(4u} z6h6tr0d9i?^s8jb6Dd);+od;stGFyV4mA}EW5zNh{`njzaZZ)|jl8Ajwdo(Qv4FG1 zcnz52kZD+HR~zpox)Hr$2AJXf7mBk*&YBUN`hO0E|rGF4v#)`yhU0*o5E|UTop&t;F|cB-mt_q zI_a%0>Z>Z;+8&vzbyX28=;)gK=rb&QZ0I)kEB_TzSZ8{`;*q+#9%Tn&Zn%r*(UDfd z+GN$ahV#aSZluYmq_2#y?lpZWv|-(Bm*1Bt4t@5uQw zolniyAwn|r^qROUaFl4My9AlN_Zx7$V7Rki6=?~u1aj(kw54qpqs(i4@fxA^07=jk z^brWB_a~^XTj2E!g&bR)we}HwiKv3QhaWr6Gn%jy!b$a{bNd{TKG(Rk6|6-0r>HAm zrZlXuf)$7`%3B~i$VN;M>|~dn`=H1w5I+@!Ov46I8R-#`&5Z>poMVE9?|Ev8S0RGd z=22d>MEY>&f~^<3V6FT#y_UXD0*c9t*u=hx$o?GoIgcnnM$cdH))S?ai zrO&XTnsn?~=A7?WEnw|oPpcRYNYgMMr7nzn5!==*vK-1gu&{e+&!H4DqHd&g$N9F}{(}T_X zvd#2Q6K{eY9gM%E&=vA?ys*1Ecb{K@%&G>=W}lGbjI2rA!(~pPCKE_w zV9W{U&WNX%s!Y85W-`P~q3QhJlXkma!!ap@goj79Aj1sQZ6G>>q z&uRQNoXZ;g2HVCIy>!Wg$BK|;5lnw1b2N&#Y{^+zA$&%Vm2su`Y}^i%9x1MIH%Q0L zR&*8olK>jMSc~pFNm%Z8ks|e@O-qUwW)hocP1PFN9MadNy&w@?^`W8>Ew7+QljLeJ zsc^5%Wik4LycK}31v7!^PAXN6JpIj!_le_{qK1TxXRPP)01O!NM=O2lCrCDQTTKuC zFzsX!U;gS9k;hb!avA32c<6idpD3X z@B!9=11BW7g@_2as9@|=T{<2}#HZe#f)nE&;_ZB;$bm4WF)#95kBCA3^)t04 z;BONYb#RcC5)3Zvjs@<5sum)Yva+mV)8ha{~fjjduoPowBXJyfc^g=u#;Fm!@XL?P|0d= z-*9rNZ5|D6m_3N?LktGD0^&LxVZ#1!QH3_1AIO_Q80GGSD2nbPImcJ6qEO5bW6>05jnYPFF79=9tO}g)WU$Z~IUt-| z`Dq201@Xr=S~#DeHK%`Aj}Sru5U4ox=$8a@wA_qS4>(a#+KxYG zSmwf2+K3EvWR#+X$qXg9*=MXnse)npW!mTIza@5!9sZ(bHo+Syi~~-rYhBB)BM*>d zp^P`{TNB}XUSnS@u|?t&H61_vtnv@lMSU$uV*#QUT#K9p_AW77-?6rAN~K$f;+(DM z?k?H)S2hNDJ5yC8+gZHk^iB%>R_jFwG`QlvZ0%Lt0HLR2INg*+D+L;M7L)-!^RN6` zWJ`5Ok=RO3ie$X(J52NZGB_;WdyZu2F~$zTs%9B(ECuiK z$w2MYk-bEC&pv=xF`h8Lt3ZKQuzwqsGf8fkB;DmLNVx2h4?lFfg$9C|%9##GZ-j4WaYIL$( z^tuu2Vy@cd#f_B+yg&0mpor5N*na)M;C2hta0t=Eu>^K>6ICTb=)R~a20LWz+l%_s z)cp&MypEH3kaMsW(1gzvAAGBdT1>66{zBWsESk3qV$k>h>jjA1ir3m;f!t+_p8e{( z6aTXDX%5B`=kKo$Nzmo3)JzCm2zR+#X_I_20RGp5W&H|Ywk_aV5jxQ58Ny= z_6#3#5}8uYJ{WAIx)XK|s!CR@yM`mZk8_2IsZCBST&kWrMt?W$BSg8vF*Qp1ao7cO<(Jj!2v1 zi8dHEQhkN;x2t&`LMK#rDr43TXg<+IeF-PqQXNVEUgR_k0my%5l-t-JsPeQtD*zL` z7*5tEMlMy`EyyDB$(A)!6K+RnohyHU { ... }) + * ``` + * + * `onCall` declares a callable function for clients to call using a Firebase SDK. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.https.onCall((data, context) => { ... }) + * ``` + */ get https() { return { - /** - * Handle HTTP requests. - * @param handler A function that takes a request and response object, - * same signature as an Express app. - */ onRequest: ( handler: (req: express.Request, resp: express.Response) => void ): HttpsFunction => { @@ -52,10 +73,6 @@ export class HandlerBuilder { func.__trigger = {}; return func; }, - /** - * Declares a callable method for clients to call using a Firebase SDK. - * @param handler A method that takes a data and context and returns a value. - */ onCall: ( handler: ( data: any, @@ -69,12 +86,40 @@ export class HandlerBuilder { }; } + /** + * Create a handler for Firebase Realtime Database events. + * + * `ref.onCreate` handles the creation of new data. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.database.ref.onCreate((snap, context) => { ... }) + * ``` + * + * `ref.onUpdate` handles updates to existing data. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.database.ref.onUpdate((change, context) => { ... }) + * ``` + + * `ref.onDelete` handles the deletion of existing data. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.database.ref.onDelete((snap, context) => { ... }) + * ``` + + * `ref.onWrite` handles the creation, update, or deletion of data. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.database.ref.onWrite((change, context) => { ... }) + * ``` + */ get database() { return { - /** - * Selects a database instance that will trigger the function. - * If omitted, will pick the default database for your project. - */ + /** @hidden */ get instance() { return { get ref() { @@ -82,41 +127,47 @@ export class HandlerBuilder { }, }; }, - - /** - * Select Firebase Realtime Database Reference to listen to. - * - * This method behaves very similarly to the method of the same name in the - * client and Admin Firebase SDKs. Any change to the Database that affects the - * data at or below the provided `path` will fire an event in Cloud Functions. - * - * There are three important differences between listening to a Realtime - * Database event in Cloud Functions and using the Realtime Database in the - * client and Admin SDKs: - * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component - * in curly brackets (`{}`) is a wildcard that matches all strings. The value - * that matched a certain invocation of a Cloud Function is returned as part - * of the `context.params` object. For example, `ref("messages/{messageId}")` - * matches changes at `/messages/message1` or `/messages/message2`, resulting - * in `context.params.messageId` being set to `"message1"` or `"message2"`, - * respectively. - * 2. Cloud Functions do not fire an event for data that already existed before - * the Cloud Function was deployed. - * 3. Cloud Function events have access to more information, including information - * about the user who triggered the Cloud Function. - */ get ref() { return new database.RefBuilder(apps(), () => null, {}); }, }; } + /** + * Create a handler for Cloud Firestore events. + * + * `document.onCreate` handles the creation of new documents. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.firestore.document.onCreate((snap, context) => { ... }) + * ``` + + * `document.onUpdate` handles updates to existing documents. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.firestore.document.onUpdate((change, context) => { ... }) + * ``` + + * `document.onDelete` handles the deletion of existing documents. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.firestore.document.onDelete((snap, context) => + * { ... }) + * ``` + + * `document.onWrite` handles the creation, update, or deletion of documents. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.firestore.document.onWrite((change, context) => + * { ... }) + * ``` + */ get firestore() { return { - /** - * Listen for events on a Firestore document. A Firestore document contains a set of - * key-value pairs and may contain subcollections and nested objects. - */ get document() { return new firestore.DocumentBuilder(() => null, {}); }, @@ -131,26 +182,53 @@ export class HandlerBuilder { }; } + /** + * Create a handler for Firebase Crashlytics events. + + * `issue.onNew` handles events where the app experiences an issue for the first time. + + * @example + * ```javascript + * exports.myFunction = functions.handler.crashlytics.issue.onNew((issue) => { ... }) + * ``` + + * `issue.onRegressed` handles events where an issue reoccurs after it + * is closed in Crashlytics. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.crashlytics.issue.onRegressed((issue) => { ... }) + * ``` + + * `issue.onVelocityAlert` handles events where a statistically significant number + * of sessions in a given build crash. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.crashlytics.issue.onVelocityAlert((issue) => { ... }) + * ``` + + */ get crashlytics() { return { - /** - * Handle events related to Crashlytics issues. An issue in Crashlytics is an - * aggregation of crashes which have a shared root cause. - */ get issue() { return new crashlytics.IssueBuilder(() => null, {}); }, }; } + /** + * Create a handler for Firebase Remote Config events. + + * `remoteConfig.onUpdate` handles events that update a Remote Config template. + + * @example + * ```javascript + * exports.myFunction = functions.handler.remoteConfig.onUpdate() => { ... }) + * ``` + */ get remoteConfig() { return { - /** - * Handle all updates (including rollbacks) that affect a Remote Config - * project. - * @param handler A function that takes the updated Remote Config template - * version metadata as an argument. - */ onUpdate: ( handler: ( version: remoteConfig.TemplateVersion, @@ -162,67 +240,127 @@ export class HandlerBuilder { }; } + /** + * Create a handler for Google Analytics events. + + * `event.onLog` handles the logging of Analytics conversion events. + + * @example + * ```javascript + * exports.myFunction = functions.handler.analytics.event.onLog((event) => { ... }) + * ``` + */ get analytics() { return { - /** - * Select analytics events to listen to for events. - */ get event() { return new analytics.AnalyticsEventBuilder(() => null, {}); }, }; } + /** + * Create a handler for Cloud Storage for Firebase events. + * + * `object.onArchive` handles the archiving of Storage objects. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.storage.object.onArchive((object) => { ... }) + * ``` + + * `object.onDelete` handles the deletion of Storage objects. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.storage.object.onDelete((object) => { ... }) + * ``` + + * `object.onFinalize` handles the creation of Storage objects. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.storage.object.onFinalize((object) => + * { ... }) + * ``` + + * `object.onMetadataUpdate` handles changes to the metadata of existing Storage objects. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.storage.object.onMetadataUpdate((object) => + * { ... }) + * ``` + */ get storage() { return { - /** - * The optional bucket function allows you to choose which buckets' events to handle. - * This step can be bypassed by calling object() directly, which will use the default - * Cloud Storage for Firebase bucket. - */ get bucket() { return new storage.BucketBuilder(() => null, {}).object(); }, - /** - * Handle events related to Cloud Storage objects. - */ get object() { return new storage.ObjectBuilder(() => null, {}); }, }; } + /** + * Create a handler for Cloud Pub/Sub events. + + * `pubsub.onPublish` handles the publication of messages to a topic. + + * @example + * ```javascript + * exports.myFunction = functions.handler.pubsub.topic.onPublish((message) => { ... }) + * ``` + */ get pubsub() { return { - /** - * Select Cloud Pub/Sub topic to listen to. - */ get topic() { return new pubsub.TopicBuilder(() => null, {}); }, - /** - * Handle periodic events triggered by Cloud Scheduler. - */ get schedule() { return new pubsub.ScheduleBuilder(() => null, {}); }, }; } + /** + * Create a handler for Firebase Authentication events. + * + * `user.onCreate` handles the creation of users. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.auth.user.onCreate((user) => { ... }) + * ``` + + * `user.onDelete` handles the deletion of users. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.auth.user.onDelete((user => { ... }) + * ``` + + */ get auth() { return { - /** - * Handle events related to Firebase authentication users. - */ get user() { return new auth.UserBuilder(() => null, {}); }, }; } + /** + * Create a handler for Firebase Test Lab events. + + * `testMatrix.onComplete` handles the completion of a test matrix. + + * @example + * ```javascript + * exports.myFunction = functions.handler.testLab.testMatrix.onComplete((testMatrix) => { ... }) + * ``` + */ get testLab() { - /** Handle events related to Test Lab test matrices. */ return { get testMatrix() { return new testLab.TestMatrixBuilder(() => null, {}); From 1bd2736befdc0de87c0c00e36fe0a81b50d5c5b5 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Wed, 27 May 2020 12:29:29 -0700 Subject: [PATCH 224/705] Fixes to reference doc generation for functions.https (#690) --- docgen/content-sources/HOME.md | 7 ++++++- docgen/content-sources/toc.yaml | 2 ++ src/providers/https.ts | 14 ++++++++++++-- src/setup.ts | 1 + src/utilities/assertions.ts | 2 +- src/utilities/path.ts | 2 +- src/utils.ts | 1 + 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docgen/content-sources/HOME.md b/docgen/content-sources/HOME.md index c89df0a57..00d2090a0 100644 --- a/docgen/content-sources/HOME.md +++ b/docgen/content-sources/HOME.md @@ -1,3 +1,8 @@ # Firebase Functions SDK Reference -Functions SDK!!! +The `firebase-functions` package provides an SDK for defining Cloud Functions for Firebase. + +To get started using Cloud Functions, see +[Get started: write, test, and deploy your first functions](/docs/functions/get-started). + +For source code, see the [Cloud Functions for Firebase GitHub repo](https://github.com/firebase/firebase-functions). diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 856b12640..91544d4f6 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -90,6 +90,8 @@ toc: section: - title: 'HttpsError' path: /docs/reference/functions/providers_https_.httpserror.html + - title: 'CallableContext' + path: /docs/reference/functions/providers_https_.callablecontext.html - title: 'functions.pubsub' path: /docs/reference/functions/providers_pubsub_.html diff --git a/src/providers/https.ts b/src/providers/https.ts index 36077affd..605c633f0 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -28,6 +28,7 @@ import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; +/** @hidden */ export interface Request extends express.Request { rawBody: Buffer; } @@ -127,6 +128,7 @@ export type FunctionsErrorCode = | 'data-loss' | 'unauthenticated'; +/** @hidden */ export type CanonicalErrorCodeName = | 'OK' | 'CANCELLED' @@ -146,6 +148,7 @@ export type CanonicalErrorCodeName = | 'UNAVAILABLE' | 'DATA_LOSS'; +/** @hidden */ interface HttpErrorCode { canonicalName: CanonicalErrorCodeName; status: number; @@ -180,6 +183,7 @@ const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, }; +/** @hidden */ interface HttpErrorWireFormat { details?: unknown; message: string; @@ -261,19 +265,22 @@ export interface CallableContext { rawRequest: Request; } -// The allowed interface for an http request for a callable function. +// The allowed interface for an HTTP request to a Callable function. +/** @hidden*/ interface HttpRequest extends Request { body: { data: any; }; } -// The format for the http body response to a callable function. +/** @hidden */ +// The format for an HTTP body response from a Callable function. interface HttpResponseBody { result?: any; error?: HttpsError; } +/** @hidden */ // Returns true if req is a properly formatted callable request. function isValidRequest(req: Request): req is HttpRequest { // The body must not be empty. @@ -317,7 +324,9 @@ function isValidRequest(req: Request): req is HttpRequest { return true; } +/** @hidden */ const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value'; +/** @hidden */ const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value'; /** @@ -400,6 +409,7 @@ export function decode(data: any): any { return data; } +/** @hidden */ const corsHandler = cors({ origin: true, methods: 'POST' }); /** @hidden */ diff --git a/src/setup.ts b/src/setup.ts index 6a0796348..b30fa6226 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** @hidden */ import { firebaseConfig } from './config'; // Set up for config and vars diff --git a/src/utilities/assertions.ts b/src/utilities/assertions.ts index 49ff5e36d..982ca304d 100644 --- a/src/utilities/assertions.ts +++ b/src/utilities/assertions.ts @@ -1,4 +1,4 @@ -/** +/** @hidden * @file Provides common assertion helpers which can be used to improve * strictness of both type checking and runtime. */ diff --git a/src/utilities/path.ts b/src/utilities/path.ts index 40ab8f047..33e187f9e 100644 --- a/src/utilities/path.ts +++ b/src/utilities/path.ts @@ -1,4 +1,4 @@ -/** +/** @hidden * Removes leading and trailing slashes from a path. * * @param path A path to normalize, in POSIX format. diff --git a/src/utils.ts b/src/utils.ts index b52c1e54f..e41b1e1fb 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** @hidden */ import * as _ from 'lodash'; export function applyChange(src: any, dest: any) { From 8d0a6c230984a058b798a3b58201930b87b06786 Mon Sep 17 00:00:00 2001 From: Adam Montgomery <1934358+montasaurus@users.noreply.github.com> Date: Wed, 27 May 2020 15:10:18 -0500 Subject: [PATCH 225/705] pin @types/express version (#686) --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..b39bddd01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Pin `@types/express` version to 4.17.3 to fix type definition issue (#685) diff --git a/package.json b/package.json index ed26f220b..27bba5b72 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "test": "mocha" }, "dependencies": { - "@types/express": "^4.17.3", + "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", From 9431102c8cd47432c091d873ef08aa45138f7f27 Mon Sep 17 00:00:00 2001 From: Sebastian Kreft Date: Wed, 27 May 2020 16:11:14 -0400 Subject: [PATCH 226/705] fix: move jsonwebtoken to dev dependencies (#677) jsonwebtoken was only used in tests and not present in the release output. ``` [0] firebase-functions$ ag jsonwebtoken spec/fixtures/mockrequest.ts 1:import * as jwt from 'jsonwebtoken'; package.json 50: "@types/jsonwebtoken": "^8.3.2", 64: "jsonwebtoken": "^8.5.1", [0] firebase-functions$ grep jsonwebtoken -R lib [1] firebase-functions$ ``` Co-authored-by: Lauren Long --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27bba5b72..020998793 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "jsonwebtoken": "^8.5.1", "lodash": "^4.17.14" }, "devDependencies": { @@ -62,6 +61,7 @@ "istanbul": "^0.4.5", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", + "jsonwebtoken": "^8.5.1", "mocha": "^6.1.4", "mock-require": "^3.0.3", "mz": "^2.7.0", From dbf9b5e29d1bc1c31345151ce29c9ea13dc55847 Mon Sep 17 00:00:00 2001 From: Fred Zhang Date: Wed, 27 May 2020 13:26:20 -0700 Subject: [PATCH 227/705] Use `domain` in context to override RTDB domain #683 (#235) --- spec/providers/database.spec.ts | 56 +++++++++++++++++++++++---------- src/cloud-functions.ts | 1 + src/providers/database.ts | 34 +++++++++++++------- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index 25293ac11..b764a7ea0 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -32,7 +32,7 @@ describe('Database Functions', () => { before(() => { process.env.FIREBASE_CONFIG = JSON.stringify({ - databaseURL: 'https://subdomain.firebaseio.com', + databaseURL: 'https://subdomain.apse.firebasedatabase.app', }); appsNamespace.init(); }); @@ -424,29 +424,51 @@ describe('Database Functions', () => { }); }); - describe('resourceToInstanceAndPath', () => { - it('should return the correct instance and path strings', () => { - const [instance, path] = database.resourceToInstanceAndPath( - 'projects/_/instances/foo/refs/bar' + describe('extractInstanceAndPath', () => { + it('should return correct us-central prod instance and path strings if domain is missing', () => { + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/bar', + undefined ); expect(instance).to.equal('https://foo.firebaseio.com'); expect(path).to.equal('/bar'); }); + it('should return the correct staging instance and path strings if domain is present', () => { + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/bar', + 'firebaseio-staging.com' + ); + expect(instance).to.equal('https://foo.firebaseio-staging.com'); + expect(path).to.equal('/bar'); + }); + + it('should return the correct multi-region instance and path strings if domain is present', () => { + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/bar', + 'euw1.firebasedatabase.app' + ); + expect(instance).to.equal('https://foo.euw1.firebasedatabase.app'); + expect(path).to.equal('/bar'); + }); + it('should throw an error if the given instance name contains anything except alphanumerics and dashes', () => { expect(() => { - return database.resourceToInstanceAndPath( - 'projects/_/instances/a.bad.name/refs/bar' + return database.extractInstanceAndPath( + 'projects/_/instances/a.bad.name/refs/bar', + undefined ); }).to.throw(Error); expect(() => { - return database.resourceToInstanceAndPath( - 'projects/_/instances/a_different_bad_name/refs/bar' + return database.extractInstanceAndPath( + 'projects/_/instances/a_different_bad_name/refs/bar', + undefined ); }).to.throw(Error); expect(() => { - return database.resourceToInstanceAndPath( - 'projects/_/instances/BAD!!!!/refs/bar' + return database.extractInstanceAndPath( + 'projects/_/instances/BAD!!!!/refs/bar', + undefined ); }).to.throw(Error); }); @@ -457,8 +479,9 @@ describe('Database Functions', () => { const apps = new appsNamespace.Apps(); const populate = (data: any) => { - const [instance, path] = database.resourceToInstanceAndPath( - 'projects/_/instances/other-subdomain/refs/foo' + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/other-subdomain/refs/foo', + 'firebaseio-staging.com' ); subject = new database.DataSnapshot(data, path, apps.admin, instance); }; @@ -467,7 +490,7 @@ describe('Database Functions', () => { it('should return a ref for correct instance, not the default instance', () => { populate({}); expect(subject.ref.toJSON()).to.equal( - 'https://other-subdomain.firebaseio.com/foo' + 'https://other-subdomain.firebaseio-staging.com/foo' ); }); }); @@ -648,8 +671,9 @@ describe('Database Functions', () => { }); it('should return null for the root', () => { - const [instance, path] = database.resourceToInstanceAndPath( - 'projects/_/instances/foo/refs/' + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/', + undefined ); const snapshot = new database.DataSnapshot( null, diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index ea4acd7a2..f8b1b1c1e 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -39,6 +39,7 @@ export interface Event { timestamp: string; eventType: string; resource: Resource; + domain?: string; }; data: any; } diff --git a/src/providers/database.ts b/src/providers/database.ts index 78614a152..8c8de4ec6 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -40,8 +40,7 @@ export const provider = 'google.firebase.database'; /** @hidden */ export const service = 'firebaseio.com'; -// NOTE(inlined): Should we relax this a bit to allow staging or alternate implementations of our API? -const databaseURLRegex = new RegExp('https://([^.]+).firebaseio.com'); +const databaseURLRegex = new RegExp('^https://([^.]+).'); /** * Registers a function that triggers on events from a specific @@ -215,8 +214,9 @@ export class RefBuilder { ) => PromiseLike | any ): CloudFunction { const dataConstructor = (raw: Event) => { - const [dbInstance, path] = resourceToInstanceAndPath( - raw.context.resource.name + const [dbInstance, path] = extractInstanceAndPath( + raw.context.resource.name, + raw.context.domain ); return new DataSnapshot( raw.data.delta, @@ -243,8 +243,9 @@ export class RefBuilder { ) => PromiseLike | any ): CloudFunction { const dataConstructor = (raw: Event) => { - const [dbInstance, path] = resourceToInstanceAndPath( - raw.context.resource.name + const [dbInstance, path] = extractInstanceAndPath( + raw.context.resource.name, + raw.context.domain ); return new DataSnapshot(raw.data.data, path, this.apps.admin, dbInstance); }; @@ -271,8 +272,9 @@ export class RefBuilder { } private changeConstructor = (raw: Event): Change => { - const [dbInstance, path] = resourceToInstanceAndPath( - raw.context.resource.name + const [dbInstance, path] = extractInstanceAndPath( + raw.context.resource.name, + raw.context.domain ); const before = new DataSnapshot( raw.data.data, @@ -293,9 +295,19 @@ export class RefBuilder { }; } -/* Utility function to extract database reference from resource string */ +/** + * Utility function to extract database reference from resource string + * + * @param optional database domain override for the original of the source database. + * It defaults to `firebaseio.com`. + * Multi-region RTDB will be served from different domains. + * Since region is not part of the resource name, it is provided through context. + */ /** @hidden */ -export function resourceToInstanceAndPath(resource: string) { +export function extractInstanceAndPath( + resource: string, + domain = 'firebaseio.com' +) { const resourceRegex = `projects/([^/]+)/instances/([a-zA-Z0-9\-^/]+)/refs(/.+)?`; const match = resource.match(new RegExp(resourceRegex)); if (!match) { @@ -310,7 +322,7 @@ export function resourceToInstanceAndPath(resource: string) { `Expect project to be '_' in a Firebase Realtime Database event` ); } - const dbInstance = 'https://' + dbInstanceName + '.firebaseio.com'; + const dbInstance = 'https://' + dbInstanceName + '.' + domain; return [dbInstance, path]; } From f907d68e9e3d6500a357fbfd4722e6fc201e1e56 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 28 May 2020 10:25:58 -0700 Subject: [PATCH 228/705] Update CHANGELOG.md (#694) --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b39bddd01..ecf68561e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -- Pin `@types/express` version to 4.17.3 to fix type definition issue (#685) +- Pin `@types/express` version to 4.17.3 to fix type definition issue (Issue #685). +- Firestore onCreate, onUpdate, and onDelete now receive a `QueryDocumentSnapshot` instead of `DocumentSnapshot`, which guarantees that data is not undefined (Issue #659). +- Modify return type of `DataSnapshot.forEach` to `boolean | void` match `firebase-admin` SDK. From 4fdf9dbdfc29eeb98c2c46f455ea17f353591dec Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 28 May 2020 17:28:56 +0000 Subject: [PATCH 229/705] 3.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 020998793..c0403aafa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.6.1", + "version": "3.6.2", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From bb6f038f76c35dd64f48e8293a7e1b3e464999bb Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 28 May 2020 17:29:01 +0000 Subject: [PATCH 230/705] [firebase-release] Removed change log and reset repo after 3.6.2 release --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf68561e..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +0,0 @@ -- Pin `@types/express` version to 4.17.3 to fix type definition issue (Issue #685). -- Firestore onCreate, onUpdate, and onDelete now receive a `QueryDocumentSnapshot` instead of `DocumentSnapshot`, which guarantees that data is not undefined (Issue #659). -- Modify return type of `DataSnapshot.forEach` to `boolean | void` match `firebase-admin` SDK. From bb92d38238dda02e376e585b3e80af2e68008e68 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 2 Jun 2020 09:31:35 -0700 Subject: [PATCH 231/705] Adds structured logging API. (#665) --- CHANGELOG.md | 18 ++++++ spec/logger.spec.ts | 105 ++++++++++++++++++++++++++++++++ src/index.ts | 2 + src/logger.ts | 135 ++++++++++++++++++++++++++++++++++++++++++ src/logger/compat.ts | 8 +++ tsconfig.release.json | 2 +- 6 files changed, 269 insertions(+), 1 deletion(-) create mode 100644 spec/logger.spec.ts create mode 100644 src/logger.ts create mode 100644 src/logger/compat.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..f85fd69b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +- Adds `functions.logger` SDK to enable structured logging in the Node.js 10 runtime. For example: + + ```js + const functions = require('firebase-functions'); + + functions.logger.debug('example log with structured data', { + uid: user.uid, + authorized: true, + }); + ``` + + The logger can also override default behavior of `console.*` methods through a special require: + + ```js + require('firebase-functions/logger/compat'); + ``` + + In older runtimes, logger prints to the console, and no structured data is saved. diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts new file mode 100644 index 000000000..517f50f1d --- /dev/null +++ b/spec/logger.spec.ts @@ -0,0 +1,105 @@ +import { expect } from 'chai'; +import * as sinon from 'sinon'; +import * as logger from '../src/logger'; + +const SUPPORTS_STRUCTURED_LOGS = + parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10; + +describe(`logger (${ + SUPPORTS_STRUCTURED_LOGS ? 'structured' : 'unstructured' +})`, () => { + let sandbox: sinon.SinonSandbox; + let stdoutStub: sinon.SinonStub; + let stderrStub: sinon.SinonStub; + + beforeEach(() => { + sandbox = sinon.createSandbox(); + stdoutStub = sandbox.stub(process.stdout, 'write'); + stderrStub = sandbox.stub(process.stderr, 'write'); + }); + + function expectOutput(stdStub: sinon.SinonStub, entry: any) { + if (SUPPORTS_STRUCTURED_LOGS) { + return expect( + JSON.parse((stdStub.getCalls()[0].args[0] as string).trim()) + ).to.deep.eq(entry); + } else { + // legacy logging is not structured, but do a sanity check + return expect(stdStub.getCalls()[0].args[0]).to.include(entry.message); + } + } + + function expectStdout(entry: any) { + return expectOutput(stdoutStub, entry); + } + + function expectStderr(entry: any) { + return expectOutput(stderrStub, entry); + } + + describe('logging methods', () => { + let writeStub: sinon.SinonStub; + beforeEach(() => { + writeStub = sinon.stub(logger, 'write'); + }); + + afterEach(() => { + writeStub.restore(); + }); + + it('should coalesce arguments into the message', () => { + logger.log('hello', { middle: 'obj' }, 'end message'); + expectStdout({ + severity: 'INFO', + message: "hello { middle: 'obj' } end message", + }); + sandbox.restore(); // to avoid swallowing test runner output + }); + + it('should merge structured data from the last argument', () => { + logger.log('hello', 'world', { additional: 'context' }); + expectStdout({ + severity: 'INFO', + message: 'hello world', + additional: 'context', + }); + sandbox.restore(); // to avoid swallowing test runner output + }); + }); + + describe('write', () => { + describe('structured logging', () => { + describe('write', () => { + for (const severity of ['DEBUG', 'INFO', 'NOTICE']) { + it(`should output ${severity} severity to stdout`, () => { + let entry: logger.LogEntry = { + severity: severity as logger.LogSeverity, + message: 'test', + }; + logger.write(entry); + expectStdout(entry); + sandbox.restore(); // to avoid swallowing test runner output + }); + } + + for (const severity of [ + 'WARNING', + 'ERROR', + 'CRITICAL', + 'ALERT', + 'EMERGENCY', + ]) { + it(`should output ${severity} severity to stderr`, () => { + let entry: logger.LogEntry = { + severity: severity as logger.LogSeverity, + message: 'test', + }; + logger.write(entry); + expectStderr(entry); + sandbox.restore(); // to avoid swallowing test runner output + }); + } + }); + }); + }); +}); diff --git a/src/index.ts b/src/index.ts index d4951c512..dcca98172 100644 --- a/src/index.ts +++ b/src/index.ts @@ -33,6 +33,7 @@ import * as storage from './providers/storage'; import * as testLab from './providers/testLab'; import * as apps from './apps'; +import * as logger from './logger'; import { handler } from './handler-builder'; import { setup } from './setup'; @@ -51,6 +52,7 @@ export { remoteConfig, storage, testLab, + logger, }; // Exported root types: diff --git a/src/logger.ts b/src/logger.ts new file mode 100644 index 000000000..7d4c91cbf --- /dev/null +++ b/src/logger.ts @@ -0,0 +1,135 @@ +import { format } from 'util'; + +// safely preserve unpatched console.* methods in case of compat require +const unpatchedConsole = { + debug: console.debug, + info: console.info, + log: console.log, + warn: console.warn, + error: console.error, +}; + +// Determine if structured logs are supported (node >= 10). If something goes wrong, +// assume no since unstructured is safer. +const SUPPORTS_STRUCTURED_LOGS = + parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10; + +// Map LogSeverity types to their equivalent `console.*` method. +const CONSOLE_SEVERITY: { + [severity: string]: 'debug' | 'info' | 'warn' | 'error'; +} = { + DEBUG: 'debug', + INFO: 'info', + NOTICE: 'info', + WARNING: 'warn', + ERROR: 'error', + CRITICAL: 'error', + ALERT: 'error', + EMERGENCY: 'error', +}; + +/** + * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity) for more. + */ +export type LogSeverity = + | 'DEBUG' + | 'INFO' + | 'NOTICE' + | 'WARNING' + | 'ERROR' + | 'CRITICAL' + | 'ALERT' + | 'EMERGENCY'; + +/** + * `LogEntry` represents a structured Cloud Logging entry. All keys aside from `severity` and `message` are + * included in the `jsonPayload` of the logged entry. + */ +export interface LogEntry { + severity: LogSeverity; + message?: string; + [key: string]: any; +} + +/** + * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). + * @param entry The LogEntry including severity, message, and any additional structured metadata. + */ +export function write(entry: LogEntry) { + if (SUPPORTS_STRUCTURED_LOGS) { + unpatchedConsole[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(entry)); + return; + } + + let message = entry.message || ''; + const jsonPayload: { [key: string]: any } = {}; + let jsonKeyCount = 0; + for (const k in entry) { + if (!['severity', 'message'].includes(k)) { + jsonKeyCount++; + jsonPayload[k] = entry[k]; + } + } + if (jsonKeyCount > 0) { + message = `${message} ${JSON.stringify(jsonPayload, null, 2)}`; + } + unpatchedConsole[CONSOLE_SEVERITY[entry.severity]](message); +} + +/** + * Writes a `DEBUG` severity log. If the last argument provided is a plain object, + * it will be added to the `jsonPayload` in the Cloud Logging entry. + * @param args Arguments, concatenated into the log message with space separators. + */ +export function debug(...args: any[]) { + write(entryFromArgs('DEBUG', args)); +} + +/** + * Writes an `INFO` severity log. If the last argument provided is a plain object, + * it will be added to the `jsonPayload` in the Cloud Logging entry. + * @param args Arguments, concatenated into the log message with space separators. + */ +export function log(...args: any[]) { + write(entryFromArgs('INFO', args)); +} + +/** + * Writes an `INFO` severity log. If the last argument provided is a plain object, + * it will be added to the `jsonPayload` in the Cloud Logging entry. + * @param args Arguments, concatenated into the log message with space separators. + */ +export function info(...args: any[]) { + write(entryFromArgs('INFO', args)); +} + +/** + * Writes a `WARNING` severity log. If the last argument provided is a plain object, + * it will be added to the `jsonPayload` in the Cloud Logging entry. + * @param args Arguments, concatenated into the log message with space separators. + */ +export function warn(...args: any[]) { + write(entryFromArgs('WARNING', args)); +} + +/** + * Writes an `ERROR` severity log. If the last argument provided is a plain object, + * it will be added to the `jsonPayload` in the Cloud Logging entry. + * @param args Arguments, concatenated into the log message with space separators. + */ +export function error(...args: any[]) { + write(entryFromArgs('ERROR', args)); +} + +function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry { + let entry = {}; + const lastArg = args[args.length - 1]; + if (typeof lastArg == 'object' && lastArg.constructor == Object) { + entry = args.pop(); + } + return Object.assign({}, entry, { + severity, + // mimic `console.*` behavior, see https://nodejs.org/api/console.html#console_console_log_data_args + message: format.apply(null, args), + }); +} diff --git a/src/logger/compat.ts b/src/logger/compat.ts new file mode 100644 index 000000000..6f6eda03f --- /dev/null +++ b/src/logger/compat.ts @@ -0,0 +1,8 @@ +import { debug, info, warn, error } from '../logger'; + +// IMPORTANT -- "../logger" must be imported before monkeypatching! +console.debug = debug; +console.info = info; +console.log = info; +console.warn = warn; +console.error = error; diff --git a/tsconfig.release.json b/tsconfig.release.json index e93d5d4b6..a226eb290 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -10,5 +10,5 @@ "target": "es2017", "typeRoots": ["./node_modules/@types"] }, - "files": ["./src/index.ts"] + "files": ["./src/index.ts", "./src/logger.ts", "./src/logger/compat.ts"] } From e447949d0d6095b130ca5551e3396b45ff5d589a Mon Sep 17 00:00:00 2001 From: Sebastian Kreft Date: Tue, 9 Jun 2020 17:34:43 -0400 Subject: [PATCH 232/705] fix: onRequest type definitions (#696) --- src/cloud-functions.ts | 2 +- src/providers/https.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index f8b1b1c1e..f249bf7f9 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -281,7 +281,7 @@ export interface Runnable { * arguments. */ export type HttpsFunction = TriggerAnnotated & - ((req: Request, resp: Response) => void); + ((req: Request, resp: Response) => void | Promise); /** * The Cloud Function type for all non-HTTPS triggers. This should be exported diff --git a/src/providers/https.ts b/src/providers/https.ts index 605c633f0..cd9f1745d 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -39,7 +39,7 @@ export interface Request extends express.Request { * same signature as an Express app. */ export function onRequest( - handler: (req: Request, resp: express.Response) => void + handler: (req: Request, resp: express.Response) => void | Promise ): HttpsFunction { return _onRequestWithOptions(handler, {}); } @@ -56,7 +56,7 @@ export function onCall( /** @hidden */ export function _onRequestWithOptions( - handler: (req: Request, resp: express.Response) => void, + handler: (req: Request, resp: express.Response) => void | Promise, options: DeploymentOptions ): HttpsFunction { // lets us add __trigger without altering handler: From c26ed9e6bee56f285118975e8afa6680657af5f3 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 9 Jun 2020 15:10:47 -0700 Subject: [PATCH 233/705] Makes "logger/compat" more focused on compatibility. Fixes #697 (#701) --- CHANGELOG.md | 4 ++-- src/logger.ts | 36 +++++++----------------------------- src/logger/common.ts | 27 +++++++++++++++++++++++++++ src/logger/compat.ts | 30 ++++++++++++++++++++++++------ 4 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 src/logger/common.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index f85fd69b3..1b87ad8b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,10 @@ }); ``` - The logger can also override default behavior of `console.*` methods through a special require: +- Adds a special require that mimics Node.js 8 runtime logging in Node.js 10 and later runtimes: ```js require('firebase-functions/logger/compat'); ``` - In older runtimes, logger prints to the console, and no structured data is saved. + In newer runtimes, requiring this will emit text logs with multi-line support and appropriate severity. In the Node.js 8 runtime, the `compat` module has no effect. diff --git a/src/logger.ts b/src/logger.ts index 7d4c91cbf..258dbbdff 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1,32 +1,10 @@ import { format } from 'util'; -// safely preserve unpatched console.* methods in case of compat require -const unpatchedConsole = { - debug: console.debug, - info: console.info, - log: console.log, - warn: console.warn, - error: console.error, -}; - -// Determine if structured logs are supported (node >= 10). If something goes wrong, -// assume no since unstructured is safer. -const SUPPORTS_STRUCTURED_LOGS = - parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10; - -// Map LogSeverity types to their equivalent `console.*` method. -const CONSOLE_SEVERITY: { - [severity: string]: 'debug' | 'info' | 'warn' | 'error'; -} = { - DEBUG: 'debug', - INFO: 'info', - NOTICE: 'info', - WARNING: 'warn', - ERROR: 'error', - CRITICAL: 'error', - ALERT: 'error', - EMERGENCY: 'error', -}; +import { + SUPPORTS_STRUCTURED_LOGS, + CONSOLE_SEVERITY, + UNPATCHED_CONSOLE, +} from './logger/common'; /** * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity) for more. @@ -57,7 +35,7 @@ export interface LogEntry { */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { - unpatchedConsole[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(entry)); + UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(entry)); return; } @@ -73,7 +51,7 @@ export function write(entry: LogEntry) { if (jsonKeyCount > 0) { message = `${message} ${JSON.stringify(jsonPayload, null, 2)}`; } - unpatchedConsole[CONSOLE_SEVERITY[entry.severity]](message); + UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](message); } /** diff --git a/src/logger/common.ts b/src/logger/common.ts new file mode 100644 index 000000000..f8b1f0ed9 --- /dev/null +++ b/src/logger/common.ts @@ -0,0 +1,27 @@ +// Determine if structured logs are supported (node >= 10). If something goes wrong, +// assume no since unstructured is safer. +export const SUPPORTS_STRUCTURED_LOGS = + parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10; + +// Map LogSeverity types to their equivalent `console.*` method. +export const CONSOLE_SEVERITY: { + [severity: string]: 'debug' | 'info' | 'warn' | 'error'; +} = { + DEBUG: 'debug', + INFO: 'info', + NOTICE: 'info', + WARNING: 'warn', + ERROR: 'error', + CRITICAL: 'error', + ALERT: 'error', + EMERGENCY: 'error', +}; + +// safely preserve unpatched console.* methods in case of compat require +export const UNPATCHED_CONSOLE = { + debug: console.debug, + info: console.info, + log: console.log, + warn: console.warn, + error: console.error, +}; diff --git a/src/logger/compat.ts b/src/logger/compat.ts index 6f6eda03f..48647f5e3 100644 --- a/src/logger/compat.ts +++ b/src/logger/compat.ts @@ -1,8 +1,26 @@ -import { debug, info, warn, error } from '../logger'; +import { + SUPPORTS_STRUCTURED_LOGS, + UNPATCHED_CONSOLE, + CONSOLE_SEVERITY, +} from './common'; +import { format } from 'util'; + +function patchedConsole(severity: string): (data: any, ...args: any[]) => void { + return function(data: any, ...args: any[]): void { + if (SUPPORTS_STRUCTURED_LOGS) { + UNPATCHED_CONSOLE[CONSOLE_SEVERITY[severity]]( + JSON.stringify({ severity, message: format(data, ...args) }) + ); + return; + } + + UNPATCHED_CONSOLE[CONSOLE_SEVERITY[severity]](data, ...args); + }; +} // IMPORTANT -- "../logger" must be imported before monkeypatching! -console.debug = debug; -console.info = info; -console.log = info; -console.warn = warn; -console.error = error; +console.debug = patchedConsole('DEBUG'); +console.info = patchedConsole('INFO'); +console.log = patchedConsole('INFO'); +console.warn = patchedConsole('WARNING'); +console.error = patchedConsole('ERROR'); From 0c684322f91410cdb8d77c97de174f9dbb17a909 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 9 Jun 2020 16:06:49 -0700 Subject: [PATCH 234/705] Fix compat path in CHANGELOG (#702) --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b87ad8b8..248ab7792 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,9 @@ - Adds a special require that mimics Node.js 8 runtime logging in Node.js 10 and later runtimes: ```js - require('firebase-functions/logger/compat'); + require('firebase-functions/lib/logger/compat'); ``` In newer runtimes, requiring this will emit text logs with multi-line support and appropriate severity. In the Node.js 8 runtime, the `compat` module has no effect. + +- Fixes `https.onRequest` type signature to allow Promises for `async` functions. From 505f357b1c57338e55ae5da16e62e4398d3dc746 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 9 Jun 2020 23:18:37 +0000 Subject: [PATCH 235/705] 3.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0403aafa..6e198c416 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.6.2", + "version": "3.7.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From c23a8c11299f93f32a59507009f88999851082b6 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 9 Jun 2020 23:18:44 +0000 Subject: [PATCH 236/705] [firebase-release] Removed change log and reset repo after 3.7.0 release --- CHANGELOG.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 248ab7792..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +0,0 @@ -- Adds `functions.logger` SDK to enable structured logging in the Node.js 10 runtime. For example: - - ```js - const functions = require('firebase-functions'); - - functions.logger.debug('example log with structured data', { - uid: user.uid, - authorized: true, - }); - ``` - -- Adds a special require that mimics Node.js 8 runtime logging in Node.js 10 and later runtimes: - - ```js - require('firebase-functions/lib/logger/compat'); - ``` - - In newer runtimes, requiring this will emit text logs with multi-line support and appropriate severity. In the Node.js 8 runtime, the `compat` module has no effect. - -- Fixes `https.onRequest` type signature to allow Promises for `async` functions. From f9b24e03a5b9da08866f990304f6623a4b909be3 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Tue, 23 Jun 2020 12:56:52 -0700 Subject: [PATCH 237/705] Adding logger SDK to reference, with some edits. (#714) * Adding logger SDK to reference, with some edits. * Adding link to structured logging details per feedback. --- docgen/content-sources/toc.yaml | 6 ++++++ src/logger.ts | 18 ++++++++++-------- src/logger/common.ts | 3 +++ src/logger/compat.ts | 1 + 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 91544d4f6..a394975df 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -93,6 +93,12 @@ toc: - title: 'CallableContext' path: /docs/reference/functions/providers_https_.callablecontext.html + - title: 'functions.logger' + path: /docs/reference/functions/logger_.html + section: + - title: 'LogEntry' + path: /docs/reference/functions/logger_.logentry.html + - title: 'functions.pubsub' path: /docs/reference/functions/providers_pubsub_.html section: diff --git a/src/logger.ts b/src/logger.ts index 258dbbdff..4bc851cec 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -7,7 +7,7 @@ import { } from './logger/common'; /** - * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity) for more. + * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity). */ export type LogSeverity = | 'DEBUG' @@ -20,7 +20,8 @@ export type LogSeverity = | 'EMERGENCY'; /** - * `LogEntry` represents a structured Cloud Logging entry. All keys aside from `severity` and `message` are + * `LogEntry` represents a [structured Cloud Logging](https://cloud.google.com/logging/docs/structured-logging) + * entry. All keys aside from `severity` and `message` are * included in the `jsonPayload` of the logged entry. */ export interface LogEntry { @@ -31,7 +32,7 @@ export interface LogEntry { /** * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). - * @param entry The LogEntry including severity, message, and any additional structured metadata. + * @param entry The `LogEntry` including severity, message, and any additional structured metadata. */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { @@ -56,7 +57,7 @@ export function write(entry: LogEntry) { /** * Writes a `DEBUG` severity log. If the last argument provided is a plain object, - * it will be added to the `jsonPayload` in the Cloud Logging entry. + * it is added to the `jsonPayload` in the Cloud Logging entry. * @param args Arguments, concatenated into the log message with space separators. */ export function debug(...args: any[]) { @@ -65,7 +66,7 @@ export function debug(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, - * it will be added to the `jsonPayload` in the Cloud Logging entry. + * it is added to the `jsonPayload` in the Cloud Logging entry. * @param args Arguments, concatenated into the log message with space separators. */ export function log(...args: any[]) { @@ -74,7 +75,7 @@ export function log(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, - * it will be added to the `jsonPayload` in the Cloud Logging entry. + * it is added to the `jsonPayload` in the Cloud Logging entry. * @param args Arguments, concatenated into the log message with space separators. */ export function info(...args: any[]) { @@ -83,7 +84,7 @@ export function info(...args: any[]) { /** * Writes a `WARNING` severity log. If the last argument provided is a plain object, - * it will be added to the `jsonPayload` in the Cloud Logging entry. + * it is added to the `jsonPayload` in the Cloud Logging entry. * @param args Arguments, concatenated into the log message with space separators. */ export function warn(...args: any[]) { @@ -92,13 +93,14 @@ export function warn(...args: any[]) { /** * Writes an `ERROR` severity log. If the last argument provided is a plain object, - * it will be added to the `jsonPayload` in the Cloud Logging entry. + * it is added to the `jsonPayload` in the Cloud Logging entry. * @param args Arguments, concatenated into the log message with space separators. */ export function error(...args: any[]) { write(entryFromArgs('ERROR', args)); } +/** @hidden */ function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry { let entry = {}; const lastArg = args[args.length - 1]; diff --git a/src/logger/common.ts b/src/logger/common.ts index f8b1f0ed9..f7ff0de78 100644 --- a/src/logger/common.ts +++ b/src/logger/common.ts @@ -1,9 +1,11 @@ // Determine if structured logs are supported (node >= 10). If something goes wrong, // assume no since unstructured is safer. +/** @hidden */ export const SUPPORTS_STRUCTURED_LOGS = parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10; // Map LogSeverity types to their equivalent `console.*` method. +/** @hidden */ export const CONSOLE_SEVERITY: { [severity: string]: 'debug' | 'info' | 'warn' | 'error'; } = { @@ -18,6 +20,7 @@ export const CONSOLE_SEVERITY: { }; // safely preserve unpatched console.* methods in case of compat require +/** @hidden */ export const UNPATCHED_CONSOLE = { debug: console.debug, info: console.info, diff --git a/src/logger/compat.ts b/src/logger/compat.ts index 48647f5e3..a7c27bd16 100644 --- a/src/logger/compat.ts +++ b/src/logger/compat.ts @@ -5,6 +5,7 @@ import { } from './common'; import { format } from 'util'; +/** @hidden */ function patchedConsole(severity: string): (data: any, ...args: any[]) => void { return function(data: any, ...args: any[]): void { if (SUPPORTS_STRUCTURED_LOGS) { From d06bcbee7b147843e3de85363d6dd090767064c9 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Wed, 24 Jun 2020 10:51:39 -0700 Subject: [PATCH 238/705] Handles `null` in structured logging (Fixes #716) (#717) --- spec/logger.spec.ts | 9 +++++++++ src/logger.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts index 517f50f1d..c6859b60a 100644 --- a/spec/logger.spec.ts +++ b/spec/logger.spec.ts @@ -65,6 +65,15 @@ describe(`logger (${ }); sandbox.restore(); // to avoid swallowing test runner output }); + + it('should not recognize null as a structured logging object', () => { + logger.log('hello', 'world', null); + expectStdout({ + severity: 'INFO', + message: 'hello world null', + }); + sandbox.restore(); // to avoid swallowing test runner output + }); }); describe('write', () => { diff --git a/src/logger.ts b/src/logger.ts index 4bc851cec..7958ca457 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -104,7 +104,7 @@ export function error(...args: any[]) { function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry { let entry = {}; const lastArg = args[args.length - 1]; - if (typeof lastArg == 'object' && lastArg.constructor == Object) { + if (lastArg && typeof lastArg == 'object' && lastArg.constructor == Object) { entry = args.pop(); } return Object.assign({}, entry, { From 5f7c7acc9deb4e7c9ab1ab32c660ae035a63f93c Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Thu, 25 Jun 2020 08:25:42 -0700 Subject: [PATCH 239/705] Changelog update (#718) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..43975c685 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fixes error when last argument to logger methods is `null`. (#716) From b6e611baab000303b55958b55bdcf6655069f221 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 7 Jul 2020 13:23:23 -0700 Subject: [PATCH 240/705] Adds newly available GCF regions. (#722) --- CHANGELOG.md | 2 ++ scripts/fetch-regions | 7 +++++++ spec/function-builder.spec.ts | 30 ------------------------------ src/function-builder.ts | 11 ++++------- src/function-configuration.ts | 6 +++++- 5 files changed, 18 insertions(+), 38 deletions(-) create mode 100755 scripts/fetch-regions diff --git a/CHANGELOG.md b/CHANGELOG.md index 43975c685..edab83fdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ - Fixes error when last argument to logger methods is `null`. (#716) +- Adds newly available locations `us-west3`, `europe-west6`, `northamerica-northeast1`, and `australia-southeast1`. +- No longer throw errors for unrecognized regions (deploy will error instead). diff --git a/scripts/fetch-regions b/scripts/fetch-regions new file mode 100755 index 000000000..d529cdf9b --- /dev/null +++ b/scripts/fetch-regions @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ -z $1 ]; then + echo "Must provide a project id as first argument." && exit 1 +fi; + +gcloud functions regions list --project $1 --format=json | jq 'map(.locationId)' \ No newline at end of file diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 0044e5661..0ad4265ed 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -121,14 +121,6 @@ describe('FunctionBuilder', () => { expect(fn.__trigger.timeout).to.deep.equal('90s'); }); - it('should fail if valid runtime options but unsupported region are set (reverse order)', () => { - expect(() => { - functions - .runWith({ timeoutSeconds: 90, memory: '256MB' }) - .region('unsupported' as any); - }).to.throw(Error, 'region'); - }); - it('should fail if supported region but invalid runtime options are set (reverse order)', () => { expect(() => { functions @@ -165,28 +157,6 @@ describe('FunctionBuilder', () => { }).to.throw(Error, 'TimeoutSeconds'); }); - it('should throw an error if user chooses an invalid region', () => { - expect(() => { - return functions.region('unsupported' as any); - }).to.throw(Error, 'region'); - - expect(() => { - return functions.region('unsupported' as any).runWith({ - timeoutSeconds: 500, - } as any); - }).to.throw(Error, 'region'); - - expect(() => { - return functions.region('unsupported' as any, 'us-east1'); - }).to.throw(Error, 'region'); - - expect(() => { - return functions.region('unsupported' as any, 'us-east1').runWith({ - timeoutSeconds: 500, - } as any); - }).to.throw(Error, 'region'); - }); - it('should throw an error if user chooses no region when using .region()', () => { expect(() => { return functions.region(); diff --git a/src/function-builder.ts b/src/function-builder.ts index 580e0498b..76c4b6c9d 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -78,11 +78,6 @@ function assertRegionsAreValid(regions: string[]): boolean { if (!regions.length) { throw new Error('You must specify at least one region'); } - if (_.difference(regions, SUPPORTED_REGIONS).length) { - throw new Error( - `The only valid regions are: ${SUPPORTED_REGIONS.join(', ')}` - ); - } return true; } @@ -95,7 +90,7 @@ function assertRegionsAreValid(regions: string[]): boolean { * functions.region('us-east1', 'us-central1') */ export function region( - ...regions: Array + ...regions: Array ): FunctionBuilder { if (assertRegionsAreValid(regions)) { return new FunctionBuilder({ regions }); @@ -127,7 +122,9 @@ export class FunctionBuilder { * @example * functions.region('us-east1', 'us-central1') */ - region(...regions: Array): FunctionBuilder { + region( + ...regions: Array + ): FunctionBuilder { if (assertRegionsAreValid(regions)) { this.options.regions = regions; return this; diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 05d4517a8..2ec102fda 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -5,11 +5,15 @@ export const SUPPORTED_REGIONS = [ 'us-central1', 'us-east1', 'us-east4', + 'us-west3', 'europe-west1', 'europe-west2', 'europe-west3', + 'europe-west6', 'asia-east2', 'asia-northeast1', + 'northamerica-northeast1', + 'australia-southeast1', ] as const; /** @@ -70,6 +74,6 @@ export interface RuntimeOptions { } export interface DeploymentOptions extends RuntimeOptions { - regions?: Array; + regions?: Array; schedule?: Schedule; } From ab3ae2af275a0037eff905804a49d031f1734f93 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Wed, 8 Jul 2020 15:02:58 -0400 Subject: [PATCH 241/705] Fix issues with .ref in Database functions (#727) --- CHANGELOG.md | 1 + src/providers/database.ts | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edab83fdb..35049e3ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ - Fixes error when last argument to logger methods is `null`. (#716) - Adds newly available locations `us-west3`, `europe-west6`, `northamerica-northeast1`, and `australia-southeast1`. - No longer throw errors for unrecognized regions (deploy will error instead). +- Fixes error where `snap.ref` in database functions did not work when using the Emulator Suite (#726) diff --git a/src/providers/database.ts b/src/providers/database.ts index 8c8de4ec6..2aa50b55a 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -41,6 +41,7 @@ export const provider = 'google.firebase.database'; export const service = 'firebaseio.com'; const databaseURLRegex = new RegExp('^https://([^.]+).'); +const emulatorDatabaseURLRegex = new RegExp('^http://.*ns=([^&]+)'); /** * Registers a function that triggers on events from a specific @@ -138,14 +139,25 @@ export function _refWithOptions( '\n If you are unit testing, please set process.env.FIREBASE_CONFIG' ); } - const match = databaseURL.match(databaseURLRegex); - if (!match) { + + let instance = undefined; + const prodMatch = databaseURL.match(databaseURLRegex); + if (prodMatch) { + instance = prodMatch[1]; + } else { + const emulatorMatch = databaseURL.match(emulatorDatabaseURLRegex); + if (emulatorMatch) { + instance = emulatorMatch[1]; + } + } + + if (!instance) { throw new Error( 'Invalid value for config firebase.databaseURL: ' + databaseURL ); } - const subdomain = match[1]; - return `projects/_/instances/${subdomain}/refs/${normalized}`; + + return `projects/_/instances/${instance}/refs/${normalized}`; }; return new RefBuilder(apps(), resourceGetter, options); @@ -350,7 +362,10 @@ export class DataSnapshot { private app?: firebase.app.App, instance?: string ) { - if (instance) { + if (app && app.options.databaseURL.startsWith('http:')) { + // In this case we're dealing with an emulator + this.instance = app.options.databaseURL; + } else if (instance) { // SDK always supplies instance, but user's unit tests may not this.instance = instance; } else if (app) { From ad144e41c82e551fe323d473919d7e8426d11d84 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 9 Jul 2020 17:09:42 -0700 Subject: [PATCH 242/705] Update ref docs for handler SDK to include scheduled functions. (#731) --- src/handler-builder.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/handler-builder.ts b/src/handler-builder.ts index 81232df59..ea0f4af74 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -305,13 +305,20 @@ export class HandlerBuilder { /** * Create a handler for Cloud Pub/Sub events. - - * `pubsub.onPublish` handles the publication of messages to a topic. - + * + * `topic.onPublish` handles messages published to a Pub/Sub topic from SDKs, Cloud Console, or gcloud CLI. + * * @example * ```javascript * exports.myFunction = functions.handler.pubsub.topic.onPublish((message) => { ... }) * ``` + + * `schedule.onPublish` handles messages published to a Pub/Sub topic on a schedule. + * + * @example + * ```javascript + * exports.myFunction = functions.handler.pubsub.schedule.onPublish((message) => { ... }) + * ``` */ get pubsub() { return { From 858cb9befd9468a9f1e1f2fb0d6f339cce3dec35 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Fri, 10 Jul 2020 11:01:11 -0700 Subject: [PATCH 243/705] Eg pubsub fixes (#729) * Adding logger SDK to reference, with some edits. * Adding link to structured logging details per feedback. * Adding ScheduleBuilder class to TOC and adding minimal commenting. * Improving wording and format per feedback. * I think we need to document both the schedule function and the builder class this way. * Last edits from feedback. --- docgen/content-sources/toc.yaml | 2 ++ src/providers/pubsub.ts | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index a394975df..37093f7c2 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -106,6 +106,8 @@ toc: path: /docs/reference/functions/providers_pubsub_.message.html - title: 'TopicBuilder' path: /docs/reference/functions/providers_pubsub_.topicbuilder.html + - title: 'ScheduleBuilder' + path: /docs/reference/functions/providers_pubsub_.schedulebuilder.html - title: 'functions.remoteconfig' path: /docs/reference/functions/providers_remoteconfig_.html diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index 0f12f669c..264ef9480 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -98,6 +98,12 @@ export class TopicBuilder { } } +/** + * Registers a Cloud Function to run at specified times. + * + * @param schedule The schedule, in Unix Crontab or AppEngine syntax. + * @return ScheduleBuilder interface. + */ export function schedule(schedule: string): ScheduleBuilder { return _scheduleWithOptions(schedule, {}); } @@ -120,6 +126,15 @@ export function _scheduleWithOptions( }); } +/** + * The builder for scheduled functions, which are powered by + * Google Pub/Sub and Cloud Scheduler. Describes the Cloud Scheduler + * job that is deployed to trigger a scheduled function at the provided + * frequency. For more information, see + * [Schedule functions](/docs/functions/schedule-functions). + * + * Access via [`functions.pubsub.schedule()`](providers_pubsub_.html#schedule). + */ export class ScheduleBuilder { /** @hidden */ constructor( @@ -137,6 +152,14 @@ export class ScheduleBuilder { return this; } + /** + * Event handler for scheduled functions. Triggered whenever the associated + * scheduler job sends a Pub/Sub message. + * + * @param handler Handler that fires whenever the associated + * scheduler job sends a Pub/Sub message. + * @return A Cloud Function that you can export and deploy. + */ onRun(handler: (context: EventContext) => PromiseLike | any) { const cloudFunction = makeCloudFunction({ contextOnlyHandler: handler, From b424fd3ccb4284a663213993fe2349eaef057992 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Fri, 10 Jul 2020 15:21:09 -0700 Subject: [PATCH 244/705] Adds four new regions launched July 10. (#733) --- CHANGELOG.md | 10 +++++++++- src/function-configuration.ts | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35049e3ca..d85f674fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ - Fixes error when last argument to logger methods is `null`. (#716) -- Adds newly available locations `us-west3`, `europe-west6`, `northamerica-northeast1`, and `australia-southeast1`. +- Adds eight new available regions: + - `us-west2` + - `us-west3` + - `us-west4` + - `europe-west6` + - `asia-northeast2` + - `northamerica-northeast1` + - `southamerica-east1` + - `australia-southeast1` - No longer throw errors for unrecognized regions (deploy will error instead). - Fixes error where `snap.ref` in database functions did not work when using the Emulator Suite (#726) diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 2ec102fda..0ab2f9c31 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -5,14 +5,18 @@ export const SUPPORTED_REGIONS = [ 'us-central1', 'us-east1', 'us-east4', + 'us-west2', 'us-west3', + 'us-west4', 'europe-west1', 'europe-west2', 'europe-west3', 'europe-west6', 'asia-east2', 'asia-northeast1', + 'asia-northeast2', 'northamerica-northeast1', + 'southamerica-east1', 'australia-southeast1', ] as const; From 1e4de88ed658289f6c7d4e94ac24732726da04c0 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 14 Jul 2020 00:00:43 +0000 Subject: [PATCH 245/705] 3.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e198c416..bef1bb506 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.7.0", + "version": "3.8.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From a07d6efeb39600a6b8b31a583eef8fc4a694df50 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 14 Jul 2020 00:00:49 +0000 Subject: [PATCH 246/705] [firebase-release] Removed change log and reset repo after 3.8.0 release --- CHANGELOG.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d85f674fa..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +0,0 @@ -- Fixes error when last argument to logger methods is `null`. (#716) -- Adds eight new available regions: - - `us-west2` - - `us-west3` - - `us-west4` - - `europe-west6` - - `asia-northeast2` - - `northamerica-northeast1` - - `southamerica-east1` - - `australia-southeast1` -- No longer throw errors for unrecognized regions (deploy will error instead). -- Fixes error where `snap.ref` in database functions did not work when using the Emulator Suite (#726) From 8bc84dda6ed1b9dc485c0f462aec2d9066453442 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Fri, 31 Jul 2020 15:27:46 -0700 Subject: [PATCH 247/705] Updates logging in https callable functions. (#745) --- README.md | 2 +- src/cloud-functions.ts | 3 ++- src/providers/crashlytics.ts | 2 +- src/providers/https.ts | 34 ++++++++++++++++++---------------- src/setup.ts | 5 +++-- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 59c5c0936..33fbaa746 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ const notifyUsers = require('./notify-users'); exports.newPost = functions.database .ref('/posts/{postId}') .onCreate((snapshot, context) => { - console.log('Received new post with ID:', context.params.postId); + functions.logger.info('Received new post with ID:', context.params.postId); return notifyUsers(snapshot.val()); }); ``` diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index f249bf7f9..b97c4ad7e 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -23,6 +23,7 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; import { DeploymentOptions, Schedule } from './function-configuration'; +import { warn } from './logger'; export { Request, Response }; /** @hidden */ @@ -379,7 +380,7 @@ export function makeCloudFunction({ promise = handler(dataOrChange, context); } if (typeof promise === 'undefined') { - console.warn('Function returned undefined, expected Promise or value'); + warn('Function returned undefined, expected Promise or value'); } return Promise.resolve(promise) .then((result) => { diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts index e7a6fe882..54fc26469 100644 --- a/src/providers/crashlytics.ts +++ b/src/providers/crashlytics.ts @@ -77,7 +77,7 @@ export class IssueBuilder { * const slackMessage = ` There's a new issue (${issueId}) ` + * `in your app - ${issueTitle}`; * return notifySlack(slackMessage).then(() => { - * console.log(`Posted new issue ${issueId} successfully to Slack`); + * functions.logger.info(`Posted new issue ${issueId} successfully to Slack`); * }); * }); * ``` diff --git a/src/providers/https.ts b/src/providers/https.ts index cd9f1745d..ec397fc64 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -24,9 +24,11 @@ import * as cors from 'cors'; import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; + import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; +import { warn, error } from '../logger'; /** @hidden */ export interface Request extends express.Request { @@ -285,13 +287,13 @@ interface HttpResponseBody { function isValidRequest(req: Request): req is HttpRequest { // The body must not be empty. if (!req.body) { - console.warn('Request is missing body.'); + warn('Request is missing body.'); return false; } // Make sure it's a POST. if (req.method !== 'POST') { - console.warn('Request has invalid method.', req.method); + warn('Request has invalid method.', req.method); return false; } @@ -303,13 +305,13 @@ function isValidRequest(req: Request): req is HttpRequest { contentType = contentType.substr(0, semiColon).trim(); } if (contentType !== 'application/json') { - console.warn('Request has incorrect Content-Type.', contentType); + warn('Request has incorrect Content-Type.', contentType); return false; } // The body must have data. if (_.isUndefined(req.body.data)) { - console.warn('Request body is missing data.', req.body); + warn('Request body is missing data.', req.body); return false; } @@ -318,7 +320,7 @@ function isValidRequest(req: Request): req is HttpRequest { // Verify that the body does not have any extra fields. const extras = _.omit(req.body, 'data'); if (!_.isEmpty(extras)) { - console.warn('Request body has extra fields.', extras); + warn('Request body has extra fields.', extras); return false; } return true; @@ -363,7 +365,7 @@ export function encode(data: any): any { return _.mapValues(data, encode); } // If we got this far, the data is not encodable. - console.error('Data cannot be encoded in JSON.', data); + error('Data cannot be encoded in JSON.', data); throw new Error('Data cannot be encoded in JSON: ' + data); } @@ -386,13 +388,13 @@ export function decode(data: any): any { // worth all the extra code to detect that case. const value = parseFloat(data.value); if (_.isNaN(value)) { - console.error('Data cannot be decoded from JSON.', data); + error('Data cannot be decoded from JSON.', data); throw new Error('Data cannot be decoded from JSON: ' + data); } return value; } default: { - console.error('Data cannot be decoded from JSON.', data); + error('Data cannot be decoded from JSON.', data); throw new Error('Data cannot be decoded from JSON: ' + data); } } @@ -420,7 +422,7 @@ export function _onCallWithOptions( const func = async (req: Request, res: express.Response) => { try { if (!isValidRequest(req)) { - console.error('Invalid request', req); + error('Invalid request, unable to process.'); throw new HttpsError('invalid-argument', 'Bad Request'); } @@ -441,7 +443,7 @@ export function _onCallWithOptions( uid: authToken.uid, token: authToken, }; - } catch (e) { + } catch (err) { throw new HttpsError('unauthenticated', 'Unauthenticated'); } } @@ -464,15 +466,15 @@ export function _onCallWithOptions( // If there was some result, encode it in the body. const responseBody: HttpResponseBody = { result }; res.status(200).send(responseBody); - } catch (error) { - if (!(error instanceof HttpsError)) { + } catch (err) { + if (!(err instanceof HttpsError)) { // This doesn't count as an 'explicit' error. - console.error('Unhandled error', error); - error = new HttpsError('internal', 'INTERNAL'); + error('Unhandled error', error); + err = new HttpsError('internal', 'INTERNAL'); } - const { status } = error.httpErrorCode; - const body = { error: error.toJSON() }; + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; res.status(status).send(body); } diff --git a/src/setup.ts b/src/setup.ts index b30fa6226..d2935af15 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -22,6 +22,7 @@ /** @hidden */ import { firebaseConfig } from './config'; +import { warn } from './logger'; // Set up for config and vars export function setup() { @@ -45,7 +46,7 @@ export function setup() { // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate if (!process.env.FIREBASE_CONFIG) { if (process.env.GCLOUD_PROJECT) { - console.warn( + warn( 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' ); process.env.FIREBASE_CONFIG = JSON.stringify({ @@ -58,7 +59,7 @@ export function setup() { projectId: process.env.GCLOUD_PROJECT, }); } else { - console.warn( + warn( 'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail' ); } From e4f2eba2367fd6863e340617e49b55b214d4d8b6 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Fri, 31 Jul 2020 15:34:06 -0700 Subject: [PATCH 248/705] Adds support for three new regions. (#750) --- CHANGELOG.md | 2 ++ src/function-configuration.ts | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..3c25216f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Updates HTTP callable functions to use structured logging for Node 10+ environments. +- Adds type hints for new Cloud Functions regions `asia-northeast3`, `asia-south1`, and `asia-southeast2`. diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 0ab2f9c31..a7d87b726 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -15,6 +15,9 @@ export const SUPPORTED_REGIONS = [ 'asia-east2', 'asia-northeast1', 'asia-northeast2', + 'asia-northeast3', + 'asia-south1', + 'asia-southeast2', 'northamerica-northeast1', 'southamerica-east1', 'australia-southeast1', From 0ae7c3c8b8fd985fe669c2768df7df3ce847e5f3 Mon Sep 17 00:00:00 2001 From: p-young <35713583+p-young@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:48:04 -0700 Subject: [PATCH 249/705] Fix onRequest handler return type to allow promises (async) (#705) Co-authored-by: Michael Bleigh --- src/function-builder.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/function-builder.ts b/src/function-builder.ts index 76c4b6c9d..27fcd821a 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -154,7 +154,10 @@ export class FunctionBuilder { * same signature as an Express app. */ onRequest: ( - handler: (req: https.Request, resp: express.Response) => void + handler: ( + req: https.Request, + resp: express.Response + ) => void | Promise ) => https._onRequestWithOptions(handler, this.options), /** * Declares a callable method for clients to call using a Firebase SDK. From 78fb92f7943ccb5e244ae4b5a164cfa302faa719 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Fri, 31 Jul 2020 16:11:18 -0700 Subject: [PATCH 250/705] Update CHANGELOG.md (#751) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c25216f0..3b20c6064 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Updates HTTP callable functions to use structured logging for Node 10+ environments. - Adds type hints for new Cloud Functions regions `asia-northeast3`, `asia-south1`, and `asia-southeast2`. +- Updates type definition of `https.onRequest` to allow for promises (async functions). From e91d16a0c7d39c8894a7226e3f79700d6c6f1c01 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 31 Jul 2020 23:20:59 +0000 Subject: [PATCH 251/705] 3.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bef1bb506..cec716c20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.8.0", + "version": "3.9.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 02f61cf1dc3828cb8af842ed15c1cbab3466b074 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 31 Jul 2020 23:21:05 +0000 Subject: [PATCH 252/705] [firebase-release] Removed change log and reset repo after 3.9.0 release --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b20c6064..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +0,0 @@ -- Updates HTTP callable functions to use structured logging for Node 10+ environments. -- Adds type hints for new Cloud Functions regions `asia-northeast3`, `asia-south1`, and `asia-southeast2`. -- Updates type definition of `https.onRequest` to allow for promises (async functions). From c69c974f18431f27244f03abfb67955718b4efb7 Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Fri, 7 Aug 2020 14:17:48 -0700 Subject: [PATCH 253/705] Update reference docs for EventContext.EventType (#743) --- src/cloud-functions.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index b97c4ad7e..1850b0d62 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -89,22 +89,22 @@ export interface EventContext { eventId: string; /** - * Type of event. Valid values are: + * Type of event. Possible values are: * - * * `providers/google.firebase.analytics/eventTypes/event.log` - * * `providers/firebase.auth/eventTypes/user.create` - * * `providers/firebase.auth/eventTypes/user.delete` - * * `providers/firebase.crashlytics/eventTypes/issue.new` - * * `providers/firebase.crashlytics/eventTypes/issue.regressed` - * * `providers/firebase.crashlytics/eventTypes/issue.velocityAlert` - * * `providers/google.firebase.database/eventTypes/ref.write` - * * `providers/google.firebase.database/eventTypes/ref.create` - * * `providers/google.firebase.database/eventTypes/ref.update` - * * `providers/google.firebase.database/eventTypes/ref.delete` - * * `providers/cloud.firestore/eventTypes/document.write` - * * `providers/cloud.firestore/eventTypes/document.create` - * * `providers/cloud.firestore/eventTypes/document.update` - * * `providers/cloud.firestore/eventTypes/document.delete` + * * `google.analytics.event.log` + * * `google.firebase.auth.user.create` + * * `google.firebase.auth.user.delete` + * * `google.firebase.crashlytics.issue.new` + * * `google.firebase.crashlytics.issue.regressed` + * * `google.firebase.crashlytics.issue.velocityAlert` + * * `google.firebase.database.ref.write` + * * `google.firebase.database.ref.create` + * * `google.firebase.database.ref.update` + * * `google.firebase.database.ref.delete` + * * `google.firestore.document.write` + * * `google.firestore.document.create` + * * `google.firestore.document.update` + * * `google.firestore.document.delete` * * `google.pubsub.topic.publish` * * `google.firebase.remoteconfig.update` * * `google.storage.object.finalize` From d1432c50863dec4b27834241279180f12f6148d5 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Mon, 10 Aug 2020 12:44:09 -0700 Subject: [PATCH 254/705] Updates firebase-admin peerDependency (#756) --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..bbf6a741b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Updates `firebase-admin` dependency to support `^9.0.0` in addition to `^8.0.0`. Note that `firebase-admin` no longer supports Node.js 8.x as of `9.0.0`. diff --git a/package.json b/package.json index cec716c20..8cb004a34 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "yargs": "^15.3.1" }, "peerDependencies": { - "firebase-admin": "^8.0.0" + "firebase-admin": "^8.0.0 || ^9.0.0" }, "engines": { "node": "^8.13.0 || >=10.10.0" From 84433df63147d61a5330f9b8d3e5c5e4837ad658 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Wed, 12 Aug 2020 10:27:37 -0700 Subject: [PATCH 255/705] Fixes logging of unhandled exceptions in callable functions. (#759) --- CHANGELOG.md | 1 + src/providers/https.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf6a741b..6a558f5e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Updates `firebase-admin` dependency to support `^9.0.0` in addition to `^8.0.0`. Note that `firebase-admin` no longer supports Node.js 8.x as of `9.0.0`. +- Fixes logging of unexpected errors in `https.onCall()` functions. diff --git a/src/providers/https.ts b/src/providers/https.ts index ec397fc64..cf64c9d90 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -469,7 +469,7 @@ export function _onCallWithOptions( } catch (err) { if (!(err instanceof HttpsError)) { // This doesn't count as an 'explicit' error. - error('Unhandled error', error); + error('Unhandled error', err); err = new HttpsError('internal', 'INTERNAL'); } From ae9e856f0be28e68ed8bf68a23f581eccfd7aed3 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 12 Aug 2020 19:58:53 +0000 Subject: [PATCH 256/705] 3.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cb004a34..6560a8d07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.9.0", + "version": "3.9.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From b7514295540b0e872e9be46656fb63b158fa9484 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 12 Aug 2020 19:58:58 +0000 Subject: [PATCH 257/705] [firebase-release] Removed change log and reset repo after 3.9.1 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a558f5e0..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Updates `firebase-admin` dependency to support `^9.0.0` in addition to `^8.0.0`. Note that `firebase-admin` no longer supports Node.js 8.x as of `9.0.0`. -- Fixes logging of unexpected errors in `https.onCall()` functions. From 5e287286c7aa6bbf66f36d21e49db5a7d5e06e20 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Mon, 17 Aug 2020 05:44:48 -0400 Subject: [PATCH 258/705] Restore failurePolicy (#760) --- CHANGELOG.md | 1 + spec/function-builder.spec.ts | 31 +++++++++++++++++++++++ src/cloud-functions.ts | 25 +++++++++++++++++-- src/function-builder.ts | 47 +++++++++++++++++++++++++++++------ src/function-configuration.ts | 13 ++++++++++ 5 files changed, 107 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..7c0e3b45c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adds support for functions failure policies (#482) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 0ad4265ed..1f9122061 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -82,6 +82,7 @@ describe('FunctionBuilder', () => { const fn = functions .runWith({ timeoutSeconds: 90, + failurePolicy: { retry: {} }, memory: '256MB', }) .auth.user() @@ -89,6 +90,20 @@ describe('FunctionBuilder', () => { expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); + }); + + it("should apply a default failure policy if it's aliased with `true`", () => { + const fn = functions + .runWith({ + failurePolicy: true, + memory: '256MB', + timeoutSeconds: 90, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} }); }); it('should allow both supported region and valid runtime options to be set', () => { @@ -129,6 +144,22 @@ describe('FunctionBuilder', () => { }).to.throw(Error, 'TimeoutSeconds'); }); + it('should throw an error if user chooses a failurePolicy which is neither an object nor a boolean', () => { + expect(() => + functions.runWith({ + failurePolicy: (1234 as unknown) as functions.RuntimeOptions['failurePolicy'], + }) + ).to.throw(Error, 'failurePolicy must be a boolean or an object'); + }); + + it('should throw an error if user chooses a failurePolicy.retry which is not an object', () => { + expect(() => + functions.runWith({ + failurePolicy: { retry: (1234 as unknown) as object }, + }) + ).to.throw(Error, 'failurePolicy.retry'); + }); + it('should throw an error if user chooses an invalid memory allocation', () => { expect(() => { return functions.runWith({ diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 1850b0d62..387953bdc 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -22,8 +22,13 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; -import { DeploymentOptions, Schedule } from './function-configuration'; import { warn } from './logger'; +import { + DEFAULT_FAILURE_POLICY, + DeploymentOptions, + FailurePolicy, + Schedule, +} from './function-configuration'; export { Request, Response }; /** @hidden */ @@ -205,6 +210,7 @@ export namespace Change { if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); } + return Change.fromObjects( customizer(before || {}), customizer(json.after || {}) @@ -219,7 +225,8 @@ export namespace Change { ) { const before = _.assign({}, after); const masks = fieldMask.split(','); - _.forEach(masks, (mask) => { + + masks.forEach((mask) => { const val = _.get(sparseBefore, mask); if (typeof val === 'undefined') { _.unset(before, mask); @@ -227,6 +234,7 @@ export namespace Change { _.set(before, mask, val); } }); + return before; } } @@ -256,6 +264,7 @@ export interface TriggerAnnotated { resource: string; service: string; }; + failurePolicy?: FailurePolicy; httpsTrigger?: {}; labels?: { [key: string]: string }; regions?: string[]; @@ -473,6 +482,18 @@ export function optionsToTrigger(options: DeploymentOptions) { if (options.regions) { trigger.regions = options.regions; } + if (options.failurePolicy !== undefined) { + switch (options.failurePolicy) { + case false: + trigger.failurePolicy = undefined; + break; + case true: + trigger.failurePolicy = DEFAULT_FAILURE_POLICY; + break; + default: + trigger.failurePolicy = options.failurePolicy; + } + } if (options.timeoutSeconds) { trigger.timeout = options.timeoutSeconds.toString() + 's'; } diff --git a/src/function-builder.ts b/src/function-builder.ts index 27fcd821a..6050927ea 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -66,6 +66,23 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { `TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}` ); } + if (runtimeOptions.failurePolicy !== undefined) { + if ( + _.isBoolean(runtimeOptions.failurePolicy) === false && + _.isObjectLike(runtimeOptions.failurePolicy) === false + ) { + throw new Error(`failurePolicy must be a boolean or an object.`); + } + + if (typeof runtimeOptions.failurePolicy === 'object') { + if ( + _.isObjectLike(runtimeOptions.failurePolicy.retry) === false || + _.isEmpty(runtimeOptions.failurePolicy.retry) === false + ) { + throw new Error('failurePolicy.retry must be an empty object.'); + } + } + } return true; } @@ -100,10 +117,14 @@ export function region( /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. memory: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 2. timeoutSeconds: timeout for the function in seconds, possible values are - * 0 to 540. + * 1. failurePolicy: failure policy of the function, with boolean `true` being + * equivalent to providing an empty retry object. + * 2. memory: amount of memory to allocate to the function, with possible + * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 3. timeoutSeconds: timeout for the function in seconds, with possible + * values being 0 to 540. + * + * Value must not be null. */ export function runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { if (assertRuntimeOptionsValid(runtimeOptions)) { @@ -134,10 +155,14 @@ export class FunctionBuilder { /** * Configure runtime options for the function. * @param runtimeOptions Object with three optional fields: - * 1. memory: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 2. timeoutSeconds: timeout for the function in seconds, possible values are - * 0 to 540. + * 1. failurePolicy: failure policy of the function, with boolean `true` being + * equivalent to providing an empty retry object. + * 2. memory: amount of memory to allocate to the function, with possible + * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 3. timeoutSeconds: timeout for the function in seconds, with possible + * values being 0 to 540. + * + * Value must not be null. */ runWith(runtimeOptions: RuntimeOptions): FunctionBuilder { if (assertRuntimeOptionsValid(runtimeOptions)) { @@ -147,6 +172,12 @@ export class FunctionBuilder { } get https() { + if (this.options.failurePolicy !== undefined) { + console.warn( + 'RuntimeOptions.failurePolicy is not supported in https functions.' + ); + } + return { /** * Handle HTTP requests. diff --git a/src/function-configuration.ts b/src/function-configuration.ts index a7d87b726..31c708f3f 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -64,7 +64,20 @@ export interface Schedule { retryConfig?: ScheduleRetryConfig; } +export interface FailurePolicy { + retry: {}; +} + +export const DEFAULT_FAILURE_POLICY: FailurePolicy = { + retry: {}, +}; + export interface RuntimeOptions { + /** + * Failure policy of the function, with boolean `true` being equivalent to + * providing an empty retry object. + */ + failurePolicy?: FailurePolicy | boolean; /** * Amount of memory to allocate to the function. */ From 7bd795e2fac0a87d9c3c57b31594b67cfc59ad8c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 20 Aug 2020 15:59:59 +0000 Subject: [PATCH 259/705] 3.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6560a8d07..48a71e881 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.9.1", + "version": "3.10.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From bc9d8caef0e44a84b7a1a4ca749268467bbe80df Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 20 Aug 2020 16:00:07 +0000 Subject: [PATCH 260/705] [firebase-release] Removed change log and reset repo after 3.10.0 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0e3b45c..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Adds support for functions failure policies (#482) From 6b15ff7da69721bc1a1ecd8e44f9c76481061213 Mon Sep 17 00:00:00 2001 From: David Hagege Date: Fri, 21 Aug 2020 08:28:36 +0900 Subject: [PATCH 261/705] Add support for VPC connectors in `functions.runWith` (#752) --- spec/function-builder.spec.ts | 39 +++++++++++++++++++++++++++++++++++ src/cloud-functions.ts | 11 ++++++++++ src/function-builder.ts | 31 ++++++++++++++++++++++------ src/function-configuration.ts | 19 +++++++++++++++++ 4 files changed, 94 insertions(+), 6 deletions(-) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 1f9122061..eec531fdf 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -199,4 +199,43 @@ describe('FunctionBuilder', () => { } as any); }).to.throw(Error, 'at least one region'); }); + + it('should allow a vpcConnector to be set', () => { + const fn = functions + .runWith({ + vpcConnector: 'test-connector', + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.vpcConnector).to.equal('test-connector'); + }); + + it('should allow a vpcConnectorEgressSettings to be set', () => { + const fn = functions + .runWith({ + vpcConnector: 'test-connector', + vpcConnectorEgressSettings: 'PRIVATE_RANGES_ONLY', + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.vpcConnectorEgressSettings).to.equal( + 'PRIVATE_RANGES_ONLY' + ); + }); + + it('should throw an error if user chooses an invalid vpcConnectorEgressSettings', () => { + expect(() => { + return functions.runWith({ + vpcConnector: 'test-connector', + vpcConnectorEgressSettings: 'INCORRECT_OPTION', + } as any); + }).to.throw( + Error, + `The only valid vpcConnectorEgressSettings values are: ${functions.VPC_EGRESS_SETTINGS_OPTIONS.join( + ',' + )}` + ); + }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 387953bdc..109a1ad05 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -270,6 +270,8 @@ export interface TriggerAnnotated { regions?: string[]; schedule?: Schedule; timeout?: string; + vpcConnector?: string; + vpcConnectorEgressSettings?: string; }; } @@ -514,5 +516,14 @@ export function optionsToTrigger(options: DeploymentOptions) { if (options.maxInstances) { trigger.maxInstances = options.maxInstances; } + + if (options.vpcConnector) { + trigger.vpcConnector = options.vpcConnector; + } + + if (options.vpcConnectorEgressSettings) { + trigger.vpcConnectorEgressSettings = options.vpcConnectorEgressSettings; + } + return trigger; } diff --git a/src/function-builder.ts b/src/function-builder.ts index 6050927ea..919f9f09b 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -30,6 +30,7 @@ import { RuntimeOptions, SUPPORTED_REGIONS, VALID_MEMORY_OPTIONS, + VPC_EGRESS_SETTINGS_OPTIONS, } from './function-configuration'; import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; @@ -66,6 +67,21 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { `TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}` ); } + + if ( + runtimeOptions.vpcConnectorEgressSettings && + !_.includes( + VPC_EGRESS_SETTINGS_OPTIONS, + runtimeOptions.vpcConnectorEgressSettings + ) + ) { + throw new Error( + `The only valid vpcConnectorEgressSettings values are: ${VPC_EGRESS_SETTINGS_OPTIONS.join( + ',' + )}` + ); + } + if (runtimeOptions.failurePolicy !== undefined) { if ( _.isBoolean(runtimeOptions.failurePolicy) === false && @@ -116,13 +132,16 @@ export function region( /** * Configure runtime options for the function. - * @param runtimeOptions Object with three optional fields: - * 1. failurePolicy: failure policy of the function, with boolean `true` being + * @param runtimeOptions Object with optional fields: + * 1. memory: amount of memory to allocate to the function, possible values + * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 2. timeoutSeconds: timeout for the function in seconds, possible values are + * 0 to 540. + * 3. failurePolicy: failure policy of the function, with boolean `true` being * equivalent to providing an empty retry object. - * 2. memory: amount of memory to allocate to the function, with possible - * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 3. timeoutSeconds: timeout for the function in seconds, with possible - * values being 0 to 540. + * 4. vpcConnector: id of a VPC connector in same project and region + * 5. vpcConnectorEgressSettings: when a vpcConnector is set, control which + * egress traffic is sent through the vpcConnector. * * Value must not be null. */ diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 31c708f3f..558895148 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -44,6 +44,15 @@ export const VALID_MEMORY_OPTIONS = [ '2GB', ] as const; +/** + * List of available options for VpcConnectorEgressSettings. + */ +export const VPC_EGRESS_SETTINGS_OPTIONS = [ + 'VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED', + 'PRIVATE_RANGES_ONLY', + 'ALL_TRAFFIC', +] as const; + /** * Scheduler retry options. Applies only to scheduled functions. */ @@ -91,6 +100,16 @@ export interface RuntimeOptions { * Max number of actual instances allowed to be running in parallel */ maxInstances?: number; + + /** + * Connect cloud function to specified VPC connector + */ + vpcConnector?: string; + + /** + * Egress settings for VPC connector + */ + vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number]; } export interface DeploymentOptions extends RuntimeOptions { From f4faaad9c914f7744ae15d61f1ee88a1e8d3ffad Mon Sep 17 00:00:00 2001 From: Lauren Long Date: Thu, 20 Aug 2020 17:00:18 -0700 Subject: [PATCH 262/705] Update CHANGELOG.md for 3.11.0 (#764) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..f46f8b3f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adds support for `vpcConnector` and `vpcConnectorEgressSettings` fields in `functions.runWith()`. **Must be used in conjunction with firebase-tools v8.9.0 or higher.** Thanks @pcboy! (#752) From f9d71aab9278b375761d28b5584916f2da2fe66b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 21 Aug 2020 16:10:08 +0000 Subject: [PATCH 263/705] 3.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48a71e881..4eb5986d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.10.0", + "version": "3.11.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 85af5e1a1a3792ce67c638fc98f522f6b3644923 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 21 Aug 2020 16:10:15 +0000 Subject: [PATCH 264/705] [firebase-release] Removed change log and reset repo after 3.11.0 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f46f8b3f4..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Adds support for `vpcConnector` and `vpcConnectorEgressSettings` fields in `functions.runWith()`. **Must be used in conjunction with firebase-tools v8.9.0 or higher.** Thanks @pcboy! (#752) From 7e2c0ec13e781d829bd37e66efc61c6ee74191a2 Mon Sep 17 00:00:00 2001 From: joehan Date: Mon, 14 Sep 2020 13:36:00 -0700 Subject: [PATCH 265/705] Update tests to change region based on env variable FIREBASE_FUNCTIONS_TEST_REGION (#780) * update tests to change region based on environment variable FIREBASE_FUNCTIONS_TEST_REGION * formats --- integration_test/functions/src/auth-tests.ts | 108 ++++++++++-------- .../functions/src/database-tests.ts | 6 +- .../functions/src/firestore-tests.ts | 2 + integration_test/functions/src/https-tests.ts | 4 +- integration_test/functions/src/index.ts | 4 +- .../functions/src/pubsub-tests.ts | 12 +- .../functions/src/remoteConfig-tests.ts | 10 +- .../functions/src/storage-tests.ts | 3 + .../functions/src/testLab-tests.ts | 2 + integration_test/run_tests.sh | 27 ++++- 10 files changed, 118 insertions(+), 60 deletions(-) diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/auth-tests.ts index 2c1e1d4e6..c97c907bc 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/auth-tests.ts @@ -3,68 +3,82 @@ import * as functions from 'firebase-functions'; import { expectEq, TestSuite } from './testing'; import UserMetadata = admin.auth.UserRecord; -export const createUserTests: any = functions.auth.user().onCreate((u, c) => { - const testId: string = u.displayName; - console.log(`testId is ${testId}`); +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - return new TestSuite('auth user onCreate') - .it('should have a project as resource', (user, context) => - expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`) - ) +export const createUserTests: any = functions + .region(REGION) + .auth.user() + .onCreate((u, c) => { + const testId: string = u.displayName; + console.log(`testId is ${testId}`); - .it('should not have a path', (user, context) => - expectEq((context as any).path, undefined) - ) + return new TestSuite('auth user onCreate') + .it('should have a project as resource', (user, context) => + expectEq( + context.resource.name, + `projects/${process.env.GCLOUD_PROJECT}` + ) + ) - .it('should have the correct eventType', (user, context) => - expectEq(context.eventType, 'google.firebase.auth.user.create') - ) + .it('should not have a path', (user, context) => + expectEq((context as any).path, undefined) + ) - .it('should have an eventId', (user, context) => context.eventId) + .it('should have the correct eventType', (user, context) => + expectEq(context.eventType, 'google.firebase.auth.user.create') + ) - .it('should have a timestamp', (user, context) => context.timestamp) + .it('should have an eventId', (user, context) => context.eventId) - .it('should not have auth', (user, context) => - expectEq((context as any).auth, undefined) - ) + .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have action', (user, context) => - expectEq((context as any).action, undefined) - ) + .it('should not have auth', (user, context) => + expectEq((context as any).auth, undefined) + ) - .it('should have properly defined meta', (user, context) => user.metadata) + .it('should not have action', (user, context) => + expectEq((context as any).action, undefined) + ) - .run(testId, u, c); -}); + .it('should have properly defined meta', (user, context) => user.metadata) -export const deleteUserTests: any = functions.auth.user().onDelete((u, c) => { - const testId: string = u.displayName; - console.log(`testId is ${testId}`); + .run(testId, u, c); + }); - return new TestSuite('auth user onDelete') - .it('should have a project as resource', (user, context) => - expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`) - ) +export const deleteUserTests: any = functions + .region(REGION) + .auth.user() + .onDelete((u, c) => { + const testId: string = u.displayName; + console.log(`testId is ${testId}`); - .it('should not have a path', (user, context) => - expectEq((context as any).path, undefined) - ) + return new TestSuite('auth user onDelete') + .it('should have a project as resource', (user, context) => + expectEq( + context.resource.name, + `projects/${process.env.GCLOUD_PROJECT}` + ) + ) - .it('should have the correct eventType', (user, context) => - expectEq(context.eventType, 'google.firebase.auth.user.delete') - ) + .it('should not have a path', (user, context) => + expectEq((context as any).path, undefined) + ) - .it('should have an eventId', (user, context) => context.eventId) + .it('should have the correct eventType', (user, context) => + expectEq(context.eventType, 'google.firebase.auth.user.delete') + ) - .it('should have a timestamp', (user, context) => context.timestamp) + .it('should have an eventId', (user, context) => context.eventId) - .it('should not have auth', (user, context) => - expectEq((context as any).auth, undefined) - ) + .it('should have a timestamp', (user, context) => context.timestamp) - .it('should not have action', (user, context) => - expectEq((context as any).action, undefined) - ) + .it('should not have auth', (user, context) => + expectEq((context as any).auth, undefined) + ) - .run(testId, u, c); -}); + .it('should not have action', (user, context) => + expectEq((context as any).action, undefined) + ) + + .run(testId, u, c); + }); diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/database-tests.ts index de3030d3a..568d26bf4 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/database-tests.ts @@ -4,9 +4,11 @@ import { expectEq, expectMatches, TestSuite } from './testing'; import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; -export const databaseTests: any = functions.database - .ref('dbTests/{testId}/start') +export const databaseTests: any = functions + .region(REGION) + .database.ref('dbTests/{testId}/start') .onWrite((ch, ctx) => { if (ch.after.val() === null) { console.log( diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/firestore-tests.ts index 49d1ae919..97daadea5 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/firestore-tests.ts @@ -4,11 +4,13 @@ import { expectDeepEq, expectEq, TestSuite } from './testing'; import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const firestoreTests: any = functions .runWith({ timeoutSeconds: 540, }) + .region(REGION) .firestore.document('tests/{documentId}') .onCreate((s, c) => { return new TestSuite('firestore document onWrite') diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/https-tests.ts index 55c7df983..6af0f9fac 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/https-tests.ts @@ -2,7 +2,9 @@ import * as functions from 'firebase-functions'; import * as _ from 'lodash'; import { expectEq, TestSuite } from './testing'; -export const callableTests: any = functions.https.onCall((d) => { +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; + +export const callableTests: any = functions.region(REGION).https.onCall((d) => { return new TestSuite('https onCall') .it('should have the correct data', (data) => expectEq(_.get(data, 'foo'), 'bar') diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 9988fe636..2ac16e5fa 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -20,13 +20,14 @@ import * as testLab from './testLab-utils'; import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); admin.initializeApp(); +const REGION = functions.config().functions.test_region; // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. function callHttpsTrigger(name: string, data: any, baseUrl) { return utils.makeRequest( { method: 'POST', - host: 'us-central1-' + firebaseConfig.projectId + '.' + baseUrl, + host: REGION + '-' + firebaseConfig.projectId + '.' + baseUrl, path: '/' + name, headers: { 'Content-Type': 'application/json', @@ -62,6 +63,7 @@ function callScheduleTrigger(functionName: string, region: string) { } export const integrationTests: any = functions + .region(REGION) .runWith({ timeoutSeconds: 540, }) diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index 3c1b1ecc7..e2a3f1bd0 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -3,10 +3,13 @@ import * as functions from 'firebase-functions'; import { evaluate, expectEq, success, TestSuite } from './testing'; import PubsubMessage = functions.pubsub.Message; +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; + // TODO(inlined) use multiple queues to run inline. // Expected message data: {"hello": "world"} -export const pubsubTests: any = functions.pubsub - .topic('pubsubTests') +export const pubsubTests: any = functions + .region(REGION) + .pubsub.topic('pubsubTests') .onPublish((m, c) => { let testId: string; try { @@ -59,8 +62,9 @@ export const pubsubTests: any = functions.pubsub .run(testId, m, c); }); -export const schedule: any = functions.pubsub - .schedule('every 10 hours') // This is a dummy schedule, since we need to put a valid one in. +export const schedule: any = functions + .region(REGION) + .pubsub.schedule('every 10 hours') // This is a dummy schedule, since we need to put a valid one in. // For the test, the job is triggered by the jobs:run api .onRun((context) => { let testId; diff --git a/integration_test/functions/src/remoteConfig-tests.ts b/integration_test/functions/src/remoteConfig-tests.ts index 3474e1fc2..3f2cc8993 100644 --- a/integration_test/functions/src/remoteConfig-tests.ts +++ b/integration_test/functions/src/remoteConfig-tests.ts @@ -2,8 +2,11 @@ import * as functions from 'firebase-functions'; import { expectEq, TestSuite } from './testing'; import TemplateVersion = functions.remoteConfig.TemplateVersion; -export const remoteConfigTests: any = functions.remoteConfig.onUpdate( - (v, c) => { +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; + +export const remoteConfigTests: any = functions + .region(REGION) + .remoteConfig.onUpdate((v, c) => { return new TestSuite('remoteConfig onUpdate') .it('should have a project as resource', (version, context) => expectEq( @@ -25,5 +28,4 @@ export const remoteConfigTests: any = functions.remoteConfig.onUpdate( ) .run(v.description, v, c); - } -); + }); diff --git a/integration_test/functions/src/storage-tests.ts b/integration_test/functions/src/storage-tests.ts index 43cdef5e2..df3032f78 100644 --- a/integration_test/functions/src/storage-tests.ts +++ b/integration_test/functions/src/storage-tests.ts @@ -2,10 +2,13 @@ import * as functions from 'firebase-functions'; import { expectEq, TestSuite } from './testing'; import ObjectMetadata = functions.storage.ObjectMetadata; +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; + export const storageTests: any = functions .runWith({ timeoutSeconds: 540, }) + .region(REGION) .storage.bucket() .object() .onFinalize((s, c) => { diff --git a/integration_test/functions/src/testLab-tests.ts b/integration_test/functions/src/testLab-tests.ts index a6350c57d..cf4b2f062 100644 --- a/integration_test/functions/src/testLab-tests.ts +++ b/integration_test/functions/src/testLab-tests.ts @@ -2,11 +2,13 @@ import * as functions from 'firebase-functions'; import * as _ from 'lodash'; import { TestSuite, expectEq } from './testing'; import TestMatrix = functions.testLab.TestMatrix; +const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const testLabTests: any = functions .runWith({ timeoutSeconds: 540, }) + .region(REGION) .testLab.testMatrix() .onComplete((matrix, context) => { return new TestSuite('test matrix complete') diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 903936b13..ba567536a 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -38,6 +38,26 @@ function build_sdk { mv firebase-functions-*.tgz "integration_test/functions/firebase-functions-${TIMESTAMP}.tgz" } +function set_region { + if [[ "${FIREBASE_FUNCTIONS_TEST_REGION}" == "" ]]; then + FIREBASE_FUNCTIONS_TEST_REGION="us-central1" + fi + if [[ "${TOKEN}" == "" ]]; then + firebase functions:config:set functions.test_region=$FIREBASE_FUNCTIONS_TEST_REGION --project=$PROJECT_ID + else + firebase functions:config:set functions.test_region=$FIREBASE_FUNCTIONS_TEST_REGION --project=$PROJECT_ID --token=$TOKEN + fi + announce "Set region to ${FIREBASE_FUNCTIONS_TEST_REGION}" +} + +function unset_region { + if [[ "${TOKEN}" == "" ]]; then + firebase functions:config:unset functions.test_region --project=$PROJECT_ID + else + firebase functions:config:unset functions.test_region --project=$PROJECT_ID --token=$TOKEN + fi +} + function pick_node8 { cd "${DIR}" cp package.node8.json functions/package.json @@ -98,7 +118,10 @@ function run_tests { if [[ "${FIREBASE_FUNCTIONS_URL}" == "https://preprod-cloudfunctions.sandbox.googleapis.com" ]]; then TEST_DOMAIN="txcloud.net" fi - TEST_URL="https://us-central1-${PROJECT_ID}.${TEST_DOMAIN}/integrationTests" + if [[ "${FIREBASE_FUNCTIONS_TEST_REGION}" == "" ]]; then + FIREBASE_FUNCTIONS_TEST_REGION="us-central1" + fi + TEST_URL="https://${FIREBASE_FUNCTIONS_TEST_REGION}-${PROJECT_ID}.${TEST_DOMAIN}/integrationTests" echo "${TEST_URL}" curl --fail "${TEST_URL}" @@ -107,6 +130,7 @@ function run_tests { function cleanup { announce "Performing cleanup..." delete_all_functions + unset_region rm "${DIR}/functions/firebase-functions-${TIMESTAMP}.tgz" rm "${DIR}/functions/package.json" rm -f "${DIR}/functions/firebase-debug.log" @@ -117,6 +141,7 @@ function cleanup { # Setup build_sdk delete_all_functions +set_region # Node 8 tests pick_node8 From f59ff8cde4de1cf2335fbc9525a123aa740ef1dd Mon Sep 17 00:00:00 2001 From: egilmorez Date: Mon, 2 Nov 2020 07:30:50 -0800 Subject: [PATCH 266/705] Adding required tags to page template. (#804) * Adding required tags to page template. * Adding formatting and fixing typo discovered in internal review. * More fixes/additions discovered in internal review. * Fixing format of toc.yaml file. --- docgen/content-sources/toc.yaml | 25 ++++++++++++++++++++----- docgen/theme/layouts/default.hbs | 2 ++ src/function-builder.ts | 27 +++++++++++++++------------ 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 37093f7c2..5758eb74e 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -23,6 +23,20 @@ toc: - title: 'config.Config' path: /docs/reference/functions/config_.config.config.html + - title: 'functions.function-configuration' + path: /docs/reference/functions/function_configuration_.html + section: + - title: 'config.DeploymentOptions' + path: /docs/reference/functions/function_configuration_.deploymentoptions.html + - title: 'config.FailurePolicy' + path: /docs/reference/functions/function_configuration_.failurepolicy.html + - title: 'config.RuntimeOptions' + path: /docs/reference/functions/function_configuration_.runtimeoptions.html + - title: 'config.Schedule' + path: /docs/reference/functions/function_configuration_.schedule.html + - title: 'config.ScheduleRetryConfig' + path: /docs/reference/functions/function_configuration_.scheduleretryconfig.html + - title: 'functions.analytics' path: /docs/reference/functions/providers_analytics_.html section: @@ -127,11 +141,6 @@ toc: - title: 'ObjectMetadata' path: /docs/reference/functions/providers_storage_.objectmetadata.html - - title: 'functions.handler' - path: /docs/reference/functions/handler_builder_.html - section: - - title: 'HandlerBuilder' - path: /docs/reference/functions/handler_builder_.handlerbuilder.html - title: 'functions.testLab' path: /docs/reference/functions/providers_testlab_.html section: @@ -143,3 +152,9 @@ toc: path: /docs/reference/functions/providers_testlab_.testmatrix.html - title: 'testLab.testMatrixBuilder' path: /docs/reference/functions/providers_testlab_.testmatrixbuilder.html + + - title: 'functions.handler' + path: /docs/reference/functions/handler_builder_.html + section: + - title: 'HandlerBuilder' + path: /docs/reference/functions/handler_builder_.handlerbuilder.html diff --git a/docgen/theme/layouts/default.hbs b/docgen/theme/layouts/default.hbs index 72111fb4e..17106e8d8 100644 --- a/docgen/theme/layouts/default.hbs +++ b/docgen/theme/layouts/default.hbs @@ -7,6 +7,8 @@ + + {{#ifCond model.name '==' project.name}}{{project.name}}{{else}}{{model.name}} | {{project.name}}{{/ifCond}} diff --git a/src/function-builder.ts b/src/function-builder.ts index 919f9f09b..9b5f5660b 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -133,15 +133,15 @@ export function region( /** * Configure runtime options for the function. * @param runtimeOptions Object with optional fields: - * 1. memory: amount of memory to allocate to the function, possible values + * 1. `memory`: amount of memory to allocate to the function, possible values * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 2. timeoutSeconds: timeout for the function in seconds, possible values are + * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are * 0 to 540. - * 3. failurePolicy: failure policy of the function, with boolean `true` being + * 3. `failurePolicy`: failure policy of the function, with boolean `true` being * equivalent to providing an empty retry object. - * 4. vpcConnector: id of a VPC connector in same project and region - * 5. vpcConnectorEgressSettings: when a vpcConnector is set, control which - * egress traffic is sent through the vpcConnector. + * 4. `vpcConnector`: id of a VPC connector in the same project and region + * 5. `vpcConnectorEgressSettings`: when a `vpcConnector` is set, control which + * egress traffic is sent through the `vpcConnector`. * * Value must not be null. */ @@ -173,13 +173,16 @@ export class FunctionBuilder { /** * Configure runtime options for the function. - * @param runtimeOptions Object with three optional fields: - * 1. failurePolicy: failure policy of the function, with boolean `true` being + * @param runtimeOptions Object with optional fields: + * 1. `memory`: amount of memory to allocate to the function, possible values + * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are + * 0 to 540. + * 3. `failurePolicy`: failure policy of the function, with boolean `true` being * equivalent to providing an empty retry object. - * 2. memory: amount of memory to allocate to the function, with possible - * values being '128MB', '256MB', '512MB', '1GB', and '2GB'. - * 3. timeoutSeconds: timeout for the function in seconds, with possible - * values being 0 to 540. + * 4. `vpcConnector`: id of a VPC connector in the same project and region + * 5. `vpcConnectorEgressSettings`: when a `vpcConnector` is set, control which + * egress traffic is sent through the `vpcConnector`. * * Value must not be null. */ From 2988a2b3b1f17674446504c3b24c5c10335aa728 Mon Sep 17 00:00:00 2001 From: joehan Date: Wed, 18 Nov 2020 09:54:18 -0800 Subject: [PATCH 267/705] Adds 4GB as a memory option. (#814) --- src/function-configuration.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 558895148..6743d463e 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -42,6 +42,7 @@ export const VALID_MEMORY_OPTIONS = [ '512MB', '1GB', '2GB', + '4GB', ] as const; /** From ecfefd1bcfd26311e7a4de4665f3d02b49f7dc94 Mon Sep 17 00:00:00 2001 From: Marcel Goya <3046751+marcelgoya@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:22:07 +0100 Subject: [PATCH 268/705] Add ingress settings support (#815) * Add IngressSettings support * Add IngressSettings support * Format Co-authored-by: Marcel Goya Co-authored-by: joehan --- src/function-configuration.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 6743d463e..10098a745 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -54,6 +54,16 @@ export const VPC_EGRESS_SETTINGS_OPTIONS = [ 'ALL_TRAFFIC', ] as const; +/** + * List of available options for IngressSettings. + */ +export const INGRESS_SETTINGS_OPTIONS = [ + 'INGRESS_SETTINGS_UNSPECIFIED', + 'ALLOW_ALL', + 'ALLOW_INTERNAL_ONLY', + 'ALLOW_INTERNAL_AND_GCLB', +] as const; + /** * Scheduler retry options. Applies only to scheduled functions. */ @@ -111,6 +121,11 @@ export interface RuntimeOptions { * Egress settings for VPC connector */ vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number]; + + /** + * Ingress settings + */ + ingressSettings?: typeof INGRESS_SETTINGS_OPTIONS[number]; } export interface DeploymentOptions extends RuntimeOptions { From c11e5b3b2a6cce9bd87674e68cc3a7239a99489a Mon Sep 17 00:00:00 2001 From: Bryan Kendall Date: Mon, 30 Nov 2020 08:05:36 -0800 Subject: [PATCH 269/705] introduce `package-lock.json` (#781) * initial package-lock * remove npmrc * update package-lock * update typedoc * remove istanbul; audit fixes Co-authored-by: joehan --- .npmrc | 1 - package-lock.json | 4688 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 3 +- 3 files changed, 4689 insertions(+), 3 deletions(-) delete mode 100644 .npmrc create mode 100644 package-lock.json diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 43c97e719..000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -package-lock=false diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..17b67b6d0 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,4688 @@ +{ + "name": "firebase-functions", + "version": "3.11.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@firebase/app-types": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz", + "integrity": "sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==", + "dev": true + }, + "@firebase/auth-interop-types": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz", + "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==", + "dev": true + }, + "@firebase/component": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.19.tgz", + "integrity": "sha512-L0S3g8eqaerg8y0zox3oOHSTwn/FE8RbcRHiurnbESvDViZtP5S5WnhuAPd7FnFxa8ElWK0z1Tr3ikzWDv1xdQ==", + "dev": true, + "requires": { + "@firebase/util": "0.3.2", + "tslib": "^1.11.1" + } + }, + "@firebase/database": { + "version": "0.6.12", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.6.12.tgz", + "integrity": "sha512-OLUxp8TkXiML4X5LWM5IACsSDvo3fcf4mTbTe5RF+N6TRFv0Svzlet5OgGIa3ET1dQvNiisrMX7zzRa0OTLs7Q==", + "dev": true, + "requires": { + "@firebase/auth-interop-types": "0.1.5", + "@firebase/component": "0.1.19", + "@firebase/database-types": "0.5.2", + "@firebase/logger": "0.2.6", + "@firebase/util": "0.3.2", + "faye-websocket": "0.11.3", + "tslib": "^1.11.1" + } + }, + "@firebase/database-types": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.5.2.tgz", + "integrity": "sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g==", + "dev": true, + "requires": { + "@firebase/app-types": "0.6.1" + } + }, + "@firebase/logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz", + "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==", + "dev": true + }, + "@firebase/util": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.2.tgz", + "integrity": "sha512-Dqs00++c8rwKky6KCKLLY2T1qYO4Q+X5t+lF7DInXDNF4ae1Oau35bkD+OpJ9u7l1pEv7KHowP6CUKuySCOc8g==", + "dev": true, + "requires": { + "tslib": "^1.11.1" + } + }, + "@google-cloud/common": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-2.4.0.tgz", + "integrity": "sha512-zWFjBS35eI9leAHhjfeOYlK5Plcuj/77EzstnrJIZbKgF/nkqjcQuGiMCpzCwOfPyUbz8ZaEOYgbHa759AKbjg==", + "dev": true, + "optional": true, + "requires": { + "@google-cloud/projectify": "^1.0.0", + "@google-cloud/promisify": "^1.0.0", + "arrify": "^2.0.0", + "duplexify": "^3.6.0", + "ent": "^2.2.0", + "extend": "^3.0.2", + "google-auth-library": "^5.5.0", + "retry-request": "^4.0.0", + "teeny-request": "^6.0.0" + } + }, + "@google-cloud/firestore": { + "version": "3.8.6", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-3.8.6.tgz", + "integrity": "sha512-ox80NbrM1MLJgvAAUd1quFLx/ie/nSjrk1PtscSicpoYDlKb9e6j7pHrVpbopBMyliyfNl3tLJWaDh+x+uCXqw==", + "dev": true, + "optional": true, + "requires": { + "deep-equal": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "google-gax": "^1.15.3", + "readable-stream": "^3.4.0", + "through2": "^3.0.0" + } + }, + "@google-cloud/paginator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-2.0.3.tgz", + "integrity": "sha512-kp/pkb2p/p0d8/SKUu4mOq8+HGwF8NPzHWkj+VKrIPQPyMRw8deZtrO/OcSiy9C/7bpfU5Txah5ltUNfPkgEXg==", + "dev": true, + "optional": true, + "requires": { + "arrify": "^2.0.0", + "extend": "^3.0.2" + } + }, + "@google-cloud/projectify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-1.0.4.tgz", + "integrity": "sha512-ZdzQUN02eRsmTKfBj9FDL0KNDIFNjBn/d6tHQmA/+FImH5DO6ZV8E7FzxMgAUiVAUq41RFAkb25p1oHOZ8psfg==", + "dev": true, + "optional": true + }, + "@google-cloud/promisify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-1.0.4.tgz", + "integrity": "sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ==", + "dev": true, + "optional": true + }, + "@google-cloud/storage": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-4.7.0.tgz", + "integrity": "sha512-f0guAlbeg7Z0m3gKjCfBCu7FG9qS3M3oL5OQQxlvGoPtK7/qg3+W+KQV73O2/sbuS54n0Kh2mvT5K2FWzF5vVQ==", + "dev": true, + "optional": true, + "requires": { + "@google-cloud/common": "^2.1.1", + "@google-cloud/paginator": "^2.0.0", + "@google-cloud/promisify": "^1.0.0", + "arrify": "^2.0.0", + "compressible": "^2.0.12", + "concat-stream": "^2.0.0", + "date-and-time": "^0.13.0", + "duplexify": "^3.5.0", + "extend": "^3.0.2", + "gaxios": "^3.0.0", + "gcs-resumable-upload": "^2.2.4", + "hash-stream-validation": "^0.2.2", + "mime": "^2.2.0", + "mime-types": "^2.0.8", + "onetime": "^5.1.0", + "p-limit": "^2.2.0", + "pumpify": "^2.0.0", + "readable-stream": "^3.4.0", + "snakeize": "^0.1.0", + "stream-events": "^1.0.1", + "through2": "^3.0.0", + "xdg-basedir": "^4.0.0" + }, + "dependencies": { + "gaxios": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz", + "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==", + "dev": true, + "optional": true, + "requires": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.3.0" + } + }, + "mime": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "dev": true, + "optional": true + } + } + }, + "@grpc/grpc-js": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.0.5.tgz", + "integrity": "sha512-Hm+xOiqAhcpT9RYM8lc15dbQD7aQurM7ZU8ulmulepiPlN7iwBXXwP3vSBUimoFoApRqz7pSIisXU8pZaCB4og==", + "dev": true, + "optional": true, + "requires": { + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "optional": true + } + } + }, + "@grpc/proto-loader": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz", + "integrity": "sha512-WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ==", + "dev": true, + "optional": true, + "requires": { + "lodash.camelcase": "^4.3.0", + "protobufjs": "^6.8.6" + } + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", + "dev": true, + "optional": true + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha1-TIVzDlm5ofHzSQR9vyQpYDS7JzU=", + "dev": true, + "optional": true + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha1-fvN/DQEPsCitGtWXIuUG2SYoFcs=", + "dev": true, + "optional": true + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", + "dev": true, + "optional": true + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "dev": true, + "optional": true, + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", + "dev": true, + "optional": true + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", + "dev": true, + "optional": true + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", + "dev": true, + "optional": true + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", + "dev": true, + "optional": true + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", + "dev": true, + "optional": true + }, + "@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/formatio": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", + "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "@sinonjs/samsam": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", + "dev": true + }, + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "optional": true + }, + "@types/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "@types/chai": { + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", + "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", + "dev": true + }, + "@types/chai-as-promised": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", + "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, + "requires": { + "@types/chai": "*" + } + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "@types/connect": { + "version": "3.4.33", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", + "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "requires": { + "@types/node": "*" + } + }, + "@types/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", + "dev": true, + "requires": { + "@types/express": "*" + } + }, + "@types/express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", + "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", + "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "@types/fs-extra": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.1.tgz", + "integrity": "sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==", + "dev": true, + "optional": true, + "requires": { + "@types/node": "*" + } + }, + "@types/jsonwebtoken": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", + "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/lodash": { + "version": "4.14.161", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", + "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "dev": true + }, + "@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "dev": true, + "optional": true + }, + "@types/mime": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", + "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" + }, + "@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "@types/mock-require": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", + "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/nock": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", + "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/node": { + "version": "8.10.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", + "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" + }, + "@types/qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" + }, + "@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" + }, + "@types/serve-static": { + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", + "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "requires": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, + "@types/sinon": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", + "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", + "dev": true + }, + "abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "dev": true + }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "optional": true, + "requires": { + "event-target-shim": "^5.0.0" + } + }, + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true + }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true + }, + "agent-base": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", + "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", + "dev": true, + "optional": true, + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + } + } + }, + "ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-colors": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", + "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", + "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=", + "dev": true, + "optional": true + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true, + "optional": true + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + }, + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, + "available-typed-arrays": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", + "integrity": "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==", + "dev": true, + "optional": true, + "requires": { + "array-filter": "^1.0.0" + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true + }, + "aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", + "dev": true, + "optional": true + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "bignumber.js": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", + "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==", + "dev": true, + "optional": true + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", + "dev": true + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", + "dev": true + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "requires": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" + } + }, + "chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "requires": { + "check-error": "^1.0.2" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", + "dev": true, + "requires": { + "cross-spawn": "^4.0.2", + "node-version": "^1.0.0", + "promise-polyfill": "^6.0.1" + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "commander": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "dev": true + }, + "compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "optional": true, + "requires": { + "mime-db": ">= 1.43.0 < 2" + }, + "dependencies": { + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "dev": true, + "optional": true + } + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "dev": true, + "optional": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "dev": true, + "optional": true, + "requires": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + } + }, + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=" + }, + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true, + "optional": true + }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + } + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, + "date-and-time": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.13.1.tgz", + "integrity": "sha512-/Uge9DJAT+s+oAcDxtBhyR8+sKjUnZbYmyhbmWjTHNtX7B7oWD8YyYdeXcBRbwSj6hVvj+IQegJam7m7czhbFw==", + "dev": true, + "optional": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "requires": { + "ms": "2.0.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "decimal.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", + "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", + "dev": true + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "^4.0.0" + } + }, + "deep-equal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz", + "integrity": "sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==", + "dev": true, + "optional": true, + "requires": { + "es-abstract": "^1.17.5", + "es-get-iterator": "^1.1.0", + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.2", + "is-regex": "^1.0.5", + "isarray": "^2.0.5", + "object-is": "^1.1.2", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "regexp.prototype.flags": "^1.3.0", + "side-channel": "^1.0.2", + "which-boxed-primitive": "^1.0.1", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.2" + } + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "dicer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", + "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", + "dev": true, + "requires": { + "streamsearch": "0.1.2" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", + "dev": true + }, + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "requires": { + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true + } + } + }, + "dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "optional": true, + "requires": { + "is-obj": "^2.0.0" + } + }, + "duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dev": true, + "optional": true, + "requires": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true, + "optional": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + } + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "optional": true, + "requires": { + "once": "^1.4.0" + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true, + "optional": true + }, + "es-abstract": { + "version": "1.17.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", + "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-regex": "^1.1.0", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "es-get-iterator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", + "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", + "dev": true, + "optional": true, + "requires": { + "es-abstract": "^1.17.4", + "has-symbols": "^1.0.1", + "is-arguments": "^1.0.4", + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-string": "^1.0.5", + "isarray": "^2.0.5" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "eslint-plugin-prettier": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", + "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", + "dev": true, + "requires": { + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "optional": true + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", + "dev": true + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "fast-text-encoding": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", + "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", + "dev": true, + "optional": true + }, + "faye-websocket": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "dev": true, + "requires": { + "websocket-driver": ">=0.5.1" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + } + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "firebase-admin": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.13.0.tgz", + "integrity": "sha512-krXj5ncWMJBhCpXSn9UFY6zmDWjFjqgx+1e9ATXKFYndEjmKtNBuJzqdrAdDh7aTUR7X6+0TPx4Hbc08kd0lwQ==", + "dev": true, + "requires": { + "@firebase/database": "^0.6.0", + "@google-cloud/firestore": "^3.0.0", + "@google-cloud/storage": "^4.1.2", + "@types/node": "^8.10.59", + "dicer": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "node-forge": "^0.7.6" + } + }, + "flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "dev": true, + "requires": { + "is-buffer": "~2.0.3" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", + "dev": true + } + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true, + "optional": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "fs-extra": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true, + "optional": true + }, + "gaxios": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz", + "integrity": "sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==", + "dev": true, + "optional": true, + "requires": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.3.0" + } + }, + "gcp-metadata": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-3.5.0.tgz", + "integrity": "sha512-ZQf+DLZ5aKcRpLzYUyBS3yo3N0JSa82lNDO8rj3nMSlovLcz2riKFBsYgDzeXcv75oo5eqB2lx+B14UvPoCRnA==", + "dev": true, + "optional": true, + "requires": { + "gaxios": "^2.1.0", + "json-bigint": "^0.3.0" + } + }, + "gcs-resumable-upload": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-2.3.3.tgz", + "integrity": "sha512-sf896I5CC/1AxeaGfSFg3vKMjUq/r+A3bscmVzZm10CElyRanN0XwPu/MxeIO4LSP+9uF6yKzXvNsaTsMXUG6Q==", + "dev": true, + "optional": true, + "requires": { + "abort-controller": "^3.0.0", + "configstore": "^5.0.0", + "gaxios": "^2.0.0", + "google-auth-library": "^5.0.0", + "pumpify": "^2.0.0", + "stream-events": "^1.0.4" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "google-auth-library": { + "version": "5.10.1", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.10.1.tgz", + "integrity": "sha512-rOlaok5vlpV9rSiUu5EpR0vVpc+PhN62oF4RyX/6++DG1VsaulAFEMlDYBLjJDDPI6OcNOCGAKy9UVB/3NIDXg==", + "dev": true, + "optional": true, + "requires": { + "arrify": "^2.0.0", + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "fast-text-encoding": "^1.0.0", + "gaxios": "^2.1.0", + "gcp-metadata": "^3.4.0", + "gtoken": "^4.1.0", + "jws": "^4.0.0", + "lru-cache": "^5.0.0" + }, + "dependencies": { + "jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "requires": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "optional": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "optional": true + } + } + }, + "google-gax": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-1.15.3.tgz", + "integrity": "sha512-3JKJCRumNm3x2EksUTw4P1Rad43FTpqrtW9jzpf3xSMYXx+ogaqTM1vGo7VixHB4xkAyATXVIa3OcNSh8H9zsQ==", + "dev": true, + "optional": true, + "requires": { + "@grpc/grpc-js": "~1.0.3", + "@grpc/proto-loader": "^0.5.1", + "@types/fs-extra": "^8.0.1", + "@types/long": "^4.0.0", + "abort-controller": "^3.0.0", + "duplexify": "^3.6.0", + "google-auth-library": "^5.0.0", + "is-stream-ended": "^0.1.4", + "lodash.at": "^4.6.0", + "lodash.has": "^4.5.2", + "node-fetch": "^2.6.0", + "protobufjs": "^6.8.9", + "retry-request": "^4.0.0", + "semver": "^6.0.0", + "walkdir": "^0.4.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "optional": true + } + } + }, + "google-p12-pem": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz", + "integrity": "sha512-S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg==", + "dev": true, + "optional": true, + "requires": { + "node-forge": "^0.9.0" + }, + "dependencies": { + "node-forge": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz", + "integrity": "sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==", + "dev": true, + "optional": true + } + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", + "dev": true + }, + "gtoken": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.4.tgz", + "integrity": "sha512-VxirzD0SWoFUo5p8RDP8Jt2AGyOmyYcT/pOUgDKJCK+iSw0TMqwrVfY37RXTNmoKwrzmDHSk0GMT9FsgVmnVSA==", + "dev": true, + "optional": true, + "requires": { + "gaxios": "^2.1.0", + "google-p12-pem": "^2.0.0", + "jws": "^4.0.0", + "mime": "^2.2.0" + }, + "dependencies": { + "jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "requires": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "mime": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "dev": true, + "optional": true + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "dev": true, + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "hash-stream-validation": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", + "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", + "dev": true, + "optional": true + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "highlight.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.0.tgz", + "integrity": "sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==", + "dev": true + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "http-parser-js": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", + "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==", + "dev": true + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "optional": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "optional": true, + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + } + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "optional": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true + }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true + }, + "ipaddr.js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" + }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, + "is-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz", + "integrity": "sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==", + "dev": true, + "optional": true + }, + "is-boolean-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz", + "integrity": "sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==", + "dev": true, + "optional": true + }, + "is-callable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", + "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "dev": true + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "is-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", + "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", + "dev": true, + "optional": true + }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true + }, + "is-number-object": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", + "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", + "dev": true, + "optional": true + }, + "is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "optional": true + }, + "is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", + "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", + "dev": true, + "optional": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true, + "optional": true + }, + "is-stream-ended": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", + "integrity": "sha1-9QIk6V4GvODjVtRApIJ801smfto=", + "dev": true, + "optional": true + }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true, + "optional": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-typed-array": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz", + "integrity": "sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==", + "dev": true, + "optional": true, + "requires": { + "available-typed-arrays": "^1.0.0", + "es-abstract": "^1.17.4", + "foreach": "^2.0.5", + "has-symbols": "^1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "dev": true, + "optional": true + }, + "is-weakset": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", + "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==", + "dev": true, + "optional": true + }, + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "optional": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", + "dev": true + } + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "jsdom": { + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "dev": true, + "requires": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + }, + "dependencies": { + "escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "json-bigint": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz", + "integrity": "sha512-DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==", + "dev": true, + "optional": true, + "requires": { + "bignumber.js": "^9.0.0" + } + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dev": true, + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "just-extend": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", + "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", + "dev": true + }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + }, + "lodash.at": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.at/-/lodash.at-4.6.0.tgz", + "integrity": "sha1-k83OZk8KGZTqM9181A4jr9EbD/g=", + "dev": true, + "optional": true + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true, + "optional": true + }, + "lodash.has": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", + "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=", + "dev": true, + "optional": true + }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", + "dev": true + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", + "dev": true + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", + "dev": true + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", + "dev": true + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", + "dev": true + }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, + "log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "requires": { + "chalk": "^2.0.1" + } + }, + "lolex": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", + "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", + "dev": true + }, + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha1-mntxz7fTYaGU6lVSQckvdGjVvyg=", + "dev": true, + "optional": true + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "lunr": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "dev": true + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "optional": true, + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "optional": true + } + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "marked": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", + "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==", + "dev": true + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } + } + }, + "mocha": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", + "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", + "dev": true, + "requires": { + "ansi-colors": "3.2.3", + "browser-stdout": "1.3.1", + "debug": "3.2.6", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "find-up": "3.0.0", + "glob": "7.1.3", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.13.1", + "log-symbols": "2.2.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.4", + "ms": "2.1.1", + "node-environment-flags": "1.0.5", + "object.assign": "4.1.0", + "strip-json-comments": "2.0.1", + "supports-color": "6.0.0", + "which": "1.3.1", + "wide-align": "1.1.3", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "supports-color": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", + "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + } + } + }, + "mock-require": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", + "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", + "dev": true, + "requires": { + "get-caller-file": "^1.0.2", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + } + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "requires": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "nise": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", + "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", + "dev": true, + "requires": { + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^5.0.1", + "path-to-regexp": "^1.7.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + } + } + }, + "nock": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", + "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", + "dev": true, + "requires": { + "chai": "^4.1.2", + "debug": "^4.1.0", + "deep-equal": "^1.0.0", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.5", + "mkdirp": "^0.5.0", + "propagate": "^1.0.0", + "qs": "^6.5.1", + "semver": "^5.5.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "node-environment-flags": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", + "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", + "dev": true, + "requires": { + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true, + "optional": true + }, + "node-forge": { + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", + "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==", + "dev": true + }, + "node-version": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", + "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "object-is": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", + "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", + "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, + "object.getownpropertydescriptors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "optional": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "dev": true + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "optional": true + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, + "promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", + "dev": true + }, + "propagate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", + "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", + "dev": true + }, + "protobufjs": { + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.1.tgz", + "integrity": "sha512-pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ==", + "dev": true, + "optional": true, + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": "^13.7.0", + "long": "^4.0.0" + }, + "dependencies": { + "@types/node": { + "version": "13.13.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.20.tgz", + "integrity": "sha512-1kx55tU3AvGX2Cjk2W4GMBxbgIz892V+X10S2gUreIAq8qCWgaQH+tZBOWc0bi2BKFhQt+CX0BTx28V9QPNa+A==", + "dev": true, + "optional": true + } + } + }, + "proxy-addr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.0" + } + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "optional": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "pumpify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", + "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", + "dev": true, + "optional": true, + "requires": { + "duplexify": "^4.1.1", + "inherits": "^2.0.3", + "pump": "^3.0.0" + }, + "dependencies": { + "duplexify": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", + "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", + "dev": true, + "optional": true, + "requires": { + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", + "stream-shift": "^1.0.0" + } + } + } + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "optional": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "^1.1.6" + } + }, + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } + } + }, + "request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "requires": { + "lodash": "^4.17.19" + } + }, + "request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "dev": true, + "requires": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "retry-request": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", + "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", + "dev": true, + "optional": true, + "requires": { + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + } + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "requires": { + "xmlchars": "^2.2.0" + } + }, + "semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true + }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } + } + }, + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "shelljs": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "side-channel": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", + "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", + "dev": true, + "optional": true, + "requires": { + "es-abstract": "^1.18.0-next.0", + "object-inspect": "^1.8.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", + "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "dev": true, + "optional": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true, + "optional": true + }, + "sinon": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "snakeize": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", + "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true + }, + "stream-events": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", + "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", + "dev": true, + "optional": true, + "requires": { + "stubs": "^3.0.0" + } + }, + "stream-shift": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "dev": true, + "optional": true + }, + "streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "string.prototype.trimend": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "string.prototype.trimstart": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "stubs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", + "dev": true, + "optional": true + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "teeny-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-6.0.3.tgz", + "integrity": "sha512-TZG/dfd2r6yeji19es1cUIwAlVD8y+/svB1kAC2Y0bjEyysrfbO8EZvJBRwIE6WkwmUoB7uvWLwTIhJbMXZ1Dw==", + "dev": true, + "optional": true, + "requires": { + "http-proxy-agent": "^4.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.2.0", + "stream-events": "^1.0.5", + "uuid": "^7.0.0" + } + }, + "thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "requires": { + "any-promise": "^1.0.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", + "dev": true, + "requires": { + "thenify": ">= 3.1.0 < 4" + } + }, + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "dev": true, + "optional": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + }, + "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "optional": true + } + } + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, + "ts-node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", + "dev": true, + "requires": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + }, + "dependencies": { + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + } + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, + "tslint": { + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^4.0.1", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, + "dependencies": { + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "tslint-config-prettier": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", + "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", + "dev": true + }, + "tslint-no-unused-expression-chai": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", + "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", + "dev": true, + "requires": { + "tsutils": "^3.0.0" + }, + "dependencies": { + "tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "tslint-plugin-prettier": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", + "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", + "dev": true, + "requires": { + "eslint-plugin-prettier": "^2.2.0", + "lines-and-columns": "^1.1.6", + "tslib": "^1.7.1" + } + }, + "tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true, + "optional": true + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "optional": true, + "requires": { + "is-typedarray": "^1.0.0" + } + }, + "typedoc": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.19.1.tgz", + "integrity": "sha512-EqZpRJQUnkwHA1yBhaDExEXUZIiWKddkrDXhRcfUzpnu6pizxNmVTw5IZ3mu682Noa4zQCniE0YNjaAwHQodrA==", + "dev": true, + "requires": { + "fs-extra": "^9.0.1", + "handlebars": "^4.7.6", + "highlight.js": "^10.0.0", + "lodash": "^4.17.20", + "lunr": "^2.3.9", + "marked": "^1.1.1", + "minimatch": "^3.0.0", + "progress": "^2.0.3", + "semver": "^7.3.2", + "shelljs": "^0.8.4", + "typedoc-default-themes": "^0.11.1" + }, + "dependencies": { + "handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } + } + }, + "typedoc-default-themes": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.3.tgz", + "integrity": "sha512-SwyN188QGNA2iFS5mdWYTGzohKqJ1PWAXVmGolKnVc2NnpX234FEPF2nUvEg+O9jjwAu7ZSVZ5UrZri0raJOjQ==", + "dev": true + }, + "typescript": { + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "dev": true + }, + "uglify-js": { + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", + "dev": true, + "optional": true, + "requires": { + "commander": "~2.17.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true, + "optional": true + } + } + }, + "unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "dev": true, + "optional": true, + "requires": { + "crypto-random-string": "^2.0.0" + } + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "uri-js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true, + "optional": true + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "uuid": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==", + "dev": true, + "optional": true + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dev": true, + "requires": { + "browser-process-hrtime": "^1.0.0" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "walkdir": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.4.1.tgz", + "integrity": "sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==", + "dev": true, + "optional": true + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, + "websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, + "requires": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + } + }, + "websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true + }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-boxed-primitive": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz", + "integrity": "sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==", + "dev": true, + "optional": true, + "requires": { + "is-bigint": "^1.0.0", + "is-boolean-object": "^1.0.0", + "is-number-object": "^1.0.3", + "is-string": "^1.0.4", + "is-symbol": "^1.0.2" + } + }, + "which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dev": true, + "optional": true, + "requires": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "which-typed-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz", + "integrity": "sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==", + "dev": true, + "optional": true, + "requires": { + "available-typed-arrays": "^1.0.2", + "es-abstract": "^1.17.5", + "foreach": "^2.0.5", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.1", + "is-typed-array": "^1.1.3" + } + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "optional": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "ws": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", + "dev": true + }, + "xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "optional": true + }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "yargs-unparser": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", + "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", + "dev": true, + "requires": { + "flat": "^4.1.0", + "lodash": "^4.17.15", + "yargs": "^13.3.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + } + } + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + } + } +} diff --git a/package.json b/package.json index 4eb5986d8..72a217fb7 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", "firebase-admin": "^8.2.0", - "istanbul": "^0.4.5", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", "jsonwebtoken": "^8.5.1", @@ -73,7 +72,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "0.14.2", + "typedoc": "^0.19.1", "typescript": "^3.8.3", "yargs": "^15.3.1" }, From 93047d5046e589f6d0ae4d321e546c0e85a769a4 Mon Sep 17 00:00:00 2001 From: joehan Date: Mon, 30 Nov 2020 13:49:32 -0800 Subject: [PATCH 270/705] Switches to Github Actions from travis, and adds CHANGELOG (#818) * Switches to Github Actions over travis, and adds CHNAGELOG entries for recent PRs * formats --- .github/workflows/test.yaml | 35 +++++++++++++++++++++++++++++++++++ .travis.yml | 14 -------------- CHANGELOG.md | 2 ++ 3 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/test.yaml delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 000000000..9a31678c2 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,35 @@ +name: CI Tests + +on: + - pull_request + - push + +env: + CI: true + +jobs: + unit: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: + - 8.x + - 10.x + - 12.x + - 14.x + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + + - name: Cache npm + uses: actions/cache@v1 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} + + - run: npm install + - run: npm run lint + - run: npm run format + - run: npm run test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 18dff4114..000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -cache: npm -jobs: - include: - - name: lint - script: npm run lint - stage: verify - - name: format - script: npm run format - stage: verify -language: node_js -node_js: - - '8' - - '10' -sudo: false diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..e0c94613b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Adds `4GB` as a `memory` option for `runWith()`. +- Adds support for choosing `ingressSettings` via `runWith()`. From 3932876901d977d7957b57a69b6f2b0b9b2b94a5 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 30 Nov 2020 21:54:33 +0000 Subject: [PATCH 271/705] 3.12.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17b67b6d0..2ff1ff5cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.11.0", + "version": "3.12.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 72a217fb7..a27384f60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.11.0", + "version": "3.12.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 9055e0fc9f3bd8fb72c4cc8702f8ea1a1051ee70 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 30 Nov 2020 21:54:38 +0000 Subject: [PATCH 272/705] [firebase-release] Removed change log and reset repo after 3.12.0 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0c94613b..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Adds `4GB` as a `memory` option for `runWith()`. -- Adds support for choosing `ingressSettings` via `runWith()`. From 07139c8d9cdaff5dccbe790fd3ebc66a717ae8ac Mon Sep 17 00:00:00 2001 From: Egor Miasnikov Date: Tue, 8 Dec 2020 01:05:26 +0300 Subject: [PATCH 273/705] Add support for service account in `functions.runWith` (#770) * Add support for service account in `functions.runWith` * Add email validation and email generation by project id * Changing to serviceAccount, and adding default as an option * adds a test case for default * refactoring to checxk for @ at the end of service account, and throw erros earlier when service account is set to something invalid * gets rid of repeated @ for generated service account emails Co-authored-by: joehan --- spec/function-builder.spec.ts | 48 +++++++++++++++++++++++++++++++++++ src/cloud-functions.ts | 20 +++++++++++++++ src/function-builder.ts | 19 +++++++++++--- src/function-configuration.ts | 5 ++++ 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index eec531fdf..c31a82d4a 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -238,4 +238,52 @@ describe('FunctionBuilder', () => { )}` ); }); + + it('should allow a serviceAccount to be set as-is', () => { + const serviceAccount = 'test-service-account@test.iam.gserviceaccount.com'; + const fn = functions + .runWith({ + serviceAccount, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.serviceAccountEmail).to.equal(serviceAccount); + }); + + it('should allow a serviceAccount to be set with generated service account email', () => { + const serviceAccount = 'test-service-account@'; + const projectId = process.env.GCLOUD_PROJECT; + const fn = functions + .runWith({ + serviceAccount, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.serviceAccountEmail).to.equal( + `test-service-account@${projectId}.iam.gserviceaccount.com` + ); + }); + + it('should not set a serviceAccountEmail if service account is set to `default`', () => { + const serviceAccount = 'default'; + const fn = functions + .runWith({ + serviceAccount, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.serviceAccountEmail).to.be.undefined; + }); + + it('should throw an error if serviceAccount is set to an invalid value', () => { + const serviceAccount = 'test-service-account'; + expect(() => { + functions.runWith({ + serviceAccount, + }); + }).to.throw(); + }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 109a1ad05..50d674022 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -272,6 +272,7 @@ export interface TriggerAnnotated { timeout?: string; vpcConnector?: string; vpcConnectorEgressSettings?: string; + serviceAccountEmail?: string; }; } @@ -525,5 +526,24 @@ export function optionsToTrigger(options: DeploymentOptions) { trigger.vpcConnectorEgressSettings = options.vpcConnectorEgressSettings; } + if (options.serviceAccount) { + if (options.serviceAccount === 'default') { + // Do nothing, since this is equivalent to not setting serviceAccount. + } else if (options.serviceAccount.endsWith('@')) { + if (!process.env.GCLOUD_PROJECT) { + throw new Error( + `Unable to determine email for service account '${options.serviceAccount}' because process.env.GCLOUD_PROJECT is not set.` + ); + } + trigger.serviceAccountEmail = `${options.serviceAccount}${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`; + } else if (options.serviceAccount.includes('@')) { + trigger.serviceAccountEmail = options.serviceAccount; + } else { + throw new Error( + `Invalid option for serviceAccount: '${options.serviceAccount}'. Valid options are 'default', a service account email, or '{serviceAccountName}@'` + ); + } + } + return trigger; } diff --git a/src/function-builder.ts b/src/function-builder.ts index 9b5f5660b..7411f72e2 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -99,6 +99,16 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { } } } + + if ( + runtimeOptions.serviceAccount && + runtimeOptions.serviceAccount !== 'default' && + !_.includes(runtimeOptions.serviceAccount, '@') + ) { + throw new Error( + `serviceAccount must be set to 'default', a service account email, or '{serviceAccountName}@'` + ); + } return true; } @@ -139,9 +149,12 @@ export function region( * 0 to 540. * 3. `failurePolicy`: failure policy of the function, with boolean `true` being * equivalent to providing an empty retry object. - * 4. `vpcConnector`: id of a VPC connector in the same project and region - * 5. `vpcConnectorEgressSettings`: when a `vpcConnector` is set, control which - * egress traffic is sent through the `vpcConnector`. + * 4. `vpcConnector`: id of a VPC connector in same project and region. + * 5. `vpcConnectorEgressSettings`: when a vpcConnector is set, control which + * egress traffic is sent through the vpcConnector. + * 6. `serviceAccount`: Specific service account for the function. + * 7. `ingressSettings`: ingress settings for the function, which control where a HTTPS + * function can be called from. * * Value must not be null. */ diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 10098a745..f5a325b41 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -122,6 +122,11 @@ export interface RuntimeOptions { */ vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number]; + /** + * Specific service account for the function to run as + */ + serviceAccount?: 'default' | string; + /** * Ingress settings */ From 07ca97f68bcf3e724a81c4da62807a51e5712619 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 14:14:49 -0800 Subject: [PATCH 274/705] Bump highlight.js from 10.2.0 to 10.4.1 (#823) Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.2.0 to 10.4.1. - [Release notes](https://github.com/highlightjs/highlight.js/releases) - [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md) - [Commits](https://github.com/highlightjs/highlight.js/compare/10.2.0...10.4.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: joehan --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ff1ff5cd..167df1e2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1919,9 +1919,9 @@ "dev": true }, "highlight.js": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.0.tgz", - "integrity": "sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", + "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", "dev": true }, "html-encoding-sniffer": { From df592717075a9bbb1a17dd5e55c77a076b328cf9 Mon Sep 17 00:00:00 2001 From: joehan Date: Mon, 7 Dec 2020 15:43:39 -0800 Subject: [PATCH 275/705] Adds changelog entries for v3.13.0 (#824) * adds changelog entries for 3.13.0 * formats * Update CHANGELOG.md Co-authored-by: Sam Stern * Update CHANGELOG.md Co-authored-by: Sam Stern * Update CHANGELOG.md Co-authored-by: Sam Stern * formats * formats Co-authored-by: Sam Stern --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..c9cb1adff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +- Adds `serviceAccount` option to `runtimeOptions` to specify which service account Cloud Function should use at runtime. For example: + +``` +const functions = require('firebase-functions'); + +exports.myFunction = functions.runWith({ + serviceAccount: 'test-sa@project.iam.gserviceaccount.com' + // OR + // serviceAcount: 'test-sa@" + // OR + // serviceAccount: 'default' + }) + +``` + +Requires firebase-tools@8.18.0 or later. Thanks @egor-miasnikov! + +- Upgrades `highlight.js` to `10.4.1` to fix a vulnerability. From 21d2c0bb458bd2aa6628f8cf4e2648d51d8a0f13 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 7 Dec 2020 23:48:48 +0000 Subject: [PATCH 276/705] 3.13.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 167df1e2b..7a1981a69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.12.0", + "version": "3.13.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a27384f60..8f4bb09c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.12.0", + "version": "3.13.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From c69c9bc083a2ef55a3ea152839d6027b4bb20352 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 7 Dec 2020 23:48:54 +0000 Subject: [PATCH 277/705] [firebase-release] Removed change log and reset repo after 3.13.0 release --- CHANGELOG.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9cb1adff..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +0,0 @@ -- Adds `serviceAccount` option to `runtimeOptions` to specify which service account Cloud Function should use at runtime. For example: - -``` -const functions = require('firebase-functions'); - -exports.myFunction = functions.runWith({ - serviceAccount: 'test-sa@project.iam.gserviceaccount.com' - // OR - // serviceAcount: 'test-sa@" - // OR - // serviceAccount: 'default' - }) - -``` - -Requires firebase-tools@8.18.0 or later. Thanks @egor-miasnikov! - -- Upgrades `highlight.js` to `10.4.1` to fix a vulnerability. From 9b8fe654d090cb6f4721c9725aa0f0707afc7433 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Mon, 11 Jan 2021 17:37:14 +0000 Subject: [PATCH 278/705] Fix emulated database URL parse issue (#838) --- package.json | 1 + spec/providers/database.spec.ts | 11 +++++++++++ src/providers/database.ts | 11 +++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8f4bb09c5..9b2c3cd8c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm install --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", + "build:watch": "npm run build -- -w", "format": "prettier --check '**/*.{json,md,ts,yml,yaml}'", "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index b764a7ea0..bf7e54b6b 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -472,6 +472,17 @@ describe('Database Functions', () => { ); }).to.throw(Error); }); + + it('should use the emulator host when present', () => { + process.env.FIREBASE_DATABASE_EMULATOR_HOST = 'localhost:1234'; + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/bar', + 'firebaseio-staging.com' + ); + expect(instance).to.equal('http://localhost:1234/?ns=foo'); + expect(path).to.equal('/bar'); + delete process.env.FIREBASE_DATABASE_EMULATOR_HOST; + }); }); describe('DataSnapshot', () => { diff --git a/src/providers/database.ts b/src/providers/database.ts index 2aa50b55a..0e4393d05 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -334,8 +334,15 @@ export function extractInstanceAndPath( `Expect project to be '_' in a Firebase Realtime Database event` ); } - const dbInstance = 'https://' + dbInstanceName + '.' + domain; - return [dbInstance, path]; + + const emuHost = process.env.FIREBASE_DATABASE_EMULATOR_HOST; + if (emuHost) { + const dbInstance = `http://${emuHost}/?ns=${dbInstanceName}`; + return [dbInstance, path]; + } else { + const dbInstance = 'https://' + dbInstanceName + '.' + domain; + return [dbInstance, path]; + } } /** From 2f72c33ab47a57dce7175eb4449dca00073d46cc Mon Sep 17 00:00:00 2001 From: Leon Radley Date: Wed, 13 Jan 2021 20:46:14 +0100 Subject: [PATCH 279/705] Add support for 4GB memory option (#842) * Add support for 4GB memory option The 4GB memory option was not added everywhere. Fixes #834 * Added test for 4GB memory option Co-authored-by: Leon Radley Co-authored-by: joehan --- spec/function-builder.spec.ts | 12 ++++++++++++ src/cloud-functions.ts | 1 + src/function-builder.ts | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index c31a82d4a..209d63d60 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -286,4 +286,16 @@ describe('FunctionBuilder', () => { }); }).to.throw(); }); + + it('should allow setting 4GB memory option', () => { + const fn = functions + .runWith({ + memory: '4GB', + }) + .region('europe-west1') + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.availableMemoryMb).to.deep.equal(4096); + }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 50d674022..aef850da4 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -507,6 +507,7 @@ export function optionsToTrigger(options: DeploymentOptions) { '512MB': 512, '1GB': 1024, '2GB': 2048, + '4GB': 4096, }; trigger.availableMemoryMb = _.get(memoryLookup, options.memory); } diff --git a/src/function-builder.ts b/src/function-builder.ts index 7411f72e2..8d06b2142 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -144,7 +144,7 @@ export function region( * Configure runtime options for the function. * @param runtimeOptions Object with optional fields: * 1. `memory`: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * are: '128MB', '256MB', '512MB', '1GB', '2GB', and '4GB'. * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are * 0 to 540. * 3. `failurePolicy`: failure policy of the function, with boolean `true` being @@ -188,7 +188,7 @@ export class FunctionBuilder { * Configure runtime options for the function. * @param runtimeOptions Object with optional fields: * 1. `memory`: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', and '2GB'. + * are: '128MB', '256MB', '512MB', '1GB', '2GB', and '4GB'. * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are * 0 to 540. * 3. `failurePolicy`: failure policy of the function, with boolean `true` being From f508951c651f755734dea6c8202c8a7ced034e2a Mon Sep 17 00:00:00 2001 From: huangjeff5 <64040981+huangjeff5@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:31:54 -0800 Subject: [PATCH 280/705] Remove circular dependencies when logging. Fixes #737 (#844) * Remove circular dependencies when logging. Fixes #737 * Fix bug in binding the output logger * modify removeCircular to return a copy of the original object, rather than mutate * Modify removeCircular to return a new object, rather than mutating in place Co-authored-by: Michael Bleigh --- spec/logger.spec.ts | 84 ++++++++++++++++++++++++++++++--------------- src/logger.ts | 35 +++++++++++++++++-- 2 files changed, 89 insertions(+), 30 deletions(-) diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts index c6859b60a..dda16087c 100644 --- a/spec/logger.spec.ts +++ b/spec/logger.spec.ts @@ -1,5 +1,4 @@ import { expect } from 'chai'; -import * as sinon from 'sinon'; import * as logger from '../src/logger'; const SUPPORTS_STRUCTURED_LOGS = @@ -8,52 +7,51 @@ const SUPPORTS_STRUCTURED_LOGS = describe(`logger (${ SUPPORTS_STRUCTURED_LOGS ? 'structured' : 'unstructured' })`, () => { - let sandbox: sinon.SinonSandbox; - let stdoutStub: sinon.SinonStub; - let stderrStub: sinon.SinonStub; + let stdoutWrite = process.stdout.write.bind(process.stdout); + let stderrWrite = process.stderr.write.bind(process.stderr); + let lastOut: string; + let lastErr: string; beforeEach(() => { - sandbox = sinon.createSandbox(); - stdoutStub = sandbox.stub(process.stdout, 'write'); - stderrStub = sandbox.stub(process.stderr, 'write'); + process.stdout.write = (msg: Buffer | string, cb?: any): boolean => { + lastOut = msg as string; + return stdoutWrite(msg, cb); + }; + process.stderr.write = (msg: Buffer | string, cb?: any): boolean => { + lastErr = msg as string; + return stderrWrite(msg, cb); + }; }); - function expectOutput(stdStub: sinon.SinonStub, entry: any) { + afterEach(() => { + process.stdout.write = stdoutWrite; + process.stderr.write = stderrWrite; + }); + + function expectOutput(last: string, entry: any) { if (SUPPORTS_STRUCTURED_LOGS) { - return expect( - JSON.parse((stdStub.getCalls()[0].args[0] as string).trim()) - ).to.deep.eq(entry); + return expect(JSON.parse(last.trim())).to.deep.eq(entry); } else { // legacy logging is not structured, but do a sanity check - return expect(stdStub.getCalls()[0].args[0]).to.include(entry.message); + return expect(last).to.include(entry.message); } } function expectStdout(entry: any) { - return expectOutput(stdoutStub, entry); + return expectOutput(lastOut, entry); } function expectStderr(entry: any) { - return expectOutput(stderrStub, entry); + return expectOutput(lastErr, entry); } describe('logging methods', () => { - let writeStub: sinon.SinonStub; - beforeEach(() => { - writeStub = sinon.stub(logger, 'write'); - }); - - afterEach(() => { - writeStub.restore(); - }); - it('should coalesce arguments into the message', () => { logger.log('hello', { middle: 'obj' }, 'end message'); expectStdout({ severity: 'INFO', message: "hello { middle: 'obj' } end message", }); - sandbox.restore(); // to avoid swallowing test runner output }); it('should merge structured data from the last argument', () => { @@ -63,7 +61,6 @@ describe(`logger (${ message: 'hello world', additional: 'context', }); - sandbox.restore(); // to avoid swallowing test runner output }); it('should not recognize null as a structured logging object', () => { @@ -72,13 +69,46 @@ describe(`logger (${ severity: 'INFO', message: 'hello world null', }); - sandbox.restore(); // to avoid swallowing test runner output }); }); describe('write', () => { describe('structured logging', () => { describe('write', () => { + it('should remove circular references', () => { + const circ: any = { b: 'foo' }; + circ.circ = circ; + + const entry: logger.LogEntry = { + severity: 'ERROR', + message: 'testing circular', + circ, + }; + logger.write(entry); + expectStderr({ + severity: 'ERROR', + message: 'testing circular', + circ: { b: 'foo', circ: '[Circular]' }, + }); + }); + + it('should remove circular references in arrays', () => { + const circ: any = { b: 'foo' }; + circ.circ = [circ]; + + const entry: logger.LogEntry = { + severity: 'ERROR', + message: 'testing circular', + circ, + }; + logger.write(entry); + expectStderr({ + severity: 'ERROR', + message: 'testing circular', + circ: { b: 'foo', circ: ['[Circular]'] }, + }); + }); + for (const severity of ['DEBUG', 'INFO', 'NOTICE']) { it(`should output ${severity} severity to stdout`, () => { let entry: logger.LogEntry = { @@ -87,7 +117,6 @@ describe(`logger (${ }; logger.write(entry); expectStdout(entry); - sandbox.restore(); // to avoid swallowing test runner output }); } @@ -105,7 +134,6 @@ describe(`logger (${ }; logger.write(entry); expectStderr(entry); - sandbox.restore(); // to avoid swallowing test runner output }); } }); diff --git a/src/logger.ts b/src/logger.ts index 7958ca457..d6c0d2220 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -30,13 +30,40 @@ export interface LogEntry { [key: string]: any; } +function removeCircular(obj: any, refs: any[] = []): any { + if (typeof obj !== 'object' || !obj) { + return obj; + } + if (refs.includes(obj)) { + return '[Circular]'; + } else { + refs.push(obj); + } + let returnObj: any; + if (Array.isArray(obj)) { + returnObj = new Array(obj.length); + } else { + returnObj = {}; + } + for (const k in obj) { + if (refs.includes(obj[k])) { + returnObj[k] = '[Circular]'; + } else { + returnObj[k] = removeCircular(obj[k], refs); + } + } + return returnObj; +} + /** * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). * @param entry The `LogEntry` including severity, message, and any additional structured metadata. */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { - UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(entry)); + UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]]( + JSON.stringify(removeCircular(entry)) + ); return; } @@ -50,7 +77,11 @@ export function write(entry: LogEntry) { } } if (jsonKeyCount > 0) { - message = `${message} ${JSON.stringify(jsonPayload, null, 2)}`; + message = `${message} ${JSON.stringify( + removeCircular(jsonPayload), + null, + 2 + )}`; } UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](message); } From e920b01d1d2f0ba4fe528936196537e90d48ee4a Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 15 Jan 2021 10:41:17 -0800 Subject: [PATCH 281/705] Add changelog entry for #842 (#845) * add changelog for memory options * formats * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: huangjeff5 <64040981+huangjeff5@users.noreply.github.com> --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..dba1ded30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Fixes a bug that prevented Functions from being deployed with `availableMemoryMb` set to `4GB`. +- Fixes bug where `functions.logger.log` crashes function if circular dependencies are passed in From daeda1dd38904c6c4c6c1dc2b09d3c2a275ccc4e Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 15 Jan 2021 18:47:18 +0000 Subject: [PATCH 282/705] 3.13.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a1981a69..f1e9dc457 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.0", + "version": "3.13.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9b2c3cd8c..f6f9ae1c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.0", + "version": "3.13.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 61dc5a16cab32a9e671d6fcee383ef1af0d25420 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 15 Jan 2021 18:47:23 +0000 Subject: [PATCH 283/705] [firebase-release] Removed change log and reset repo after 3.13.1 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dba1ded30..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Fixes a bug that prevented Functions from being deployed with `availableMemoryMb` set to `4GB`. -- Fixes bug where `functions.logger.log` crashes function if circular dependencies are passed in From 5f64797555e150ae8de93445edb304e6ea81fda2 Mon Sep 17 00:00:00 2001 From: takaaa220 Date: Wed, 20 Jan 2021 07:41:55 +0900 Subject: [PATCH 284/705] Fix IngressSettings (#827) Co-authored-by: joehan --- spec/function-builder.spec.ts | 21 +++++++++++++++++++++ src/cloud-functions.ts | 5 +++++ src/function-builder.ts | 12 ++++++++++++ 3 files changed, 38 insertions(+) diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 209d63d60..28cf35c3a 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -200,6 +200,27 @@ describe('FunctionBuilder', () => { }).to.throw(Error, 'at least one region'); }); + it('should allow a ingressSettings to be set', () => { + const fn = functions + .runWith({ ingressSettings: 'ALLOW_INTERNAL_ONLY' }) + .https.onRequest(() => {}); + + expect(fn.__trigger.ingressSettings).to.equal('ALLOW_INTERNAL_ONLY'); + }); + + it('should throw an error if user chooses an invalid ingressSettings', () => { + expect(() => { + return functions.runWith({ + ingressSettings: 'INVALID_OPTION', + } as any); + }).to.throw( + Error, + `The only valid ingressSettings values are: ${functions.INGRESS_SETTINGS_OPTIONS.join( + ',' + )}` + ); + }); + it('should allow a vpcConnector to be set', () => { const fn = functions .runWith({ diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index aef850da4..126997c1d 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -273,6 +273,7 @@ export interface TriggerAnnotated { vpcConnector?: string; vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; + ingressSettings?: string; }; } @@ -519,6 +520,10 @@ export function optionsToTrigger(options: DeploymentOptions) { trigger.maxInstances = options.maxInstances; } + if (options.ingressSettings) { + trigger.ingressSettings = options.ingressSettings; + } + if (options.vpcConnector) { trigger.vpcConnector = options.vpcConnector; } diff --git a/src/function-builder.ts b/src/function-builder.ts index 8d06b2142..6f50e6bde 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -31,6 +31,7 @@ import { SUPPORTED_REGIONS, VALID_MEMORY_OPTIONS, VPC_EGRESS_SETTINGS_OPTIONS, + INGRESS_SETTINGS_OPTIONS, } from './function-configuration'; import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; @@ -68,6 +69,17 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { ); } + if ( + runtimeOptions.ingressSettings && + !_.includes(INGRESS_SETTINGS_OPTIONS, runtimeOptions.ingressSettings) + ) { + throw new Error( + `The only valid ingressSettings values are: ${INGRESS_SETTINGS_OPTIONS.join( + ',' + )}` + ); + } + if ( runtimeOptions.vpcConnectorEgressSettings && !_.includes( From 88691699d875f47ea7dc5db382f3624c68dc3148 Mon Sep 17 00:00:00 2001 From: Reza Rahmati Date: Tue, 19 Jan 2021 17:45:42 -0500 Subject: [PATCH 285/705] Fixing issue reading env.DATABASE_URL and process.env.STORAGE_BUCKET_URL (#840) * #829 fixing issue reading env.DATABASE_URL and env.STORAGE_BUCKET_URL * #829 revert space changes Co-authored-by: joehan --- src/setup.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/setup.ts b/src/setup.ts index d2935af15..6a9db702d 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -51,10 +51,10 @@ export function setup() { ); process.env.FIREBASE_CONFIG = JSON.stringify({ databaseURL: - `${process.env.DATABASE_URL}` || + process.env.DATABASE_URL || `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, storageBucket: - `${process.env.STORAGE_BUCKET_URL}` || + process.env.STORAGE_BUCKET_URL || `${process.env.GCLOUD_PROJECT}.appspot.com`, projectId: process.env.GCLOUD_PROJECT, }); From 0e2e95c8540a6e7e136e5bf718ccacaf319f8587 Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 4 Feb 2021 06:52:32 -0800 Subject: [PATCH 286/705] Adds changelog for #829 and #827. (#848) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..06d7cfb4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Fixes issue where DATABASE_URL and STORAGE_BUCKET_URL could not be set to undefined. (#829) +- Fixes a bug where ingressSettings could not be set. (#827) From 2d81a6be9e31b610f9d66c7ab7f1172762698ed7 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Thu, 4 Feb 2021 16:56:10 +0000 Subject: [PATCH 287/705] Update issue templates (#857) --- .github/ISSUE_TEMPLATE/---feature-request.md | 17 ----------------- .github/ISSUE_TEMPLATE/---report-a-bug.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++ 3 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/---feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md deleted file mode 100644 index 93f7d6de1..000000000 --- a/.github/ISSUE_TEMPLATE/---feature-request.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: "\U0001F4A1 Feature Request" -about: - Have a feature you'd like to see in the functions SDK? Request it through our - support channel. -title: '' -labels: '' -assignees: '' ---- - - - -Great, we love hearing how we can improve our products! However, GitHub is not the place to submit them. Please submit your feature requests to: -https://firebase.google.com/support/contact/bugs-features/ diff --git a/.github/ISSUE_TEMPLATE/---report-a-bug.md b/.github/ISSUE_TEMPLATE/---report-a-bug.md index 694c4aedf..3ad82bf60 100644 --- a/.github/ISSUE_TEMPLATE/---report-a-bug.md +++ b/.github/ISSUE_TEMPLATE/---report-a-bug.md @@ -1,6 +1,6 @@ --- name: '⚠️ Report a Bug' -about: Think you found a bug in the SDK? Report it here. +about: Think you found a bug in the firebase-functions SDK? Report it here. Please do not use this form if your function is deployed successfully but not working as you expected. title: '' labels: '' assignees: '' diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..918e205f9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: 💻 Bug in the Firebase CLI + url: https://github.com/firebase/firebase-tools/issues/new/choose + about: Have you found a bug in the Firebase CLI? + - name: 🔥 Firebase Support + url: https://firebase.google.com/support/ + about: If you have an issue with your functions in production, please contact support. From 0c382ed0f7a94f3cc270b13111d635fe4caccd79 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 22 Feb 2021 18:01:36 +0000 Subject: [PATCH 288/705] 3.13.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1e9dc457..9f26affdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.1", + "version": "3.13.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f6f9ae1c6..11a4dfb39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.1", + "version": "3.13.2", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From fc4788e61012306eda385428f25291094fce624d Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 22 Feb 2021 18:01:44 +0000 Subject: [PATCH 289/705] [firebase-release] Removed change log and reset repo after 3.13.2 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d7cfb4c..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Fixes issue where DATABASE_URL and STORAGE_BUCKET_URL could not be set to undefined. (#829) -- Fixes a bug where ingressSettings could not be set. (#827) From e2c9475372d6eab47d038f29ebc386ec18029784 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 1 Mar 2021 13:28:43 -0800 Subject: [PATCH 290/705] Remove crashlyitcs (#866) --- package-lock.json | 18 +-- spec/providers/crashlytics.spec.ts | 157 ----------------------- src/function-builder.ts | 11 -- src/handler-builder.ts | 36 ------ src/index.ts | 2 - src/providers/crashlytics.ts | 197 ----------------------------- 6 files changed, 9 insertions(+), 412 deletions(-) delete mode 100644 spec/providers/crashlytics.spec.ts delete mode 100644 src/providers/crashlytics.ts diff --git a/package-lock.json b/package-lock.json index 9f26affdd..f1f20b89a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -490,7 +490,7 @@ "@types/range-parser": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" + "integrity": "sha1-fuMwunyq+5gJC+zoal7kQRWQTCw=" }, "@types/serve-static": { "version": "1.13.5", @@ -665,7 +665,7 @@ "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", "dev": true, "requires": { "safer-buffer": "~2.1.0" @@ -1042,7 +1042,7 @@ "cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", "requires": { "object-assign": "^4", "vary": "^1" @@ -1581,7 +1581,7 @@ "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", "dev": true, "requires": { "asynckit": "^0.4.0", @@ -2356,7 +2356,7 @@ "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", "dev": true }, "json-stringify-safe": { @@ -2565,7 +2565,7 @@ "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", "dev": true, "requires": { "pseudomap": "^1.0.2", @@ -3012,7 +3012,7 @@ "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", "dev": true }, "object-assign": { @@ -3327,7 +3327,7 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", "dev": true }, "qs": { @@ -3745,7 +3745,7 @@ "stream-events": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", + "integrity": "sha1-u8iY7E3zOkkC2JIzPUfam/HEBtU=", "dev": true, "optional": true, "requires": { diff --git a/spec/providers/crashlytics.spec.ts b/spec/providers/crashlytics.spec.ts deleted file mode 100644 index 59e745dfa..000000000 --- a/spec/providers/crashlytics.spec.ts +++ /dev/null @@ -1,157 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -import { expect } from 'chai'; - -import { apps as appsNamespace } from '../../src/apps'; -import * as functions from '../../src/index'; -import * as crashlytics from '../../src/providers/crashlytics'; - -describe('Crashlytics Functions', () => { - describe('Issue Builder', () => { - before(() => { - appsNamespace.init(); - process.env.GCLOUD_PROJECT = 'project1'; - }); - - after(() => { - delete appsNamespace.singleton; - delete process.env.GCLOUD_PROJECT; - }); - - it('should allow both region and runtime options to be set', () => { - const fn = functions - .region('us-east1') - .runWith({ - timeoutSeconds: 90, - memory: '256MB', - }) - .crashlytics.issue() - .onNew((issue) => issue); - - expect(fn.__trigger.regions).to.deep.equal(['us-east1']); - expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); - expect(fn.__trigger.timeout).to.deep.equal('90s'); - }); - - describe('#onNew', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics.issue().onNew((data) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.crashlytics/eventTypes/issue.new', - resource: 'projects/project1', - service: 'fabric.io', - }, - }); - }); - }); - - describe('#onRegressed', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics.issue().onRegressed((data) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: - 'providers/firebase.crashlytics/eventTypes/issue.regressed', - resource: 'projects/project1', - service: 'fabric.io', - }, - }); - }); - }); - - describe('#onVelocityAlert', () => { - it('should return a TriggerDefinition with appropriate values', () => { - const cloudFunction = crashlytics - .issue() - .onVelocityAlert((data) => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: - 'providers/firebase.crashlytics/eventTypes/issue.velocityAlert', - resource: 'projects/project1', - service: 'fabric.io', - }, - }); - }); - }); - - describe('HandlerBuilder', () => { - describe('#onNew', () => { - it('should return a CloudFunction with appropriate values', () => { - const cloudFunction = functions.handler.crashlytics.issue.onNew( - (testIssue) => { - return ( - testIssue.issueId + testIssue.issueTitle + testIssue.createTime - ); - } - ); - expect(cloudFunction.__trigger).to.deep.equal({}); - }); - }); - - describe('#onRegressed', () => { - it('should return a CloudFunction with appropriate values', () => { - const cloudFunction = functions.handler.crashlytics.issue.onRegressed( - (testIssue) => { - return ( - testIssue.issueId + testIssue.issueTitle + testIssue.createTime - ); - } - ); - expect(cloudFunction.__trigger).to.deep.equal({}); - }); - }); - - describe('#onVelocityAlert', () => { - it('should return a CloudFunction with appropriate values', () => { - const cloudFunction = functions.handler.crashlytics.issue.onVelocityAlert( - (testIssue) => { - return ( - testIssue.issueId + testIssue.issueTitle + testIssue.createTime - ); - } - ); - expect(cloudFunction.__trigger).to.deep.equal({}); - }); - }); - }); - }); - - describe('process.env.GCLOUD_PROJECT not set', () => { - it('should not throw if __trigger is not accessed', () => { - expect(() => crashlytics.issue().onNew(() => null)).to.not.throw(Error); - }); - - it('should throw if __trigger is accessed', () => { - expect(() => crashlytics.issue().onNew(() => null).__trigger).to.throw( - Error - ); - }); - - it('should not throw when #run is called', () => { - const cf = crashlytics.issue().onNew(() => null); - expect(cf.run).to.not.throw(Error); - }); - }); -}); diff --git a/src/function-builder.ts b/src/function-builder.ts index 6f50e6bde..9d016d817 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -35,7 +35,6 @@ import { } from './function-configuration'; import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; -import * as crashlytics from './providers/crashlytics'; import * as database from './providers/database'; import * as firestore from './providers/firestore'; import * as https from './providers/https'; @@ -311,16 +310,6 @@ export class FunctionBuilder { }; } - get crashlytics() { - return { - /** - * Handle events related to Crashlytics issues. An issue in Crashlytics is - * an aggregation of crashes which have a shared root cause. - */ - issue: () => crashlytics._issueWithOptions(this.options), - }; - } - get analytics() { return { /** diff --git a/src/handler-builder.ts b/src/handler-builder.ts index ea0f4af74..ad4cd1541 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -26,7 +26,6 @@ import { apps } from './apps'; import { CloudFunction, EventContext, HttpsFunction } from './cloud-functions'; import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; -import * as crashlytics from './providers/crashlytics'; import * as database from './providers/database'; import * as firestore from './providers/firestore'; import * as https from './providers/https'; @@ -182,41 +181,6 @@ export class HandlerBuilder { }; } - /** - * Create a handler for Firebase Crashlytics events. - - * `issue.onNew` handles events where the app experiences an issue for the first time. - - * @example - * ```javascript - * exports.myFunction = functions.handler.crashlytics.issue.onNew((issue) => { ... }) - * ``` - - * `issue.onRegressed` handles events where an issue reoccurs after it - * is closed in Crashlytics. - * - * @example - * ```javascript - * exports.myFunction = functions.handler.crashlytics.issue.onRegressed((issue) => { ... }) - * ``` - - * `issue.onVelocityAlert` handles events where a statistically significant number - * of sessions in a given build crash. - * - * @example - * ```javascript - * exports.myFunction = functions.handler.crashlytics.issue.onVelocityAlert((issue) => { ... }) - * ``` - - */ - get crashlytics() { - return { - get issue() { - return new crashlytics.IssueBuilder(() => null, {}); - }, - }; - } - /** * Create a handler for Firebase Remote Config events. diff --git a/src/index.ts b/src/index.ts index dcca98172..9d49414e8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,7 +23,6 @@ // Providers: import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; -import * as crashlytics from './providers/crashlytics'; import * as database from './providers/database'; import * as firestore from './providers/firestore'; import * as https from './providers/https'; @@ -43,7 +42,6 @@ export { analytics, app, auth, - crashlytics, database, firestore, handler, diff --git a/src/providers/crashlytics.ts b/src/providers/crashlytics.ts deleted file mode 100644 index 54fc26469..000000000 --- a/src/providers/crashlytics.ts +++ /dev/null @@ -1,197 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -import { - CloudFunction, - EventContext, - makeCloudFunction, -} from '../cloud-functions'; -import { DeploymentOptions } from '../function-configuration'; - -/** @hidden */ -export const provider = 'google.firebase.crashlytics'; -/** @hidden */ -export const service = 'fabric.io'; - -/** - * Registers a Cloud Function to handle Crashlytics issue events. - * - * @returns Crashlytics issue event builder interface. - */ -export function issue() { - return _issueWithOptions({}); -} - -/** @hidden */ -export function _issueWithOptions(options: DeploymentOptions) { - return new IssueBuilder(() => { - if (!process.env.GCLOUD_PROJECT) { - throw new Error('process.env.GCLOUD_PROJECT is not set.'); - } - return 'projects/' + process.env.GCLOUD_PROJECT; - }, options); -} - -/** The Firebase Crashlytics issue builder interface. */ -export class IssueBuilder { - /** @hidden */ - constructor( - private triggerResource: () => string, - private options: DeploymentOptions - ) {} - - /** @hidden */ - onNewDetected(handler: any): Error { - throw new Error('"onNewDetected" is now deprecated, please use "onNew"'); - } - - /** - * Event handler that fires every time a new issue occurs in a project. - * - * @param handler Event handler that fires every time a new issue event occurs. - * @example - * ```javascript - * exports.postOnNewIssue = functions.crashlytics.issue().onNew(event => { - * const { data } = event; - * issueId = data.issueId; - * issueTitle = data.issueTitle; - * const slackMessage = ` There's a new issue (${issueId}) ` + - * `in your app - ${issueTitle}`; - * return notifySlack(slackMessage).then(() => { - * functions.logger.info(`Posted new issue ${issueId} successfully to Slack`); - * }); - * }); - * ``` - */ - onNew( - handler: (issue: Issue, context: EventContext) => PromiseLike | any - ): CloudFunction { - return this.onEvent(handler, 'issue.new'); - } - - /** - * Event handler that fires every time a regressed issue reoccurs in a project. - * - * @param handler Event handler that fires every time a regressed issue event occurs. - */ - onRegressed( - handler: (issue: Issue, context: EventContext) => PromiseLike | any - ): CloudFunction { - return this.onEvent(handler, 'issue.regressed'); - } - - /** - * Event handler that fires every time a velocity alert occurs in a project. - * - * @param handler handler that fires every time a velocity alert issue event occurs. - */ - onVelocityAlert( - handler: (issue: Issue, context: EventContext) => PromiseLike | any - ): CloudFunction { - return this.onEvent(handler, 'issue.velocityAlert'); - } - - private onEvent( - handler: (issue: Issue, context: EventContext) => PromiseLike | any, - eventType: string - ): CloudFunction { - return makeCloudFunction({ - handler, - provider, - eventType, - service, - legacyEventType: `providers/firebase.crashlytics/eventTypes/${eventType}`, - triggerResource: this.triggerResource, - options: this.options, - }); - } -} - -/** - * Interface representing a Firebase Crashlytics event that was logged for a specific issue. - */ -export interface Issue { - /** Crashlytics-provided issue ID. */ - issueId: string; - - /** Crashlytics-provided issue title. */ - issueTitle: string; - - /** AppInfo interface describing the App. */ - appInfo: AppInfo; - - /** - * UTC when the issue occurred in ISO8601 standard representation. - * - * Example: 1970-01-17T10:52:15.661-08:00 - */ - createTime: string; - - /** - * UTC When the issue was closed in ISO8601 standard representation. - * - * Example: 1970-01-17T10:52:15.661-08:00 - */ - resolvedTime?: string; - - /** Information about the velocity alert, like number of crashes and percentage of users affected by the issue. */ - velocityAlert?: VelocityAlert; -} - -/** Interface representing Firebase Crashlytics VelocityAlert data. */ -export interface VelocityAlert { - /** - * The percentage of sessions which have been impacted by this issue. - * - * Example: .04 - */ - crashPercentage: number; - - /** The number of crashes that this issue has caused. */ - crashes: number; -} - -/** Interface representing Firebase Crashlytics AppInfo data. */ -export interface AppInfo { - /** - * The app's name. - * - * Example: "My Awesome App". - */ - appName: string; - - /** The app's platform. - * - * Examples: "android", "ios". - */ - appPlatform: string; - - /** Unique application identifier within an app store, either the Android package name or the iOS bundle id. */ - appId: string; - - /** - * The app's version name. - * - * Examples: "1.0", "4.3.1.1.213361", "2.3 (1824253)", "v1.8b22p6". - */ - latestAppVersion: string; -} From f2435b1eefeaba80c0bbd1578d6dbd3650630996 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 2 Mar 2021 14:30:10 -0800 Subject: [PATCH 291/705] Cleaning up crashlytics trigger (#868) --- src/cloud-functions.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 126997c1d..272920c20 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -99,9 +99,6 @@ export interface EventContext { * * `google.analytics.event.log` * * `google.firebase.auth.user.create` * * `google.firebase.auth.user.delete` - * * `google.firebase.crashlytics.issue.new` - * * `google.firebase.crashlytics.issue.regressed` - * * `google.firebase.crashlytics.issue.velocityAlert` * * `google.firebase.database.ref.write` * * `google.firebase.database.ref.create` * * `google.firebase.database.ref.update` From ee793c77f1931d44adb3500bc2eed37d4a674370 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 3 Mar 2021 13:44:43 -0800 Subject: [PATCH 292/705] Update integration test so that it works again. (#869) * Updated node versions under test * Updated node dependencies to modern versions * Removed lodash dependency * Minor updates to TypeScript annotations/style * Fix URL and authentication when invoking a cloud schedule * Fix Cloud Schedule test to not finish until tests are complete --- integration_test/firestore.rules | 2 + integration_test/functions/src/https-tests.ts | 5 +- integration_test/functions/src/index.ts | 234 +++++++++--------- .../functions/src/pubsub-tests.ts | 25 +- .../functions/src/testLab-tests.ts | 3 +- .../functions/src/testLab-utils.ts | 3 +- integration_test/functions/src/testing.ts | 64 +++-- ...ckage.node8.json => package.json.template} | 12 +- integration_test/package.node10.json | 23 -- integration_test/run_tests.sh | 39 ++- 10 files changed, 202 insertions(+), 208 deletions(-) rename integration_test/{package.node8.json => package.json.template} (55%) delete mode 100644 integration_test/package.node10.json diff --git a/integration_test/firestore.rules b/integration_test/firestore.rules index e8f8d7997..d9df6d5d1 100644 --- a/integration_test/firestore.rules +++ b/integration_test/firestore.rules @@ -1,3 +1,5 @@ +rules_version = "2"; + service cloud.firestore { match /databases/{database}/documents { match /{document=**} { diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/https-tests.ts index 6af0f9fac..18972bd47 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/https-tests.ts @@ -1,13 +1,12 @@ import * as functions from 'firebase-functions'; -import * as _ from 'lodash'; import { expectEq, TestSuite } from './testing'; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const callableTests: any = functions.region(REGION).https.onCall((d) => { return new TestSuite('https onCall') - .it('should have the correct data', (data) => - expectEq(_.get(data, 'foo'), 'bar') + .it('should have the correct data', (data: any) => + expectEq(data?.foo, 'bar') ) .run(d.testId, d); }); diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 2ac16e5fa..0a980aa06 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -3,6 +3,7 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; import * as https from 'https'; +import { PubSub } from '@google-cloud/pubsub'; export * from './pubsub-tests'; export * from './database-tests'; @@ -18,6 +19,7 @@ import * as utils from './test-utils'; import * as testLab from './testLab-utils'; import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) +import { config } from 'firebase-functions'; const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); admin.initializeApp(); const REGION = functions.config().functions.test_region; @@ -37,26 +39,42 @@ function callHttpsTrigger(name: string, data: any, baseUrl) { ); } -function callScheduleTrigger(functionName: string, region: string) { - return new Promise((resolve, reject) => { +async function callScheduleTrigger(functionName: string, region: string) { + const accessToken = await admin.credential + .applicationDefault() + .getAccessToken(); + return new Promise((resolve, reject) => { const request = https.request( { method: 'POST', host: 'cloudscheduler.googleapis.com', - path: `projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, + path: `/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, headers: { 'Content-Type': 'application/json', + Authorization: `Bearer ${accessToken.access_token}`, }, }, (response) => { + if (response.statusCode! / 100 != 2) { + reject( + new Error('Failed request with status ' + response.statusCode!) + ); + return; + } let body = ''; response.on('data', (chunk) => { body += chunk; }); - response.on('end', () => resolve(body)); + response.on('end', () => { + console.log(`Successfully scheduled function ${functionName}`); + resolve(body); + }); } ); - request.on('error', reject); + request.on('error', (err) => { + console.error('Failed to schedule cloud scheduler job with error', err); + reject(err); + }); request.write('{}'); request.end(); }); @@ -67,14 +85,13 @@ export const integrationTests: any = functions .runWith({ timeoutSeconds: 540, }) - .https.onRequest((req: Request, resp: Response) => { + .https.onRequest(async (req: Request, resp: Response) => { // We take the base url for our https call (cloudfunctions.net, txckloud.net, etc) from the request // so that it changes with the environment that the tests are run in const baseUrl = req.hostname .split('.') .slice(1) .join('.'); - const pubsub: any = require('@google-cloud/pubsub')(); const testId = admin .database() .ref() @@ -83,114 +100,107 @@ export const integrationTests: any = functions .database() .ref(`testRuns/${testId}/timestamp`) .set(Date.now()); + const testIdRef = admin.database().ref(`testRuns/${testId}`); console.log('testId is: ', testId); fs.writeFile('/tmp/' + testId + '.txt', 'test', () => {}); - return Promise.all([ - // A database write to trigger the Firebase Realtime Database tests. - admin - .database() - .ref(`dbTests/${testId}/start`) - .set({ '.sv': 'timestamp' }), - // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. - pubsub - .topic('pubsubTests') - .publisher() - .publish(Buffer.from(JSON.stringify({ testId }))), - // A user creation to trigger the Firebase Auth user creation tests. - admin - .auth() - .createUser({ - email: `${testId}@fake.com`, - password: 'secret', - displayName: `${testId}`, - }) - .then((userRecord) => { - // A user deletion to trigger the Firebase Auth user deletion tests. - admin.auth().deleteUser(userRecord.uid); - }), - // A firestore write to trigger the Cloud Firestore tests. - admin - .firestore() - .collection('tests') - .doc(testId) - .set({ test: testId }), - // Invoke a callable HTTPS trigger. - callHttpsTrigger('callableTests', { foo: 'bar', testId }, baseUrl), - // A Remote Config update to trigger the Remote Config tests. - admin.credential - .applicationDefault() - .getAccessToken() - .then((accessToken) => { - const options = { - hostname: 'firebaseremoteconfig.googleapis.com', - path: `/v1/projects/${firebaseConfig.projectId}/remoteConfig`, - method: 'PUT', - headers: { - Authorization: 'Bearer ' + accessToken.access_token, - 'Content-Type': 'application/json; UTF-8', - 'Accept-Encoding': 'gzip', - 'If-Match': '*', - }, - }; - const request = https.request(options, (resp) => {}); - request.write(JSON.stringify({ version: { description: testId } })); - request.end(); - }), - // A storage upload to trigger the Storage tests - admin - .storage() - .bucket() - .upload('/tmp/' + testId + '.txt'), - testLab.startTestRun(firebaseConfig.projectId, testId), - // Invoke the schedule for our scheduled function to fire - callScheduleTrigger('schedule', 'us-central1'), - ]) - .then(() => { - // On test completion, check that all tests pass and reply "PASS", or provide further details. - console.log('Waiting for all tests to report they pass...'); - const ref = admin.database().ref(`testRuns/${testId}`); - return new Promise((resolve, reject) => { - let testsExecuted = 0; - ref.on('child_added', (snapshot) => { - testsExecuted += 1; - if (snapshot.key != 'timestamp' && !snapshot.val().passed) { - reject( - new Error( - `test ${snapshot.key} failed; see database for details.` - ) - ); - return; - } - console.log( - `${snapshot.key} passed (${testsExecuted} of ${numTests})` - ); - if (testsExecuted < numTests) { - // Not all tests have completed. Wait longer. - return; - } - // All tests have passed! - resolve(); - }); - }) - .then(() => { - ref.off(); // No more need to listen. - return Promise.resolve(); + try { + await Promise.all([ + // A database write to trigger the Firebase Realtime Database tests. + admin + .database() + .ref(`dbTests/${testId}/start`) + .set({ '.sv': 'timestamp' }), + // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. + new PubSub() + .topic('pubsubTests') + .publish(Buffer.from(JSON.stringify({ testId }))), + // A user creation to trigger the Firebase Auth user creation tests. + admin + .auth() + .createUser({ + email: `${testId}@fake.com`, + password: 'secret', + displayName: `${testId}`, }) - .catch((err) => { - ref.off(); // No more need to listen. - return Promise.reject(err); - }); - }) - .then(() => { - console.log('All tests pass!'); - resp.status(200).send('PASS \n'); - }) - .catch((err) => { - console.log(`Some tests failed: ${err}`); - resp - .status(500) - .send( - `FAIL - details at https://${process.env.GCLOUD_PROJECT}.firebaseio.com/testRuns/${testId}` + .then((userRecord) => { + // A user deletion to trigger the Firebase Auth user deletion tests. + admin.auth().deleteUser(userRecord.uid); + }), + // A firestore write to trigger the Cloud Firestore tests. + admin + .firestore() + .collection('tests') + .doc(testId) + .set({ test: testId }), + // Invoke a callable HTTPS trigger. + callHttpsTrigger('callableTests', { foo: 'bar', testId }, baseUrl), + // A Remote Config update to trigger the Remote Config tests. + admin.credential + .applicationDefault() + .getAccessToken() + .then((accessToken) => { + const options = { + hostname: 'firebaseremoteconfig.googleapis.com', + path: `/v1/projects/${firebaseConfig.projectId}/remoteConfig`, + method: 'PUT', + headers: { + Authorization: 'Bearer ' + accessToken.access_token, + 'Content-Type': 'application/json; UTF-8', + 'Accept-Encoding': 'gzip', + 'If-Match': '*', + }, + }; + const request = https.request(options, (resp) => {}); + request.write(JSON.stringify({ version: { description: testId } })); + request.end(); + }), + // A storage upload to trigger the Storage tests + admin + .storage() + .bucket() + .upload('/tmp/' + testId + '.txt'), + testLab.startTestRun(firebaseConfig.projectId, testId), + // Invoke the schedule for our scheduled function to fire + callScheduleTrigger('schedule', 'us-central1'), + ]); + + // On test completion, check that all tests pass and reply "PASS", or provide further details. + console.log('Waiting for all tests to report they pass...'); + await new Promise((resolve, reject) => { + setTimeout(() => reject(new Error('Timeout')), 5 * 60 * 1000); + let testsExecuted = 0; + testIdRef.on('child_added', (snapshot) => { + testsExecuted += 1; + if (snapshot.key != 'timestamp' && !snapshot.val().passed) { + reject( + new Error( + `test ${snapshot.key} failed; see database for details.` + ) + ); + return; + } + console.log( + `${snapshot.key} passed (${testsExecuted} of ${numTests})` ); + if (testsExecuted < numTests) { + // Not all tests have completed. Wait longer. + return; + } + // All tests have passed! + resolve(); + }); }); + console.log('All tests pass!'); + resp.status(200).send('PASS \n'); + } catch (err) { + console.log(`Some tests failed: ${err}`); + resp + .status(500) + .send( + `FAIL - details at ${functions.firebaseConfig() + .databaseURL!}/testRuns/${testId}` + ); + } finally { + testIdRef.off('child_added'); + } }); diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/pubsub-tests.ts index e2a3f1bd0..a21c2011a 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/pubsub-tests.ts @@ -66,20 +66,15 @@ export const schedule: any = functions .region(REGION) .pubsub.schedule('every 10 hours') // This is a dummy schedule, since we need to put a valid one in. // For the test, the job is triggered by the jobs:run api - .onRun((context) => { - let testId; + .onRun(async (context) => { const db = admin.database(); - return new Promise(async (resolve, reject) => { - await db - .ref('testRuns') - .orderByChild('timestamp') - .limitToLast(1) - .on('value', (snap) => { - testId = Object.keys(snap.val())[0]; - new TestSuite('pubsub scheduleOnRun') - .it('should trigger when the scheduler fires', () => success()) - .run(testId, null); - }); - resolve(); - }); + const snap = await db + .ref('testRuns') + .orderByChild('timestamp') + .limitToLast(1) + .once('value'); + const testId = Object.keys(snap.val())[0]; + return new TestSuite('pubsub scheduleOnRun') + .it('should trigger when the scheduler fires', () => success()) + .run(testId, null); }); diff --git a/integration_test/functions/src/testLab-tests.ts b/integration_test/functions/src/testLab-tests.ts index cf4b2f062..586c3a0cb 100644 --- a/integration_test/functions/src/testLab-tests.ts +++ b/integration_test/functions/src/testLab-tests.ts @@ -1,5 +1,4 @@ import * as functions from 'firebase-functions'; -import * as _ from 'lodash'; import { TestSuite, expectEq } from './testing'; import TestMatrix = functions.testLab.TestMatrix; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; @@ -24,5 +23,5 @@ export const testLabTests: any = functions expectEq(matrix.state, 'INVALID') ) - .run(_.get(matrix, 'clientInfo.details.testId'), matrix, context); + .run(matrix?.clientInfo?.details?.testId, matrix, context); }); diff --git a/integration_test/functions/src/testLab-utils.ts b/integration_test/functions/src/testLab-utils.ts index 2f457e70d..6f86b0a1f 100644 --- a/integration_test/functions/src/testLab-utils.ts +++ b/integration_test/functions/src/testLab-utils.ts @@ -1,7 +1,6 @@ import * as http from 'http'; import * as https from 'https'; import * as admin from 'firebase-admin'; -import * as _ from 'lodash'; import * as utils from './test-utils'; interface AndroidDevice { @@ -35,7 +34,7 @@ async function fetchDefaultDevice( requestOptions(accessToken, 'GET', '/v1/testEnvironmentCatalog/ANDROID') ); const data = JSON.parse(response); - const models = _.get(data, 'androidDeviceCatalog.models', []); + const models = data?.androidDeviceCatalog?.models || []; const defaultModels = models.filter( (m) => m.tags !== undefined && diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 43d3e69d5..228203d31 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -1,6 +1,5 @@ import * as firebase from 'firebase-admin'; import { EventContext } from 'firebase-functions'; -import * as _ from 'lodash'; export type TestCase = (data: T, context?: EventContext) => any; export interface TestCaseMap { @@ -66,43 +65,70 @@ function failure(reason: string) { return Promise.reject(reason); } -export function evaluate(value, errMsg) { +export function evaluate(value: boolean, errMsg: string) { if (value) { return success(); } return failure(errMsg); } -export function expectEq(left, right) { +export function expectEq(left: any, right: any) { return evaluate( - left === right, + left == right, JSON.stringify(left) + ' does not equal ' + JSON.stringify(right) ); } -export function expectDeepEq(left, right) { +function deepEq(left: any, right: any) { + if (left === right) { + return true; + } + + if (!(left instanceof Object && right instanceof Object)) { + return false; + } + + if (Object.keys(left).length != Object.keys(right).length) { + return false; + } + + for (let key in left) { + if (!right.hasOwnProperty(key)) { + return false; + } + if (!deepEq(left[key], right[key])) { + return false; + } + } + + return true; +} + +export function expectDeepEq(left: any, right: any) { return evaluate( - _.isEqual(left, right), - JSON.stringify(left) + ' does not equal ' + JSON.stringify(right) + deepEq(left, right), + `${JSON.stringify(left)} does not deep equal ${JSON.stringify(right)}` ); } -export function expectMatches(input: string, regexp) { +export function expectMatches(input: string, regexp: RegExp) { return evaluate( - input.match(regexp), + input.match(regexp) !== null, "Input '" + input + "' did not match regexp '" + regexp + "'" ); } -export function expectReject(f) { - return function(event) { - return Promise.resolve() - .then(() => f(event)) - .then( - () => { - throw new Error('Test should have returned a rejected promise'); - }, - () => true // A rejection is what we expected, and so is a positive result. - ); +export function expectReject(f: (e: EventType) => Promise) { + return async (event: EventType) => { + let rejected = false; + try { + await f(event); + } catch { + rejected = true; + } + + if (!rejected) { + throw new Error('Test should have returned a rejected promise'); + } }; } diff --git a/integration_test/package.node8.json b/integration_test/package.json.template similarity index 55% rename from integration_test/package.node8.json rename to integration_test/package.json.template index 8803f2fdc..5bcd8761b 100644 --- a/integration_test/package.node8.json +++ b/integration_test/package.json.template @@ -5,19 +5,17 @@ "build": "./node_modules/.bin/tsc" }, "dependencies": { - "@google-cloud/pubsub": "~0.19.0", - "@types/google-cloud__pubsub": "^0.18.0", - "@types/lodash": "~4.14.41", - "firebase-admin": "^8.0.0", - "firebase-functions": "./firebase-functions.tgz", + "@google-cloud/pubsub": "^2.10.0", + "firebase-admin": "^9.1.0", + "firebase-functions": "__SDK_TARBALL__", "lodash": "~4.17.2" }, "main": "lib/index.js", "devDependencies": { - "typescript": "~3.6.0" + "typescript": "~4.2.2" }, "engines": { - "node": "8" + "node": "__NODE_VERSION__" }, "private": true } diff --git a/integration_test/package.node10.json b/integration_test/package.node10.json deleted file mode 100644 index cf5eeeb25..000000000 --- a/integration_test/package.node10.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "functions", - "description": "Integration test for the Firebase SDK for Google Cloud Functions", - "scripts": { - "build": "./node_modules/.bin/tsc" - }, - "dependencies": { - "@google-cloud/pubsub": "~0.19.0", - "@types/google-cloud__pubsub": "^0.18.0", - "@types/lodash": "~4.14.41", - "firebase-admin": "^8.0.0", - "firebase-functions": "./firebase-functions.tgz", - "lodash": "~4.17.2" - }, - "main": "lib/index.js", - "devDependencies": { - "typescript": "~3.6.0" - }, - "engines": { - "node": "10" - }, - "private": true -} diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index ba567536a..100e24a32 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -58,21 +58,16 @@ function unset_region { fi } -function pick_node8 { +# Creates a Package.json from package.json.template +# @param timestmap of the current SDK build +# @param Node version to test under +function create_package_json { cd "${DIR}" - cp package.node8.json functions/package.json + cp package.json.template functions/package.json # we have to do the -e flag here so that it work both on linux and mac os, but that creates an extra # backup file called package.json-e that we should clean up afterwards. - sed -i -e "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json - rm -f functions/package.json-e -} - -function pick_node10 { - cd "${DIR}" - cp package.node10.json functions/package.json - # we have to do the -e flag here so that it work both on linux and mac os, but that creates an extra - # backup file called package.json-e that we should clean up afterwards. - sed -i -e "s/firebase-functions.tgz/firebase-functions-${TIMESTAMP}.tgz/g" functions/package.json + sed -i -e "s/__SDK_TARBALL__/firebase-functions-$1.tgz/g" functions/package.json + sed -i -e "s/__NODE_VERSION__/$2/g" functions/package.json rm -f functions/package.json-e } @@ -143,19 +138,13 @@ build_sdk delete_all_functions set_region -# Node 8 tests -pick_node8 -install_deps -announce "Deploying functions to Node 8 runtime ..." -deploy -run_tests - -# Node 10 tests -pick_node10 -install_deps -announce "Re-deploying the same functions to Node 10 runtime ..." -deploy -run_tests +for version in 10 12 14; do + create_package_json $TIMESTAMP $version + install_deps + announce "Re-deploying the same functions to Node $version runtime ..." + deploy + run_tests +done # Cleanup cleanup From d7d455a40f1a0f3a25de08e85175e27ee7e17f7c Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Fri, 5 Mar 2021 13:30:52 -0800 Subject: [PATCH 293/705] Stop running Node 8 tests in GitHub (#870) --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9a31678c2..c56d65e12 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,7 +13,6 @@ jobs: strategy: matrix: node-version: - - 8.x - 10.x - 12.x - 14.x From 92916aa42b8b8e85fe7416ee0795744206ef9afa Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 17 Mar 2021 10:05:33 -0700 Subject: [PATCH 294/705] Add tests to verify logger does not alter its parameters (#873) --- spec/logger.spec.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts index dda16087c..48258ffac 100644 --- a/spec/logger.spec.ts +++ b/spec/logger.spec.ts @@ -109,6 +109,22 @@ describe(`logger (${ }); }); + it('should not alter parameters that are logged', () => { + const circ: any = { b: 'foo' }; + circ.array = [circ]; + circ.object = circ; + const entry: logger.LogEntry = { + severity: 'ERROR', + message: 'testing circular', + circ, + }; + logger.write(entry); + + expect(circ.array[0].b).to.equal('foo'); + expect(circ.object.b).to.equal('foo'); + expect(circ.object.array[0].object.array[0].b).to.equal('foo'); + }); + for (const severity of ['DEBUG', 'INFO', 'NOTICE']) { it(`should output ${severity} severity to stdout`, () => { let entry: logger.LogEntry = { From a4019540dc0ced5abadb0a3c5ddaf21f7881f79e Mon Sep 17 00:00:00 2001 From: joehan Date: Fri, 19 Mar 2021 10:43:32 -0700 Subject: [PATCH 295/705] Remove crashlytics from toc.yaml, and dont try to delete css.map files if they dont exist (#871) --- docgen/content-sources/toc.yaml | 12 ------------ docgen/generate-docs.js | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index 5758eb74e..e970fc80c 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -69,18 +69,6 @@ toc: - title: 'UserRecord' path: /docs/reference/functions/providers_auth_.html#userrecord - - title: 'functions.crashlytics' - path: /docs/reference/functions/providers_crashlytics_.html - section: - - title: 'Issue' - path: /docs/reference/functions/providers_crashlytics_.issue.html - - title: 'IssueBuilder' - path: /docs/reference/functions/providers_crashlytics_.issuebuilder.html - - title: 'AppInfo' - path: /docs/reference/functions/providers_crashlytics_.appinfo.html - - title: 'VelocityAlert' - path: /docs/reference/functions/providers_crashlytics_.velocityalert.html - - title: 'functions.firestore' path: /docs/reference/functions/providers_firestore_.html section: diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index 01275ae2d..1ce7ff910 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -323,7 +323,9 @@ Promise.all([ // Clean up temp home markdown file. (Nothing needs to wait for this.) fs.unlink(tempHomePath); // Devsite doesn't like css.map files. - return fs.unlink(`${docPath}/assets/css/main.css.map`); + if (fs.existsSync(`${docPath}/assets/css/main.css.map`)) { + return fs.unlink(`${docPath}/assets/css/main.css.map`); + } }) // Write out TOC file. Do this after Typedoc step to prevent Typedoc // erroring when it finds an unexpected file in the target dir. From 98bf467aa436f7e27969a8ad3887abe0345f66d3 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 23 Mar 2021 10:34:24 -0700 Subject: [PATCH 296/705] Update generate-docs to modern JS (#874) Update generate-docs to modern JS. Fixes a few places where promises were left dangling. --- docgen/generate-docs.js | 313 +++++++++++++++++++--------------------- 1 file changed, 145 insertions(+), 168 deletions(-) diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index 1ce7ff910..d36edb7e8 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -20,7 +20,6 @@ const fs = require('mz/fs'); const path = require('path'); const yargs = require('yargs'); const yaml = require('js-yaml'); -const _ = require('lodash'); const repoPath = path.resolve(`${__dirname}/..`); @@ -72,59 +71,52 @@ function runTypedoc() { * Moves files from subdir to root. * @param {string} subdir Subdir to move files out of. */ -function moveFilesToRoot(subdir) { - return exec(`mv ${docPath}/${subdir}/* ${docPath}`) - .then(() => { - exec(`rmdir ${docPath}/${subdir}`); - }) - .catch(e => console.error(e)); +async function moveFilesToRoot(subdir) { + await exec(`mv ${docPath}/${subdir}/* ${docPath}`) + await exec(`rmdir ${docPath}/${subdir}`); } /** * Renames files to remove the leading underscores. * We need to do this because devsite hides these files. - * Example: + * Example: * _cloud_functions_.resource.html => cloud_functions_.resource.html */ -function renameFiles() { - return fs.readdir(docPath).then(files => { - console.log(files); - files.forEach(file => { - let newFileName = file; - if (_.startsWith(file, "_") && _.endsWith(file, "html")) { - newFileName = _.trimStart(file, "_"); - fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`, (err) => { - if (err) console.log(err) - }); - } - }) - }) +async function renameFiles() { + const files = await fs.readdir(docPath); + const renames = []; + for (const file of files) { + if (file.startsWith("_") && file.endsWith("html")) { + let newFileName = file.substring(1); + renames.push(fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`)); + } + } + await Promise.all(renames); } /** * Reformat links to match flat structure. * @param {string} file File to fix links in. */ -function fixLinks(file) { - return fs.readFile(file, 'utf8').then(data => { - data = addTypeAliasLinks(data); - const flattenedLinks = data - .replace(/\.\.\//g, '') - .replace(/(modules|interfaces|classes)\//g, '') - .replace(/\"_/g, '"'); - let caseFixedLinks = flattenedLinks; - for (const lower in lowerToUpperLookup) { - const re = new RegExp(lower, 'g'); - caseFixedLinks = caseFixedLinks.replace(re, lowerToUpperLookup[lower]); - } - return fs.writeFile(file, caseFixedLinks); - }); +async function fixLinks(file) { + let data = await fs.readFile(file, 'utf8'); + data = addTypeAliasLinks(data); + const flattenedLinks = data + .replace(/\.\.\//g, '') + .replace(/(modules|interfaces|classes)\//g, '') + .replace(/\"_/g, '"'); + let caseFixedLinks = flattenedLinks; + for (const lower in lowerToUpperLookup) { + const re = new RegExp(lower, 'g'); + caseFixedLinks = caseFixedLinks.replace(re, lowerToUpperLookup[lower]); + } + return fs.writeFile(file, caseFixedLinks); } -/** +/** * Adds links to external documentation for type aliases that * reference an external library. - * + * * @param data File data to add external library links to. */ function addTypeAliasLinks(data) { @@ -136,22 +128,20 @@ function addTypeAliasLinks(data) { const fileTags = htmlDom.window.document.querySelectorAll(".tsd-signature-type"); fileTags.forEach(tag => { const mapping = typeMap[tag.textContent]; - if (mapping) { - console.log('Adding link to '+tag.textContent+" documentation."); - - // Add the corresponding document link to this type - const linkChild = htmlDom.window.document.createElement('a'); - linkChild.setAttribute('href', mapping); - linkChild.textContent = tag.textContent; - tag.textContent = null; - tag.appendChild(linkChild); - } - }); + if (mapping) { + console.log('Adding link to '+tag.textContent+" documentation."); + + // Add the corresponding document link to this type + const linkChild = htmlDom.window.document.createElement('a'); + linkChild.setAttribute('href', mapping); + linkChild.textContent = tag.textContent; + tag.textContent = null; + tag.appendChild(linkChild); + } + }); return htmlDom.serialize(); } -let tocText = ''; - /** * Generates temporary markdown file that will be sourced by Typedoc to * create index.html. @@ -182,37 +172,33 @@ const lowerToUpperLookup = {}; * Checks to see if any files listed in toc.yaml were not generated. * If files exist, fixes filename case to match toc.yaml version. */ -function checkForMissingFilesAndFixFilenameCase() { +async function checkForMissingFilesAndFixFilenameCase(tocText) { // Get filenames from toc.yaml. const filenames = tocText .split('\n') .filter(line => line.includes('path:')) .map(line => line.split(devsitePath)[1]); // Logs warning to console if a file from TOC is not found. - // console.log(filenames); - const fileCheckPromises = filenames.map(filename => { + const fileCheckPromises = filenames.map(async filename => { // Warns if file does not exist, fixes filename case if it does. // Preferred filename for devsite should be capitalized and taken from // toc.yaml. const tocFilePath = `${docPath}/${filename}`; // Generated filename from Typedoc will be lowercase. const generatedFilePath = `${docPath}/${filename.toLowerCase()}`; - return fs.exists(generatedFilePath).then(exists => { - if (exists) { - // Store in a lookup table for link fixing. - lowerToUpperLookup[ - `${filename.toLowerCase()}` - ] = `${filename}`; - return fs.rename(generatedFilePath, tocFilePath); - } else { - console.warn( - `Missing file: ${filename} requested ` + - `in toc.yaml but not found in ${docPath}` - ); - } - }); + if (await fs.exists(generatedFilePath)) { + // Store in a lookup table for link fixing. + lowerToUpperLookup[filename.toLowerCase()] = filename; + return fs.rename(generatedFilePath, tocFilePath); + } else { + console.warn( + `Missing file: ${filename} requested ` + + `in toc.yaml but not found in ${docPath}` + ); + } }); - return Promise.all(fileCheckPromises).then(() => filenames); + await Promise.all(fileCheckPromises); + return filenames; } /** @@ -223,40 +209,31 @@ function checkForMissingFilesAndFixFilenameCase() { * @param {Array} filenamesFromToc Filenames pulled from toc.yaml * @param {boolean} shouldRemove Should just remove the file */ -function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { - return fs.readdir(docPath).then(files => { - const htmlFiles = files - .filter(filename => filename.slice(-4) === 'html'); - const removePromises = []; - htmlFiles.forEach(filename => { - if ( - !filenamesFromToc.includes(filename) && - filename !== 'index' && - filename !== 'globals' - ) { - if (shouldRemove) { - console.log( - `REMOVING ${docPath}/${filename} - not listed in toc.yaml.` - ); - removePromises.push(fs.unlink(`${docPath}/${filename}`)); - } else { - // This is just a warning, it doesn't need to finish before - // the process continues. - console.warn( - `Unlisted file: ${filename} generated ` + - `but not listed in toc.yaml.` - ); - } - } - }); - if (shouldRemove) { - return Promise.all(removePromises).then(() => - htmlFiles.filter(filename => filenamesFromToc.includes(filename)) - ); - } else { - return htmlFiles; - } - }); +async function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { + const files = await fs.readdir(docPath); + const htmlFiles = files + .filter(filename => filename.slice(-4) === 'html'); + const removePromises = []; + const filesToRemove = htmlFiles + .filter(filename => !filenamesFromToc.includes(filename)) + .filter(filename => filename !== 'index' && filename != 'globals'); + if (filesToRemove.length && !shouldRemove) { + // This is just a warning, it doesn't need to finish before + // the process continues. + console.warn( + `Unlisted files: ${filesToRemove.join(", ")} generated ` + + `but not listed in toc.yaml.` + ); + return htmlFiles; + } + + await Promise.all(filesToRemove.map(filename => { + console.log( + `REMOVING ${docPath}/${filename} - not listed in toc.yaml.` + ); + return fs.unlink(`${docPath}/${filename})`); + })); + return htmlFiles.filter(filename => filenamesFromToc.includes(filename)) } /** @@ -265,7 +242,7 @@ function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { * * @param {Array} htmlFiles List of html files found in generated dir. */ -function writeGeneratedFileList(htmlFiles) { +async function writeGeneratedFileList(htmlFiles) { const fileList = htmlFiles.map(filename => { return { title: filename, @@ -273,9 +250,8 @@ function writeGeneratedFileList(htmlFiles) { }; }); const generatedTocYAML = yaml.safeDump({ toc: fileList }); - return fs - .writeFile(`${docPath}/_toc_autogenerated.yaml`, generatedTocYAML) - .then(() => htmlFiles); + await fs.writeFile(`${docPath}/_toc_autogenerated.yaml`, generatedTocYAML); + return htmlFiles; } /** @@ -305,71 +281,72 @@ function fixAllLinks(htmlFiles) { * links as needed. * 5) Check for mismatches between TOC list and generated file list. */ -Promise.all([ - fs.readFile(`${contentPath}/toc.yaml`, 'utf8'), - fs.readFile(`${contentPath}/HOME.md`, 'utf8') -]) - // Read TOC and homepage text and assemble a homepage markdown file. - // This file will be sourced by Typedoc to generate index.html. - .then(([tocRaw, homeRaw]) => { - tocText = tocRaw; - return generateTempHomeMdFile(tocRaw, homeRaw); - }) - // Run main Typedoc process (uses index.d.ts and generated temp file above). - .then(runTypedoc) - .then(output => { +(async function() { + try { + const [tocRaw, homeRaw] = await Promise.all([ + fs.readFile(`${contentPath}/toc.yaml`, 'utf8'), + fs.readFile(`${contentPath}/HOME.md`, 'utf8') + ]) + + // Run main Typedoc process (uses index.d.ts and generated temp file above). + await generateTempHomeMdFile(tocRaw, homeRaw); + const output = await runTypedoc(); + // Typedoc output. console.log(output.stdout); - // Clean up temp home markdown file. (Nothing needs to wait for this.) - fs.unlink(tempHomePath); - // Devsite doesn't like css.map files. - if (fs.existsSync(`${docPath}/assets/css/main.css.map`)) { - return fs.unlink(`${docPath}/assets/css/main.css.map`); - } - }) - // Write out TOC file. Do this after Typedoc step to prevent Typedoc - // erroring when it finds an unexpected file in the target dir. - .then(() => fs.writeFile(`${docPath}/_toc.yaml`, tocText)) - // Flatten file structure. These categories don't matter to us and it makes - // it easier to manage the docs directory. - .then(() => { - return Promise.all([ + await Promise.all([ + // Clean up temp home markdown file. (Nothing needs to wait for this.) + fs.unlink(tempHomePath), + + // Devsite doesn't like css.map files. + // NOTE: This doesn't seem to actually get generated anymore, but we'll keep this here just in case. + async () => { + const cssMap = `${docPath}/assets/css/main.css.map`; + if (await fs.exists(cssMap)) { + await fs.unlink(); + } + }, + + // Write out TOC file. Do this after Typedoc step to prevent Typedoc + // erroring when it finds an unexpected file in the target dir. + fs.writeFile(`${docPath}/_toc.yaml`, tocRaw), + ]); + + // Flatten file structure. These categories don't matter to us and it makes + // it easier to manage the docs directory. + await Promise.all([ moveFilesToRoot('classes'), moveFilesToRoot('modules'), moveFilesToRoot('interfaces'), ]); - }) - // Rename files to remove the underscores since devsite hides those. - .then(renameFiles) - // Check for files listed in TOC that are missing and warn if so. - // Not blocking. - .then(checkForMissingFilesAndFixFilenameCase) - // Check for files that exist but aren't listed in the TOC and warn. - // (If API is node, actually remove the file.) - // Removal is blocking, warnings aren't. - .then(filenamesFromToc => - checkForUnlistedFiles(filenamesFromToc, false) - ) - // Write a _toc_autogenerated.yaml to record what files were created. - .then(htmlFiles => writeGeneratedFileList(htmlFiles)) - // Correct the links in all the generated html files now that files have - // all been moved to top level. - // .then(removeUnderscores) - .then(fixAllLinks) - .then(() => { - fs.readFile(`${docPath}/index.html`, 'utf8').then(data => { - // String to include devsite local variables. - const localVariablesIncludeString = `{% include "docs/web/_local_variables.html" %}\n`; - return fs.writeFile( - `${docPath}/index.html`, - localVariablesIncludeString + data - ); - }); - }) - .catch(e => { - if (e.stdout) { - console.error(e.stdout); - } else { - console.error(e); - } - }); + // Rename files to remove the underscores since devsite hides those. + await renameFiles(); + + // Check for files listed in TOC that are missing and warn if so. + // Not blocking. + const filenamesFromToc = await checkForMissingFilesAndFixFilenameCase(tocRaw); + + // Check for files that exist but aren't listed in the TOC and warn. + // (If API is node, actually remove the file.) + // Removal is blocking, warnings aren't. + const htmlFiles = await checkForUnlistedFiles(filenamesFromToc, false); + + // Write a _toc_autogenerated.yaml to record what files were created. + const fileList = await writeGeneratedFileList(htmlFiles); + + // Correct the links in all the generated html files now that files have + // all been moved to top level. + await fixAllLinks(fileList); + const data = await fs.readFile(`${docPath}/index.html`, 'utf8'); + // String to include devsite local variables. + const localVariablesIncludeString = `{% include "docs/web/_local_variables.html" %}\n`; + await fs.writeFile(`${docPath}/index.html`, localVariablesIncludeString + data); + } catch (err) { + if (err.stdout) { + console.error(err.stdout); + } else { + console.error(err); + } +} +})(); + From 29a55af955450d7758ddaa0cf3871836a2849c13 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 4 May 2021 18:46:29 -0700 Subject: [PATCH 297/705] Updating runWith enums (#884) Updating runWith enums --- CHANGELOG.md | 3 +++ src/cloud-functions.ts | 9 +++++++-- src/function-configuration.ts | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..adc2430a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,3 @@ +- Functions may now be deployed with 8GB RAM +- Functions may now be deployed to europe-central2 (Warsaw) +- Functions may now reserve a minimum number of instances (updated CLI required) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 272920c20..500e27144 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -203,7 +203,7 @@ export namespace Change { json: ChangeJson, customizer: (x: any) => T = reinterpretCast ): Change { - let before = _.assign({}, json.before); + let before = { ...json.before }; if (json.fieldMask) { before = applyFieldMask(before, json.after, json.fieldMask); } @@ -220,7 +220,7 @@ export namespace Change { after: any, fieldMask: string ) { - const before = _.assign({}, after); + const before = { ...after }; const masks = fieldMask.split(','); masks.forEach((mask) => { @@ -506,6 +506,7 @@ export function optionsToTrigger(options: DeploymentOptions) { '1GB': 1024, '2GB': 2048, '4GB': 4096, + '8GB': 8192, }; trigger.availableMemoryMb = _.get(memoryLookup, options.memory); } @@ -513,6 +514,10 @@ export function optionsToTrigger(options: DeploymentOptions) { trigger.schedule = options.schedule; } + if (options.minInstances) { + trigger.minInstances = options.minInstances; + } + if (options.maxInstances) { trigger.maxInstances = options.maxInstances; } diff --git a/src/function-configuration.ts b/src/function-configuration.ts index f5a325b41..8b2b28b81 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -8,6 +8,7 @@ export const SUPPORTED_REGIONS = [ 'us-west2', 'us-west3', 'us-west4', + 'europe-central2', 'europe-west1', 'europe-west2', 'europe-west3', @@ -43,6 +44,7 @@ export const VALID_MEMORY_OPTIONS = [ '1GB', '2GB', '4GB', + '8GB', ] as const; /** @@ -107,6 +109,12 @@ export interface RuntimeOptions { */ timeoutSeconds?: number; + /** + * Min number of actual instances allowed to be running in parallel + * Instances will be billed while idle. + */ + minInstances?: number; + /** * Max number of actual instances allowed to be running in parallel */ From 09120b64a931d41fc500f2c88e3cff0a5a72bee2 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 11 May 2021 20:16:37 -0700 Subject: [PATCH 298/705] Redactions (#886) --- CHANGELOG.md | 1 - src/function-configuration.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adc2430a1..d952d8984 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,2 @@ - Functions may now be deployed with 8GB RAM - Functions may now be deployed to europe-central2 (Warsaw) -- Functions may now reserve a minimum number of instances (updated CLI required) diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 8b2b28b81..2d9925ac5 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -112,6 +112,7 @@ export interface RuntimeOptions { /** * Min number of actual instances allowed to be running in parallel * Instances will be billed while idle. + * @hidden */ minInstances?: number; From c29a8a518aba91aabe9bd02dd6d3a72718033ae7 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 12 May 2021 09:49:52 -0700 Subject: [PATCH 299/705] Support verification of AppCheck token in Callable Functions (#885) Callable Functions will now verify the AppCheck token included in the X-Firebase-AppCheck request header. Similar to auth, Callable Function will return 401 Unauthorized if the AppCheck token is invalid. --- CHANGELOG.md | 1 + package-lock.json | 1197 +++++++++++++++-------------- package.json | 3 +- spec/fixtures/credential/jwk.json | 14 + spec/fixtures/mockrequest.ts | 51 +- spec/providers/https.spec.ts | 54 ++ src/providers/https.ts | 134 +++- tsconfig.release.json | 4 +- 8 files changed, 851 insertions(+), 607 deletions(-) create mode 100644 spec/fixtures/credential/jwk.json diff --git a/CHANGELOG.md b/CHANGELOG.md index d952d8984..4ee96fbef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Functions may now be deployed with 8GB RAM - Functions may now be deployed to europe-central2 (Warsaw) +- Add support for validating AppCheck tokens for Callable Functions diff --git a/package-lock.json b/package-lock.json index f1f20b89a..8a4fd6be8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,49 +31,65 @@ } }, "@firebase/app-types": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz", - "integrity": "sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.2.tgz", + "integrity": "sha512-2VXvq/K+n8XMdM4L2xy5bYp2ZXMawJXluUIDzUBvMthVR+lhxK4pfFiqr1mmDbv9ydXvEAuFsD+6DpcZuJcSSw==", "dev": true }, "@firebase/auth-interop-types": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz", - "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", + "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", "dev": true }, "@firebase/component": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.19.tgz", - "integrity": "sha512-L0S3g8eqaerg8y0zox3oOHSTwn/FE8RbcRHiurnbESvDViZtP5S5WnhuAPd7FnFxa8ElWK0z1Tr3ikzWDv1xdQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.0.tgz", + "integrity": "sha512-v18csWtXb0ri+3m7wuGLY/UDgcb89vuMlZGQ//+7jEPLIQeLbylvZhol1uzW9WzoOpxMxOS2W5qyVGX36wZvEA==", "dev": true, "requires": { - "@firebase/util": "0.3.2", - "tslib": "^1.11.1" + "@firebase/util": "1.1.0", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "@firebase/database": { - "version": "0.6.12", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.6.12.tgz", - "integrity": "sha512-OLUxp8TkXiML4X5LWM5IACsSDvo3fcf4mTbTe5RF+N6TRFv0Svzlet5OgGIa3ET1dQvNiisrMX7zzRa0OTLs7Q==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.0.tgz", + "integrity": "sha512-GsHvuES83Edtboij2h3txKg+yV/TD4b5Owc01SgXEQtvj1lulkHt4Ufmd9OZz1WreWQJMIqKpbVowIDHjlkZJQ==", "dev": true, "requires": { - "@firebase/auth-interop-types": "0.1.5", - "@firebase/component": "0.1.19", - "@firebase/database-types": "0.5.2", + "@firebase/auth-interop-types": "0.1.6", + "@firebase/component": "0.5.0", + "@firebase/database-types": "0.7.2", "@firebase/logger": "0.2.6", - "@firebase/util": "0.3.2", + "@firebase/util": "1.1.0", "faye-websocket": "0.11.3", - "tslib": "^1.11.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "@firebase/database-types": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.5.2.tgz", - "integrity": "sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.2.tgz", + "integrity": "sha512-cdAd/dgwvC0r3oLEDUR+ULs1vBsEvy0b27nlzKhU6LQgm9fCDzgaH9nFGv8x+S9dly4B0egAXkONkVoWcOAisg==", "dev": true, "requires": { - "@firebase/app-types": "0.6.1" + "@firebase/app-types": "0.6.2" } }, "@firebase/logger": { @@ -83,50 +99,57 @@ "dev": true }, "@firebase/util": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.2.tgz", - "integrity": "sha512-Dqs00++c8rwKky6KCKLLY2T1qYO4Q+X5t+lF7DInXDNF4ae1Oau35bkD+OpJ9u7l1pEv7KHowP6CUKuySCOc8g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.1.0.tgz", + "integrity": "sha512-lfuSASuPKNdfebuFR8rjFamMQUPH9iiZHcKS755Rkm/5gRT0qC7BMhCh3ZkHf7NVbplzIc/GhmX2jM+igDRCag==", "dev": true, "requires": { - "tslib": "^1.11.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "@google-cloud/common": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-2.4.0.tgz", - "integrity": "sha512-zWFjBS35eI9leAHhjfeOYlK5Plcuj/77EzstnrJIZbKgF/nkqjcQuGiMCpzCwOfPyUbz8ZaEOYgbHa759AKbjg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", + "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", "dev": true, "optional": true, "requires": { - "@google-cloud/projectify": "^1.0.0", - "@google-cloud/promisify": "^1.0.0", - "arrify": "^2.0.0", - "duplexify": "^3.6.0", + "@google-cloud/projectify": "^2.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.1", + "duplexify": "^4.1.1", "ent": "^2.2.0", "extend": "^3.0.2", - "google-auth-library": "^5.5.0", - "retry-request": "^4.0.0", - "teeny-request": "^6.0.0" + "google-auth-library": "^7.0.2", + "retry-request": "^4.1.1", + "teeny-request": "^7.0.0" } }, "@google-cloud/firestore": { - "version": "3.8.6", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-3.8.6.tgz", - "integrity": "sha512-ox80NbrM1MLJgvAAUd1quFLx/ie/nSjrk1PtscSicpoYDlKb9e6j7pHrVpbopBMyliyfNl3tLJWaDh+x+uCXqw==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", + "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", "dev": true, "optional": true, "requires": { - "deep-equal": "^2.0.0", + "fast-deep-equal": "^3.1.1", "functional-red-black-tree": "^1.0.1", - "google-gax": "^1.15.3", - "readable-stream": "^3.4.0", - "through2": "^3.0.0" + "google-gax": "^2.9.2", + "protobufjs": "^6.8.6" } }, "@google-cloud/paginator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-2.0.3.tgz", - "integrity": "sha512-kp/pkb2p/p0d8/SKUu4mOq8+HGwF8NPzHWkj+VKrIPQPyMRw8deZtrO/OcSiy9C/7bpfU5Txah5ltUNfPkgEXg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", + "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", "dev": true, "optional": true, "requires": { @@ -135,103 +158,233 @@ } }, "@google-cloud/projectify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-1.0.4.tgz", - "integrity": "sha512-ZdzQUN02eRsmTKfBj9FDL0KNDIFNjBn/d6tHQmA/+FImH5DO6ZV8E7FzxMgAUiVAUq41RFAkb25p1oHOZ8psfg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", + "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", "dev": true, "optional": true }, "@google-cloud/promisify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-1.0.4.tgz", - "integrity": "sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", + "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", "dev": true, "optional": true }, "@google-cloud/storage": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-4.7.0.tgz", - "integrity": "sha512-f0guAlbeg7Z0m3gKjCfBCu7FG9qS3M3oL5OQQxlvGoPtK7/qg3+W+KQV73O2/sbuS54n0Kh2mvT5K2FWzF5vVQ==", + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", + "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", "dev": true, "optional": true, "requires": { - "@google-cloud/common": "^2.1.1", - "@google-cloud/paginator": "^2.0.0", - "@google-cloud/promisify": "^1.0.0", + "@google-cloud/common": "^3.6.0", + "@google-cloud/paginator": "^3.0.0", + "@google-cloud/promisify": "^2.0.0", "arrify": "^2.0.0", + "async-retry": "^1.3.1", "compressible": "^2.0.12", - "concat-stream": "^2.0.0", - "date-and-time": "^0.13.0", - "duplexify": "^3.5.0", + "date-and-time": "^1.0.0", + "duplexify": "^4.0.0", "extend": "^3.0.2", - "gaxios": "^3.0.0", - "gcs-resumable-upload": "^2.2.4", + "gaxios": "^4.0.0", + "gcs-resumable-upload": "^3.1.4", + "get-stream": "^6.0.0", "hash-stream-validation": "^0.2.2", "mime": "^2.2.0", "mime-types": "^2.0.8", "onetime": "^5.1.0", - "p-limit": "^2.2.0", + "p-limit": "^3.0.1", "pumpify": "^2.0.0", - "readable-stream": "^3.4.0", "snakeize": "^0.1.0", "stream-events": "^1.0.1", - "through2": "^3.0.0", "xdg-basedir": "^4.0.0" }, "dependencies": { - "gaxios": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-3.2.0.tgz", - "integrity": "sha512-+6WPeVzPvOshftpxJwRi2Ozez80tn/hdtOUag7+gajDHRJvAblKxTFSSMPtr2hmnLy7p0mvYz0rMXLBl8pSO7Q==", + "mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true, + "optional": true + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "optional": true, "requires": { - "abort-controller": "^3.0.0", - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.3.0" + "yocto-queue": "^0.1.0" } - }, - "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", - "dev": true, - "optional": true } } }, "@grpc/grpc-js": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.0.5.tgz", - "integrity": "sha512-Hm+xOiqAhcpT9RYM8lc15dbQD7aQurM7ZU8ulmulepiPlN7iwBXXwP3vSBUimoFoApRqz7pSIisXU8pZaCB4og==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", + "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", "dev": true, "optional": true, "requires": { - "semver": "^6.2.0" + "@types/node": ">=12.12.47" }, "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", "dev": true, "optional": true } } }, "@grpc/proto-loader": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.5.tgz", - "integrity": "sha512-WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", + "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", "dev": true, "optional": true, "requires": { + "@types/long": "^4.0.1", "lodash.camelcase": "^4.3.0", - "protobufjs": "^6.8.6" + "long": "^4.0.0", + "protobufjs": "^6.10.0", + "yargs": "^16.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "optional": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "optional": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "optional": true + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "optional": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "optional": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "optional": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "optional": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "dev": true, + "optional": true + } } }, + "@panva/asn1.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", + "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", + "dev": true + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -242,14 +395,14 @@ "@protobufjs/base64": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha1-TIVzDlm5ofHzSQR9vyQpYDS7JzU=", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", "dev": true, "optional": true }, "@protobufjs/codegen": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha1-fvN/DQEPsCitGtWXIuUG2SYoFcs=", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", "dev": true, "optional": true }, @@ -406,6 +559,16 @@ "@types/serve-static": "*" } }, + "@types/express-jwt": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", + "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", + "dev": true, + "requires": { + "@types/express": "*", + "@types/express-unless": "*" + } + }, "@types/express-serve-static-core": { "version": "4.17.12", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", @@ -416,14 +579,13 @@ "@types/range-parser": "*" } }, - "@types/fs-extra": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.1.tgz", - "integrity": "sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==", + "@types/express-unless": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", + "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", "dev": true, - "optional": true, "requires": { - "@types/node": "*" + "@types/express": "*" } }, "@types/jsonwebtoken": { @@ -555,9 +717,9 @@ "dev": true }, "agent-base": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", - "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "optional": true, "requires": { @@ -565,13 +727,13 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -637,13 +799,6 @@ "sprintf-js": "~1.0.2" } }, - "array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=", - "dev": true, - "optional": true - }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -671,6 +826,18 @@ "safer-buffer": "~2.1.0" } }, + "asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -683,6 +850,16 @@ "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", "dev": true }, + "async-retry": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", + "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", + "dev": true, + "optional": true, + "requires": { + "retry": "0.12.0" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -695,16 +872,6 @@ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", "dev": true }, - "available-typed-arrays": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", - "integrity": "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==", - "dev": true, - "optional": true, - "requires": { - "array-filter": "^1.0.0" - } - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -724,9 +891,9 @@ "dev": true }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "optional": true }, @@ -740,12 +907,18 @@ } }, "bignumber.js": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", - "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", + "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", "dev": true, "optional": true }, + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -773,6 +946,12 @@ "concat-map": "0.0.1" } }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, "browser-process-hrtime": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", @@ -968,9 +1147,9 @@ }, "dependencies": { "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", "dev": true, "optional": true } @@ -982,19 +1161,6 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, - "concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "dev": true, - "optional": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, "configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -1109,9 +1275,9 @@ } }, "date-and-time": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.13.1.tgz", - "integrity": "sha512-/Uge9DJAT+s+oAcDxtBhyR8+sKjUnZbYmyhbmWjTHNtX7B7oWD8YyYdeXcBRbwSj6hVvj+IQegJam7m7czhbFw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", + "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", "dev": true, "optional": true }, @@ -1144,29 +1310,6 @@ "type-detect": "^4.0.0" } }, - "deep-equal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz", - "integrity": "sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==", - "dev": true, - "optional": true, - "requires": { - "es-abstract": "^1.17.5", - "es-get-iterator": "^1.1.0", - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.2", - "is-regex": "^1.0.5", - "isarray": "^2.0.5", - "object-is": "^1.1.2", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.2", - "which-boxed-primitive": "^1.0.1", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.2" - } - }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -1241,41 +1384,16 @@ } }, "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", + "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", "dev": true, "optional": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", "stream-shift": "^1.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true, - "optional": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - } } }, "ecc-jsbn": { @@ -1302,6 +1420,29 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "requires": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + } + } + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -1349,22 +1490,6 @@ "string.prototype.trimstart": "^1.0.1" } }, - "es-get-iterator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", - "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", - "dev": true, - "optional": true, - "requires": { - "es-abstract": "^1.17.4", - "has-symbols": "^1.0.1", - "is-arguments": "^1.0.4", - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - } - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -1376,6 +1501,13 @@ "is-symbol": "^1.0.2" } }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "optional": true + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -1534,18 +1666,28 @@ } }, "firebase-admin": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.13.0.tgz", - "integrity": "sha512-krXj5ncWMJBhCpXSn9UFY6zmDWjFjqgx+1e9ATXKFYndEjmKtNBuJzqdrAdDh7aTUR7X6+0TPx4Hbc08kd0lwQ==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.8.0.tgz", + "integrity": "sha512-v8B1qU8McZZT2hlLZ018TKz2FoKlfFkZq9mOIyzN7wJUOlAywqQX0JyqNpVGyPeU+B+77ojlvmkGTNXt2OFkgw==", "dev": true, "requires": { - "@firebase/database": "^0.6.0", - "@google-cloud/firestore": "^3.0.0", - "@google-cloud/storage": "^4.1.2", - "@types/node": "^8.10.59", + "@firebase/database": "^0.10.0", + "@firebase/database-types": "^0.7.2", + "@google-cloud/firestore": "^4.5.0", + "@google-cloud/storage": "^5.3.0", + "@types/node": ">=12.12.47", "dicer": "^0.3.0", "jsonwebtoken": "^8.5.1", - "node-forge": "^0.7.6" + "jwks-rsa": "^2.0.2", + "node-forge": "^0.10.0" + }, + "dependencies": { + "@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true + } } }, "flat": { @@ -1565,13 +1707,6 @@ } } }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true, - "optional": true - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -1631,9 +1766,9 @@ "optional": true }, "gaxios": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz", - "integrity": "sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", + "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", "dev": true, "optional": true, "requires": { @@ -1645,27 +1780,28 @@ } }, "gcp-metadata": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-3.5.0.tgz", - "integrity": "sha512-ZQf+DLZ5aKcRpLzYUyBS3yo3N0JSa82lNDO8rj3nMSlovLcz2riKFBsYgDzeXcv75oo5eqB2lx+B14UvPoCRnA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", + "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", "dev": true, "optional": true, "requires": { - "gaxios": "^2.1.0", - "json-bigint": "^0.3.0" + "gaxios": "^4.0.0", + "json-bigint": "^1.0.0" } }, "gcs-resumable-upload": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-2.3.3.tgz", - "integrity": "sha512-sf896I5CC/1AxeaGfSFg3vKMjUq/r+A3bscmVzZm10CElyRanN0XwPu/MxeIO4LSP+9uF6yKzXvNsaTsMXUG6Q==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", + "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", "dev": true, "optional": true, "requires": { "abort-controller": "^3.0.0", "configstore": "^5.0.0", - "gaxios": "^2.0.0", - "google-auth-library": "^5.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "google-auth-library": "^7.0.0", "pumpify": "^2.0.0", "stream-events": "^1.0.4" } @@ -1682,6 +1818,13 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "optional": true + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -1706,9 +1849,9 @@ } }, "google-auth-library": { - "version": "5.10.1", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.10.1.tgz", - "integrity": "sha512-rOlaok5vlpV9rSiUu5EpR0vVpc+PhN62oF4RyX/6++DG1VsaulAFEMlDYBLjJDDPI6OcNOCGAKy9UVB/3NIDXg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", + "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", "dev": true, "optional": true, "requires": { @@ -1716,11 +1859,11 @@ "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", "fast-text-encoding": "^1.0.0", - "gaxios": "^2.1.0", - "gcp-metadata": "^3.4.0", - "gtoken": "^4.1.0", + "gaxios": "^4.0.0", + "gcp-metadata": "^4.2.0", + "gtoken": "^5.0.4", "jws": "^4.0.0", - "lru-cache": "^5.0.0" + "lru-cache": "^6.0.0" }, "dependencies": { "jwa": { @@ -1747,74 +1890,53 @@ } }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "optional": true, "requires": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, "optional": true } } }, "google-gax": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-1.15.3.tgz", - "integrity": "sha512-3JKJCRumNm3x2EksUTw4P1Rad43FTpqrtW9jzpf3xSMYXx+ogaqTM1vGo7VixHB4xkAyATXVIa3OcNSh8H9zsQ==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", + "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", "dev": true, "optional": true, "requires": { - "@grpc/grpc-js": "~1.0.3", - "@grpc/proto-loader": "^0.5.1", - "@types/fs-extra": "^8.0.1", + "@grpc/grpc-js": "~1.3.0", + "@grpc/proto-loader": "^0.6.1", "@types/long": "^4.0.0", "abort-controller": "^3.0.0", - "duplexify": "^3.6.0", - "google-auth-library": "^5.0.0", + "duplexify": "^4.0.0", + "fast-text-encoding": "^1.0.3", + "google-auth-library": "^7.0.2", "is-stream-ended": "^0.1.4", - "lodash.at": "^4.6.0", - "lodash.has": "^4.5.2", - "node-fetch": "^2.6.0", - "protobufjs": "^6.8.9", - "retry-request": "^4.0.0", - "semver": "^6.0.0", - "walkdir": "^0.4.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "optional": true - } + "node-fetch": "^2.6.1", + "object-hash": "^2.1.1", + "protobufjs": "^6.10.2", + "retry-request": "^4.0.0" } }, "google-p12-pem": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz", - "integrity": "sha512-S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", + "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", "dev": true, "optional": true, "requires": { - "node-forge": "^0.9.0" - }, - "dependencies": { - "node-forge": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz", - "integrity": "sha512-naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw==", - "dev": true, - "optional": true - } + "node-forge": "^0.10.0" } }, "graceful-fs": { @@ -1830,16 +1952,15 @@ "dev": true }, "gtoken": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.4.tgz", - "integrity": "sha512-VxirzD0SWoFUo5p8RDP8Jt2AGyOmyYcT/pOUgDKJCK+iSw0TMqwrVfY37RXTNmoKwrzmDHSk0GMT9FsgVmnVSA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", + "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", "dev": true, "optional": true, "requires": { - "gaxios": "^2.1.0", - "google-p12-pem": "^2.0.0", - "jws": "^4.0.0", - "mime": "^2.2.0" + "gaxios": "^4.0.0", + "google-p12-pem": "^3.0.3", + "jws": "^4.0.0" }, "dependencies": { "jwa": { @@ -1864,13 +1985,6 @@ "jwa": "^2.0.0", "safe-buffer": "^5.0.1" } - }, - "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", - "dev": true, - "optional": true } } }, @@ -1912,6 +2026,16 @@ "dev": true, "optional": true }, + "hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -1924,6 +2048,17 @@ "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", "dev": true }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "html-encoding-sniffer": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", @@ -1946,9 +2081,9 @@ } }, "http-parser-js": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", - "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", "dev": true }, "http-proxy-agent": { @@ -1964,13 +2099,13 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -2005,13 +2140,13 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -2076,20 +2211,6 @@ "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", "dev": true }, - "is-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz", - "integrity": "sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==", - "dev": true, - "optional": true - }, - "is-boolean-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz", - "integrity": "sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==", - "dev": true, - "optional": true - }, "is-callable": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", @@ -2108,26 +2229,12 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "is-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", - "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", - "dev": true, - "optional": true - }, "is-negative-zero": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", "dev": true }, - "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", - "dev": true, - "optional": true - }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -2150,13 +2257,6 @@ "has-symbols": "^1.0.1" } }, - "is-set": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", - "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", - "dev": true, - "optional": true - }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -2167,14 +2267,7 @@ "is-stream-ended": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha1-9QIk6V4GvODjVtRApIJ801smfto=", - "dev": true, - "optional": true - }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", "dev": true, "optional": true }, @@ -2187,46 +2280,12 @@ "has-symbols": "^1.0.1" } }, - "is-typed-array": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz", - "integrity": "sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==", - "dev": true, - "optional": true, - "requires": { - "available-typed-arrays": "^1.0.0", - "es-abstract": "^1.17.4", - "foreach": "^2.0.5", - "has-symbols": "^1.0.1" - } - }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, - "is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", - "dev": true, - "optional": true - }, - "is-weakset": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", - "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==", - "dev": true, - "optional": true - }, - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true, - "optional": true - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -2245,6 +2304,15 @@ "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", "dev": true }, + "jose": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", + "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", + "dev": true, + "requires": { + "@panva/asn1.js": "^1.0.0" + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -2338,9 +2406,9 @@ } }, "json-bigint": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz", - "integrity": "sha512-DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", "dev": true, "optional": true, "requires": { @@ -2430,6 +2498,47 @@ "safe-buffer": "^5.0.1" } }, + "jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "dev": true, + "requires": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, + "jwks-rsa": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", + "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", + "dev": true, + "requires": { + "@types/express-jwt": "0.0.42", + "debug": "^4.1.0", + "jose": "^2.0.5", + "limiter": "^1.1.5", + "lru-memoizer": "^2.1.2" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "jws": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", @@ -2450,6 +2559,12 @@ "type-check": "~0.3.2" } }, + "limiter": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", + "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", + "dev": true + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -2471,13 +2586,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, - "lodash.at": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.at/-/lodash.at-4.6.0.tgz", - "integrity": "sha1-k83OZk8KGZTqM9181A4jr9EbD/g=", - "dev": true, - "optional": true - }, "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -2485,12 +2593,11 @@ "dev": true, "optional": true }, - "lodash.has": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", - "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=", - "dev": true, - "optional": true + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true }, "lodash.includes": { "version": "4.3.0", @@ -2558,7 +2665,7 @@ "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha1-mntxz7fTYaGU6lVSQckvdGjVvyg=", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", "dev": true, "optional": true }, @@ -2572,6 +2679,28 @@ "yallist": "^2.1.2" } }, + "lru-memoizer": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", + "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", + "dev": true, + "requires": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", + "dev": true, + "requires": { + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" + } + } + } + }, "lunr": { "version": "2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", @@ -2649,6 +2778,18 @@ "dev": true, "optional": true }, + "minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -2983,9 +3124,9 @@ "optional": true }, "node-forge": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", - "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-version": { @@ -3020,6 +3161,13 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-hash": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", + "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", + "dev": true, + "optional": true + }, "object-inspect": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", @@ -3209,13 +3357,6 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "optional": true - }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -3235,9 +3376,9 @@ "dev": true }, "protobufjs": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.1.tgz", - "integrity": "sha512-pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", "dev": true, "optional": true, "requires": { @@ -3252,14 +3393,14 @@ "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", "@types/long": "^4.0.1", - "@types/node": "^13.7.0", + "@types/node": ">=13.7.0", "long": "^4.0.0" }, "dependencies": { "@types/node": { - "version": "13.13.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.20.tgz", - "integrity": "sha512-1kx55tU3AvGX2Cjk2W4GMBxbgIz892V+X10S2gUreIAq8qCWgaQH+tZBOWc0bi2BKFhQt+CX0BTx28V9QPNa+A==", + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", "dev": true, "optional": true } @@ -3307,21 +3448,6 @@ "duplexify": "^4.1.1", "inherits": "^2.0.3", "pump": "^3.0.0" - }, - "dependencies": { - "duplexify": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", - "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", - "dev": true, - "optional": true, - "requires": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.0" - } - } } }, "punycode": { @@ -3490,6 +3616,13 @@ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "dev": true }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "dev": true, + "optional": true + }, "retry-request": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", @@ -3501,13 +3634,13 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -3604,40 +3737,6 @@ "rechoir": "^0.6.2" } }, - "side-channel": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", - "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", - "dev": true, - "optional": true, - "requires": { - "es-abstract": "^1.18.0-next.0", - "object-inspect": "^1.8.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.18.0-next.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", - "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", - "dev": true, - "optional": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -3745,7 +3844,7 @@ "stream-events": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha1-u8iY7E3zOkkC2JIzPUfam/HEBtU=", + "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", "dev": true, "optional": true, "requires": { @@ -3796,13 +3895,22 @@ } }, "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "optional": true + } } }, "strip-ansi": { @@ -3834,17 +3942,17 @@ "dev": true }, "teeny-request": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-6.0.3.tgz", - "integrity": "sha512-TZG/dfd2r6yeji19es1cUIwAlVD8y+/svB1kAC2Y0bjEyysrfbO8EZvJBRwIE6WkwmUoB7uvWLwTIhJbMXZ1Dw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", + "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", "dev": true, "optional": true, "requires": { "http-proxy-agent": "^4.0.0", "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.2.0", + "node-fetch": "^2.6.1", "stream-events": "^1.0.5", - "uuid": "^7.0.0" + "uuid": "^8.0.0" } }, "thenify": { @@ -3865,26 +3973,6 @@ "thenify": ">= 3.1.0 < 4" } }, - "through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dev": true, - "optional": true, - "requires": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - }, - "dependencies": { - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "optional": true - } - } - }, "toidentifier": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", @@ -4060,13 +4148,6 @@ "mime-types": "~2.1.24" } }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true, - "optional": true - }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -4198,9 +4279,9 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", - "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, "optional": true }, @@ -4238,13 +4319,6 @@ "xml-name-validator": "^3.0.0" } }, - "walkdir": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.4.1.tgz", - "integrity": "sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==", - "dev": true, - "optional": true - }, "webidl-conversions": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", @@ -4303,54 +4377,12 @@ "isexe": "^2.0.0" } }, - "which-boxed-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz", - "integrity": "sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==", - "dev": true, - "optional": true, - "requires": { - "is-bigint": "^1.0.0", - "is-boolean-object": "^1.0.0", - "is-number-object": "^1.0.3", - "is-string": "^1.0.4", - "is-symbol": "^1.0.2" - } - }, - "which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "dev": true, - "optional": true, - "requires": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - } - }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, - "which-typed-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz", - "integrity": "sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==", - "dev": true, - "optional": true, - "requires": { - "available-typed-arrays": "^1.0.2", - "es-abstract": "^1.17.5", - "foreach": "^2.0.5", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.1", - "is-typed-array": "^1.1.3" - } - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -4683,6 +4715,13 @@ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "optional": true } } } diff --git a/package.json b/package.json index 11a4dfb39..24ebbbcb4 100644 --- a/package.json +++ b/package.json @@ -58,10 +58,11 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", - "firebase-admin": "^8.2.0", + "firebase-admin": "^9.8.0", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", "jsonwebtoken": "^8.5.1", + "jwk-to-pem": "^2.0.5", "mocha": "^6.1.4", "mock-require": "^3.0.3", "mz": "^2.7.0", diff --git a/spec/fixtures/credential/jwk.json b/spec/fixtures/credential/jwk.json new file mode 100644 index 000000000..cde44767e --- /dev/null +++ b/spec/fixtures/credential/jwk.json @@ -0,0 +1,14 @@ +{ + "p": "9cTVRzGXbDfhIMQW9gXtWveDW0u_Hvwnbjx7TRPgSfawZ0MjgKfSbnyHTDXiqM1ifcN_Nk58KJ-PG9eZ7V7_mfTUnPv2puDaecn-kgHobnTJMoBR9hpzyyMpyNJuMvX4kqE7Qh8iFMBK_-p8ICiW15gK5WykswIKfIOkUZc52XM", + "kty": "RSA", + "q": "pYdUNL244sCoc4XrONKlu787AiHrjFFLHdTjoFLbvxSpszXM8iSjoiFAM_MCF-uWks2iBVDw9wlG4MB7MfNf_fD0i1wqyknSOtfMxknU7D4eU_Sp6tI99Jl8f_GAzODK__k_0MpqqXgZmJbUvYuIXMiha-5lddz8ENa4pYpbr7M", + "d": "MpkXqjmjvzwfmlq3o0uZAXjeeAnBlYQSNaSllBWKepgPjg4FxFIt_BlXex1NeP0npNy_oCgaM_x7NiALaaPhwPK52lhYThc-xomCic1KDkyPecODTPXi4Iw94Q_gp442SYMWz2ZktS-2DgXc3599fGHkY80u0rHNSO8ptdk8SUDUIZ82ZQ3pBhClF_uY3c1jZLuqVgCwKksInZmNPnv3ge088wmQC26t0Ph5u1HU6lISgaqZ8ol23iNWJPf4UEi8Twy1a73nphQS-y1yK9UC3c5Knk-WI2TMmjlxqC02ZjKqnRDxElTj9kpodasPRHRV_KJI8rTaStgxd7peMFODzQ", + "e": "AQAB", + "use": "sig", + "kid": "a12KBE", + "qi": "aJCrZVWeOjxYmMBTTI7aJhxcvvfS3I5Q7wwN4Oyb1rJZ4fgGYjDohlzeZz_3fNantPAgcDbzJfa3XS327sHJGaAVqvDugZUgyHeLZGzXGs-_mlL72wzcfvTa1C9_lIndLNZJle5_mg3xJAqRKV0s7kymSdYt0wL5fDaqo5SDNqQ", + "dp": "haBk2hWzoApt5HPZjCDC4g_rosr3enBdPAm0fL8O1whC95JAjmYw-xPIOH6f42nwYDLYSv23chr3I4tBTRe2382HgGdav3dIMqnKOTbCWrQy5LtyVN4jEVLoGCGZ-ylT4t25K4Vj8WZwIN8saAvJoCUx33YHwrCcZQDqadZQhNM", + "alg": "RS256", + "dq": "j6NdeN7hnzMbehPNyGNSmhcZd4JDymGI03w3gpokQi4GDJM1IzKUJE7CTdIkEOnIod97Jy3TzCrqrIGa5f-RXuVG79-s6hkhKxq0gaTz9YT6AFShVjnWtXizRrskz6SJw5JgxCfCYwjq_TR1q313eTxIh0Y6GQsIWPxbApuLcG0", + "n": "nunJGpOcPvVsP3q-NLgf3H6OycPhnXUxywMR2_H_JJP7BUIDSsYcOGBTFe7OphHYfyb1Gs14yAER243swndpNbQkuDJhj9a9kK6dJZmPGmvCySk_E5URj6MimZg1MBbwhsVAbRp2uerESZuoRrfdTdV87E3pGyg6Irl0IXRjy5w9SsFjjIi7E-Qxpf3TcNNjfVRLj9V2bSzmS7hlsPKBhDon0tWecuNKoNNMiGI46mz_MSUa2y1lPV6Cqhf1su_TRd7N7u9eP7xWArr7wqtqHiFTZ3qp1xoA_dr_xv_Ao2kBtohZiAFLV-PQShprSN5fafztRZFkSEF0m2tUkvmoaQ" +} diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index fff2ce1a9..8766ab06a 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -1,7 +1,9 @@ import * as jwt from 'jsonwebtoken'; +import * as jwkToPem from 'jwk-to-pem'; import * as _ from 'lodash'; import * as nock from 'nock'; -import * as mocks from '../fixtures/credential/key.json'; +import * as mockKey from '../fixtures/credential/key.json'; +import * as mockJWK from '../fixtures/credential/jwk.json'; // MockRequest mocks an https.Request. export class MockRequest { @@ -26,6 +28,7 @@ export function mockRequest( context: { authorization?: string; instanceIdToken?: string; + appCheckToken?: string; } = {} ) { const body: any = {}; @@ -37,6 +40,7 @@ export function mockRequest( 'content-type': contentType, authorization: context.authorization, 'firebase-instance-id-token': context.instanceIdToken, + 'x-firebase-appcheck': context.appCheckToken, origin: 'example.com', }; @@ -53,7 +57,7 @@ export const expectedResponseHeaders = { * verifying an id token. */ export function mockFetchPublicKeys(): nock.Scope { - const mockedResponse = { [mocks.key_id]: mocks.public_key }; + const mockedResponse = { [mockKey.key_id]: mockKey.public_key }; const headers = { 'cache-control': 'public, max-age=1, must-revalidate, no-transform', }; @@ -72,11 +76,48 @@ export function generateIdToken(projectId: string): string { audience: projectId, expiresIn: 60 * 60, // 1 hour in seconds issuer: 'https://securetoken.google.com/' + projectId, - subject: mocks.user_id, + subject: mockKey.user_id, algorithm: 'RS256', header: { - kid: mocks.key_id, + kid: mockKey.key_id, }, }; - return jwt.sign(claims, mocks.private_key, options); + return jwt.sign(claims, mockKey.private_key, options); +} + +/** + * Mocks out the http request used by the firebase-admin SDK to get the jwks for + * verifying an AppCheck token. + */ +export function mockFetchAppCheckPublicJwks(): nock.Scope { + const { kty, use, alg, kid, n, e } = mockJWK; + const mockedResponse = { + keys: [{ kty, use, alg, kid, n, e }], + }; + + return nock('https://firebaseappcheck.googleapis.com:443') + .get('/v1beta/jwks') + .reply(200, mockedResponse); +} + +/** + * Generates a mocked AppCheck token. + */ +export function generateAppCheckToken( + projectId: string, + appId: string +): string { + const claims = {}; + const options: jwt.SignOptions = { + audience: [`projects/${projectId}`], + expiresIn: 60 * 60, // 1 hour in seconds + issuer: `https://firebaseappcheck.googleapis.com/${projectId}`, + subject: appId, + header: { + alg: 'RS256', + typ: 'JWT', + kid: mockJWK.kid, + }, + }; + return jwt.sign(claims, jwkToPem(mockJWK, { private: true }), options); } diff --git a/spec/providers/https.spec.ts b/spec/providers/https.spec.ts index f858d5923..128ea0058 100644 --- a/spec/providers/https.spec.ts +++ b/spec/providers/https.spec.ts @@ -30,7 +30,9 @@ import * as https from '../../src/providers/https'; import * as mocks from '../fixtures/credential/key.json'; import { expectedResponseHeaders, + generateAppCheckToken, generateIdToken, + mockFetchAppCheckPublicJwks, mockFetchPublicKeys, MockRequest, mockRequest, @@ -414,6 +416,58 @@ describe('callable.FunctionBuilder', () => { }); }); + it('should handle AppCheck token', async () => { + const mock = mockFetchAppCheckPublicJwks(); + const projectId = appsNamespace().admin.options.projectId; + const appId = '1:65211879909:web:3ae38ef1cdcb2e01fe5f0c'; + const appCheckToken = generateAppCheckToken(projectId, appId); + await runTest({ + httpRequest: mockRequest(null, 'application/json', { appCheckToken }), + expectedData: null, + callableFunction: (data, context) => { + expect(context.app).to.not.be.undefined; + expect(context.app).to.not.be.null; + expect(context.app.appId).to.equal(appId); + expect(context.app.token.app_id).to.be.equal(appId); + expect(context.app.token.sub).to.be.equal(appId); + expect(context.app.token.aud).to.be.deep.equal([ + `projects/${projectId}`, + ]); + expect(context.auth).to.be.undefined; + expect(context.instanceIdToken).to.be.undefined; + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + mock.done(); + }); + + it('should reject bad AppCheck token', async () => { + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + appCheckToken: 'FAKE', + }), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 401, + headers: expectedResponseHeaders, + body: { + error: { + status: 'UNAUTHENTICATED', + message: 'Unauthenticated', + }, + }, + }, + }); + }); + it('should handle instance id', async () => { await runTest({ httpRequest: mockRequest(null, 'application/json', { diff --git a/src/providers/https.ts b/src/providers/https.ts index cf64c9d90..99f465215 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -28,7 +28,7 @@ import * as _ from 'lodash'; import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; -import { warn, error } from '../logger'; +import { error, info, warn } from '../logger'; /** @hidden */ export interface Request extends express.Request { @@ -248,6 +248,14 @@ export class HttpsError extends Error { * The interface for metadata for the API as passed to the handler. */ export interface CallableContext { + /** + * The result of decoding and verifying a Firebase AppCheck token. + */ + app?: { + appId: string; + token: firebase.appCheck.DecodedAppCheckToken; + }; + /** * The result of decoding and verifying a Firebase Auth ID token. */ @@ -411,6 +419,108 @@ export function decode(data: any): any { return data; } +/** + * Be careful when changing token status values. + * + * Users are encouraged to setup log-based metric based on these values, and + * changing their values may cause their metrics to break. + * + */ +/** @hidden */ +type TokenStatus = 'MISSING' | 'VALID' | 'INVALID'; + +/** @hidden */ +interface CallableTokenStatus { + app: TokenStatus; + auth: TokenStatus; +} + +/** + * Check and verify tokens included in the requests. Once verified, tokens + * are injected into the callable context. + * + * @param {Request} req - Request sent to the Callable function. + * @param {CallableContext} ctx - Context to be sent to callable function handler. + * @return {CallableTokenStatus} Status of the token verifications. + */ +/** @hidden */ +async function checkTokens( + req: Request, + ctx: CallableContext +): Promise { + const verifications: CallableTokenStatus = { + app: 'MISSING', + auth: 'MISSING', + }; + + const appCheck = req.header('X-Firebase-AppCheck'); + if (appCheck) { + verifications.app = 'INVALID'; + try { + if (!apps().admin.appCheck) { + throw new Error( + 'Cannot validate AppCheck token. Please uupdate Firebase Admin SDK to >= v9.8.0' + ); + } + const appCheckToken = await apps() + .admin.appCheck() + .verifyToken(appCheck); + ctx.app = { + appId: appCheckToken.appId, + token: appCheckToken.token, + }; + verifications.app = 'VALID'; + } catch (err) { + warn('Failed to validate AppCheck token.', err); + } + } + + const authorization = req.header('Authorization'); + if (authorization) { + verifications.auth = 'INVALID'; + const match = authorization.match(/^Bearer (.*)$/); + if (match) { + const idToken = match[1]; + try { + const authToken = await apps() + .admin.auth() + .verifyIdToken(idToken); + + verifications.auth = 'VALID'; + ctx.auth = { + uid: authToken.uid, + token: authToken, + }; + } catch (err) { + warn('Failed to validate auth token.', err); + } + } + } + + const logPayload = { + verifications, + 'logging.googleapis.com/labels': { + 'firebase-log-type': 'callable-request-verification', + }, + }; + + const errs = []; + if (verifications.app === 'INVALID') { + errs.push('AppCheck token was rejected.'); + } + if (verifications.auth === 'INVALID') { + errs.push('Auth token was rejected.'); + } + + if (errs.length == 0) { + info('Callable request verification passed', logPayload); + } else { + warn(`Callable request verification failed: ${errs.join(' ')}`, logPayload); + } + + return verifications; +} + /** @hidden */ const corsHandler = cors({ origin: true, methods: 'POST' }); @@ -427,25 +537,9 @@ export function _onCallWithOptions( } const context: CallableContext = { rawRequest: req }; - - const authorization = req.header('Authorization'); - if (authorization) { - const match = authorization.match(/^Bearer (.*)$/); - if (!match) { - throw new HttpsError('unauthenticated', 'Unauthenticated'); - } - const idToken = match[1]; - try { - const authToken = await apps() - .admin.auth() - .verifyIdToken(idToken); - context.auth = { - uid: authToken.uid, - token: authToken, - }; - } catch (err) { - throw new HttpsError('unauthenticated', 'Unauthenticated'); - } + const tokenStatus = await checkTokens(req, context); + if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { + throw new HttpsError('unauthenticated', 'Unauthenticated'); } const instanceId = req.header('Firebase-Instance-ID-Token'); diff --git a/tsconfig.release.json b/tsconfig.release.json index a226eb290..1a45bd58b 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -1,13 +1,13 @@ { "compilerOptions": { "declaration": true, - "lib": ["es2017"], + "lib": ["es2018"], "module": "commonjs", "noImplicitAny": false, "noUnusedLocals": true, "outDir": "lib", "stripInternal": true, - "target": "es2017", + "target": "es2018", "typeRoots": ["./node_modules/@types"] }, "files": ["./src/index.ts", "./src/logger.ts", "./src/logger/compat.ts"] From 4ed7b7615302404bb0205c68ee49b1134aae5449 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 12 May 2021 13:03:08 -0700 Subject: [PATCH 300/705] Update release script to build packages using Node 14 (#889) * Update node version in package-builder imaage. * Update publish script to ignore local changes while updating package version. --- scripts/publish-container/Dockerfile | 2 +- scripts/publish.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/publish-container/Dockerfile b/scripts/publish-container/Dockerfile index c8ba24c12..02b15bf11 100644 --- a/scripts/publish-container/Dockerfile +++ b/scripts/publish-container/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8 +FROM node:14 # Install dependencies RUN apt-get update && \ diff --git a/scripts/publish.sh b/scripts/publish.sh index a1498460e..d187e9f45 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -87,7 +87,7 @@ npm run build:release echo "Ran publish build." echo "Making a $VERSION version..." -npm version $VERSION +npm version --no-git-tag-version $VERSION NEW_VERSION=$(jq -r ".version" package.json) echo "Made a $VERSION version." From f74adaa86a8a4ccd43ca6e0e4f59e7c1bbb19b8f Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 12 May 2021 20:09:26 +0000 Subject: [PATCH 301/705] [firebase-release] Removed change log and reset repo after 3.14.0 release --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ee96fbef..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +0,0 @@ -- Functions may now be deployed with 8GB RAM -- Functions may now be deployed to europe-central2 (Warsaw) -- Add support for validating AppCheck tokens for Callable Functions From 8e4a446ad0872297b873cfcd21f6847a9182b359 Mon Sep 17 00:00:00 2001 From: "Masayuki Ono (mono)" Date: Fri, 14 May 2021 04:29:10 +0900 Subject: [PATCH 302/705] Fix typo (#890) --- src/providers/https.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/https.ts b/src/providers/https.ts index 99f465215..2af2117f3 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -459,7 +459,7 @@ async function checkTokens( try { if (!apps().admin.appCheck) { throw new Error( - 'Cannot validate AppCheck token. Please uupdate Firebase Admin SDK to >= v9.8.0' + 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' ); } const appCheckToken = await apps() From e94f1c029f837bfb0738fd477fd8b6a0c78245d4 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 17 May 2021 10:54:13 -0700 Subject: [PATCH 303/705] Inline DecodedAppCheck definition (#891) Fixes an issue where old (but supported) versions of firebase-admin didn't expose AppCheck and then TSC failed. --- integration_test/functions/src/index.ts | 2 +- .../functions/src/testLab-tests.ts | 2 +- .../functions/src/testLab-utils.ts | 12 ++-- integration_test/functions/src/testing.ts | 2 +- spec/fixtures/mockrequest.ts | 2 +- spec/logger.spec.ts | 8 +-- spec/providers/testLab.spec.ts | 40 +++++++------- src/cloud-functions.ts | 2 +- src/function-builder.ts | 2 +- src/function-configuration.ts | 7 +++ src/index.ts | 2 +- src/logger.ts | 2 +- src/logger/compat.ts | 4 +- src/providers/database.ts | 2 +- src/providers/https.ts | 55 ++++++++++++++++++- 15 files changed, 102 insertions(+), 42 deletions(-) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 0a980aa06..6865d7dd5 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,9 +1,9 @@ +import { PubSub } from '@google-cloud/pubsub'; import { Request, Response } from 'express'; import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; import * as https from 'https'; -import { PubSub } from '@google-cloud/pubsub'; export * from './pubsub-tests'; export * from './database-tests'; diff --git a/integration_test/functions/src/testLab-tests.ts b/integration_test/functions/src/testLab-tests.ts index 586c3a0cb..8e064928a 100644 --- a/integration_test/functions/src/testLab-tests.ts +++ b/integration_test/functions/src/testLab-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { TestSuite, expectEq } from './testing'; +import { expectEq, TestSuite } from './testing'; import TestMatrix = functions.testLab.TestMatrix; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; diff --git a/integration_test/functions/src/testLab-utils.ts b/integration_test/functions/src/testLab-utils.ts index 6f86b0a1f..3dbb7b763 100644 --- a/integration_test/functions/src/testLab-utils.ts +++ b/integration_test/functions/src/testLab-utils.ts @@ -1,6 +1,6 @@ +import * as admin from 'firebase-admin'; import * as http from 'http'; import * as https from 'https'; -import * as admin from 'firebase-admin'; import * as utils from './test-utils'; interface AndroidDevice { @@ -50,12 +50,12 @@ async function fetchDefaultDevice( const model = defaultModels[0]; const versions = model.supportedVersionIds; - return { + return { androidModelId: model.id, androidVersionId: versions[versions.length - 1], locale: 'en', orientation: 'portrait', - }; + } as AndroidDevice; } function createTestMatrix( @@ -70,7 +70,7 @@ function createTestMatrix( '/v1/projects/' + projectId + '/testMatrices' ); const body = { - projectId: projectId, + projectId, testSpecification: { androidRoboTest: { appApk: { @@ -105,9 +105,9 @@ function requestOptions( path: string ): https.RequestOptions { return { - method: method, + method, hostname: TESTING_API_SERVICE_NAME, - path: path, + path, headers: { Authorization: 'Bearer ' + accessToken.access_token, 'Content-Type': 'application/json', diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 228203d31..1cb9f7819 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -92,7 +92,7 @@ function deepEq(left: any, right: any) { return false; } - for (let key in left) { + for (const key in left) { if (!right.hasOwnProperty(key)) { return false; } diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index 8766ab06a..68827610b 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -2,8 +2,8 @@ import * as jwt from 'jsonwebtoken'; import * as jwkToPem from 'jwk-to-pem'; import * as _ from 'lodash'; import * as nock from 'nock'; -import * as mockKey from '../fixtures/credential/key.json'; import * as mockJWK from '../fixtures/credential/jwk.json'; +import * as mockKey from '../fixtures/credential/key.json'; // MockRequest mocks an https.Request. export class MockRequest { diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts index 48258ffac..e32765d10 100644 --- a/spec/logger.spec.ts +++ b/spec/logger.spec.ts @@ -7,8 +7,8 @@ const SUPPORTS_STRUCTURED_LOGS = describe(`logger (${ SUPPORTS_STRUCTURED_LOGS ? 'structured' : 'unstructured' })`, () => { - let stdoutWrite = process.stdout.write.bind(process.stdout); - let stderrWrite = process.stderr.write.bind(process.stderr); + const stdoutWrite = process.stdout.write.bind(process.stdout); + const stderrWrite = process.stderr.write.bind(process.stderr); let lastOut: string; let lastErr: string; @@ -127,7 +127,7 @@ describe(`logger (${ for (const severity of ['DEBUG', 'INFO', 'NOTICE']) { it(`should output ${severity} severity to stdout`, () => { - let entry: logger.LogEntry = { + const entry: logger.LogEntry = { severity: severity as logger.LogSeverity, message: 'test', }; @@ -144,7 +144,7 @@ describe(`logger (${ 'EMERGENCY', ]) { it(`should output ${severity} severity to stderr`, () => { - let entry: logger.LogEntry = { + const entry: logger.LogEntry = { severity: severity as logger.LogSeverity, message: 'test', }; diff --git a/spec/providers/testLab.spec.ts b/spec/providers/testLab.spec.ts index bf74a6fd1..8a70cf680 100644 --- a/spec/providers/testLab.spec.ts +++ b/spec/providers/testLab.spec.ts @@ -66,23 +66,23 @@ describe('Test Lab Functions', () => { resource: {}, }, }; - const expected = { + const expected = { testMatrixId: 'matrix-375mfeu9mnw8t', state: 'INVALID', createTime: '2019-04-15T17:43:32.538Z', outcomeSummary: undefined, invalidMatrixDetails: 'INVALID_INPUT_APK', - resultStorage: { + resultStorage: { gcsPath: 'gs://test.appspot.com', resultsUrl: undefined, toolResultsHistoryId: undefined, toolResultsExecutionId: undefined, - }, - clientInfo: { + } as testLab.ResultStorage, + clientInfo: { name: 'test', details: {}, - }, - }; + } as testLab.ClientInfo, + } as testLab.TestMatrix; const func = testLab.testMatrix().onComplete((matrix) => matrix); return expect(func(event.data, event.context)).to.eventually.deep.equal( expected @@ -119,23 +119,23 @@ describe('Test Lab Functions', () => { resource: {}, }, }; - const expected = { + const expected = { testMatrixId: 'matrix-tsgjk8pnvxhya', state: 'FINISHED', createTime: '2019-04-15T18:03:11.115Z', outcomeSummary: 'FAILURE', invalidMatrixDetails: undefined, - resultStorage: { + resultStorage: { gcsPath: 'gs://test.appspot.com', toolResultsHistoryId: 'bh.9b6f4dac24d3049', toolResultsExecutionId: '6352915701487950333', resultsUrl: 'https://path/to/results', - }, - clientInfo: { + } as testLab.ResultStorage, + clientInfo: { name: 'test', details: {}, - }, - }; + } as testLab.ClientInfo, + } as testLab.TestMatrix; const func = testLab.testMatrix().onComplete((matrix) => matrix); return expect(func(event.data, event.context)).to.eventually.deep.equal( expected @@ -161,7 +161,7 @@ describe('Test Lab Functions', () => { describe('TestMatrix', () => { describe('constructor', () => { it('should populate basic fields', () => { - const expected = { + const expected = { testMatrixId: 'id1', createTime: '2019-02-08T18:50:32.178Z', state: 'FINISHED', @@ -169,7 +169,7 @@ describe('Test Lab Functions', () => { invalidMatrixDetails: 'DETAILS_UNAVAILABLE', resultStorage: new testLab.ResultStorage(), clientInfo: new testLab.ClientInfo(), - }; + } as testLab.TestMatrix; const actual = new testLab.TestMatrix({ testMatrixId: 'id1', timestamp: '2019-02-08T18:50:32.178Z', @@ -185,10 +185,10 @@ describe('Test Lab Functions', () => { describe('ClientInfo', () => { describe('constructor', () => { it('should populate basic fields', () => { - const expected = { + const expected = { name: 'client', details: {}, - }; + } as testLab.ClientInfo; const actual = new testLab.ClientInfo({ name: 'client', }); @@ -196,13 +196,13 @@ describe('Test Lab Functions', () => { }); it('should populate key/value details', () => { - const expected = { + const expected = { name: 'client', details: { k0: 'v0', k1: '', }, - }; + } as testLab.ClientInfo; const actual = new testLab.ClientInfo({ name: 'client', clientInfoDetails: [ @@ -223,12 +223,12 @@ describe('Test Lab Functions', () => { describe('ResultStorage', () => { describe('constructor', () => { it('should populate basic fields', () => { - const expected = { + const expected = { gcsPath: 'path', toolResultsHistoryId: 'h1', toolResultsExecutionId: 'e2', resultsUrl: 'http://example.com/', - }; + } as testLab.ResultStorage; const actual = new testLab.ResultStorage({ googleCloudStorage: { gcsPath: 'path', diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 500e27144..93377c822 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -22,13 +22,13 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; -import { warn } from './logger'; import { DEFAULT_FAILURE_POLICY, DeploymentOptions, FailurePolicy, Schedule, } from './function-configuration'; +import { warn } from './logger'; export { Request, Response }; /** @hidden */ diff --git a/src/function-builder.ts b/src/function-builder.ts index 9d016d817..f08b16117 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -26,12 +26,12 @@ import * as _ from 'lodash'; import { CloudFunction, EventContext } from './cloud-functions'; import { DeploymentOptions, + INGRESS_SETTINGS_OPTIONS, MAX_TIMEOUT_SECONDS, RuntimeOptions, SUPPORTED_REGIONS, VALID_MEMORY_OPTIONS, VPC_EGRESS_SETTINGS_OPTIONS, - INGRESS_SETTINGS_OPTIONS, } from './function-configuration'; import * as analytics from './providers/analytics'; import * as auth from './providers/auth'; diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 2d9925ac5..852482241 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -116,6 +116,13 @@ export interface RuntimeOptions { */ minInstances?: number; + /** + * Which version of the internal contract between the CLI and the SDK are + * we using? For internal testing only. + * @hidden + */ + apiVersion?: 1 | 2; + /** * Max number of actual instances allowed to be running in parallel */ diff --git a/src/index.ts b/src/index.ts index 9d49414e8..dbb42003c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,8 +32,8 @@ import * as storage from './providers/storage'; import * as testLab from './providers/testLab'; import * as apps from './apps'; -import * as logger from './logger'; import { handler } from './handler-builder'; +import * as logger from './logger'; import { setup } from './setup'; const app = apps.apps(); diff --git a/src/logger.ts b/src/logger.ts index d6c0d2220..1dd109179 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1,8 +1,8 @@ import { format } from 'util'; import { - SUPPORTS_STRUCTURED_LOGS, CONSOLE_SEVERITY, + SUPPORTS_STRUCTURED_LOGS, UNPATCHED_CONSOLE, } from './logger/common'; diff --git a/src/logger/compat.ts b/src/logger/compat.ts index a7c27bd16..4239221f0 100644 --- a/src/logger/compat.ts +++ b/src/logger/compat.ts @@ -1,9 +1,9 @@ +import { format } from 'util'; import { + CONSOLE_SEVERITY, SUPPORTS_STRUCTURED_LOGS, UNPATCHED_CONSOLE, - CONSOLE_SEVERITY, } from './common'; -import { format } from 'util'; /** @hidden */ function patchedConsole(severity: string): (data: any, ...args: any[]) => void { diff --git a/src/providers/database.ts b/src/providers/database.ts index 0e4393d05..76252d515 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -140,7 +140,7 @@ export function _refWithOptions( ); } - let instance = undefined; + let instance; const prodMatch = databaseURL.match(databaseURLRegex); if (prodMatch) { instance = prodMatch[1]; diff --git a/src/providers/https.ts b/src/providers/https.ts index 2af2117f3..c6167c50a 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -253,7 +253,60 @@ export interface CallableContext { */ app?: { appId: string; - token: firebase.appCheck.DecodedAppCheckToken; + + // This is actually a firebase.appCheck.DecodedAppCheckToken, but + // that type may not be available in some supported SDK versions. + // Declare as an inline type, which DecodedAppCheckToken will be + // able to merge with. + // TODO: Replace with the real type once we bump the min-version of + // the admin SDK + token: { + /** + * The issuer identifier for the issuer of the response. + * + * This value is a URL with the format + * `https://firebaseappcheck.googleapis.com/`, where `` is the + * same project number specified in the [`aud`](#aud) property. + */ + iss: string; + + /** + * The Firebase App ID corresponding to the app the token belonged to. + * + * As a convenience, this value is copied over to the [`app_id`](#app_id) property. + */ + sub: string; + + /** + * The audience for which this token is intended. + * + * This value is a JSON array of two strings, the first is the project number of your + * Firebase project, and the second is the project ID of the same project. + */ + aud: string[]; + + /** + * The App Check token's expiration time, in seconds since the Unix epoch. That is, the + * time at which this App Check token expires and should no longer be considered valid. + */ + exp: number; + + /** + * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the + * time at which this App Check token was issued and should start to be considered + * valid. + */ + iat: number; + + /** + * The App ID corresponding to the App the App Check token belonged to. + * + * This value is not actually one of the JWT token claims. It is added as a + * convenience, and is set as the value of the [`sub`](#sub) property. + */ + app_id: string; + [key: string]: any; + }; }; /** From ba2cd3be03041828d3e0b83e8a8f45d38302ee02 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 17 May 2021 13:08:02 -0700 Subject: [PATCH 304/705] Add relnotes (#892) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..f5d3834e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin From 2b3b15d5be1f17a166175e4f5d5cc5ffc7a7040a Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 17 May 2021 20:35:15 +0000 Subject: [PATCH 305/705] [firebase-release] Removed change log and reset repo after 3.13.3 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5d3834e9..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin From 4053ee19e33add8418f5483caf8ea62b64b2253f Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 17 May 2021 14:04:34 -0700 Subject: [PATCH 306/705] Prep release 3.14.1 (#893) --- package.json | 2 +- scripts/publish/CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 scripts/publish/CHANGELOG.md diff --git a/package.json b/package.json index 24ebbbcb4..fa00d759d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.2", + "version": "3.14.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", diff --git a/scripts/publish/CHANGELOG.md b/scripts/publish/CHANGELOG.md new file mode 100644 index 000000000..510e7e4e0 --- /dev/null +++ b/scripts/publish/CHANGELOG.md @@ -0,0 +1,2 @@ +- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin +- Replaces 3.13.3 which was an inappropriately numbered version From 242f4215668f2deb1931a74f006d9d8ef9f24330 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 17 May 2021 14:10:51 -0700 Subject: [PATCH 307/705] Fix changelog being in the wrong location (#894) --- CHANGELOG.md | 2 ++ scripts/publish/CHANGELOG.md | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 scripts/publish/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..510e7e4e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin +- Replaces 3.13.3 which was an inappropriately numbered version diff --git a/scripts/publish/CHANGELOG.md b/scripts/publish/CHANGELOG.md deleted file mode 100644 index 510e7e4e0..000000000 --- a/scripts/publish/CHANGELOG.md +++ /dev/null @@ -1,2 +0,0 @@ -- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin -- Replaces 3.13.3 which was an inappropriately numbered version From 1c2cc9c367ed1a979ae0039bebb8be37f0a79f37 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 17 May 2021 21:12:48 +0000 Subject: [PATCH 308/705] [firebase-release] Removed change log and reset repo after 3.14.1 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 510e7e4e0..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Fixes a bug where typescript would fail to compile with old (but supported) versions of firebase-admin -- Replaces 3.13.3 which was an inappropriately numbered version From f369a2c35e65f2e484a1f6c770f4dfa1dbe1baae Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 20 May 2021 09:50:50 -0700 Subject: [PATCH 309/705] Update package.json to the latest release (#895) * Update package.json to the latest release * Bump version in package-lock.json --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a4fd6be8..e199a60c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.13.2", + "version": "3.14.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fa00d759d..a9c86bf87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.14.0", + "version": "3.14.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From f7bcdabc1a1d67c962072fc8cd229372a1349ffc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 08:51:16 -0700 Subject: [PATCH 310/705] Bump y18n from 4.0.0 to 4.0.3 (#888) Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index e199a60c2..41abc0d4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -347,13 +347,6 @@ "strip-ansi": "^6.0.0" } }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "optional": true - }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", @@ -2946,6 +2939,12 @@ "has-flag": "^3.0.0" } }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, "yargs": { "version": "13.3.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", @@ -4482,10 +4481,11 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "optional": true }, "yallist": { "version": "2.1.2", @@ -4631,6 +4631,12 @@ "strip-ansi": "^6.0.0" } }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, "yargs-parser": { "version": "18.1.3", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", @@ -4690,6 +4696,12 @@ "ansi-regex": "^4.1.0" } }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, "yargs": { "version": "13.3.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", From 7e26ae36a8fb6f44b86279826068d63f366e568f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 08:53:54 -0700 Subject: [PATCH 311/705] Bump lodash from 4.17.20 to 4.17.21 (#887) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: joehan --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41abc0d4b..16606db37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2575,9 +2575,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.camelcase": { "version": "4.3.0", From 02a97a19b81a2e40f25f23907b6ae3f585820978 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 27 May 2021 15:41:30 -0700 Subject: [PATCH 312/705] Fix publish script to commit changes to version info in package{-lock}.json. (#896) * Fix publish script to commit changes to version info in package.json and package-lock.json. * Add debug message to make it clear what's going on. Co-authored-by: Thomas Bouldin --- scripts/publish.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/publish.sh b/scripts/publish.sh index d187e9f45..9246562ae 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -87,7 +87,11 @@ npm run build:release echo "Ran publish build." echo "Making a $VERSION version..." -npm version --no-git-tag-version $VERSION +# TODO: Remove the following command. +# npm version command had previously failed claiming unclean git repo, and we don't know why. +echo "DEBUG: Running git status to show dirty files..." +git status +npm version $VERSION NEW_VERSION=$(jq -r ".version" package.json) echo "Made a $VERSION version." From 2e718c74a382655a9756c0ff781278c0e8a9146b Mon Sep 17 00:00:00 2001 From: joehan Date: Thu, 27 May 2021 15:51:45 -0700 Subject: [PATCH 313/705] Adds support for setting user labels on functions (#899) * Adds support for runWith labels * Adds CHANGELOG entry and extra test cases * Minor style fixes * pr fixes * minor typo fix --- CHANGELOG.md | 1 + spec/function-builder.spec.ts | 120 ++++++++++++++++++++++++++++++++++ src/cloud-functions.ts | 6 +- src/function-builder.ts | 72 ++++++++++++++++++++ src/function-configuration.ts | 17 +++-- 5 files changed, 210 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..5283950c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adds support for setting user labels on functions via `runWith()`. diff --git a/spec/function-builder.spec.ts b/spec/function-builder.spec.ts index 28cf35c3a..106f874ea 100644 --- a/spec/function-builder.spec.ts +++ b/spec/function-builder.spec.ts @@ -319,4 +319,124 @@ describe('FunctionBuilder', () => { expect(fn.__trigger.availableMemoryMb).to.deep.equal(4096); }); + + it('should allow labels to be set', () => { + const fn = functions + .runWith({ + labels: { + 'valid-key': 'valid-value', + }, + }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.labels).to.deep.equal({ + 'valid-key': 'valid-value', + }); + }); + + it('should throw an error if more than 58 labels are set', () => { + const labels = {}; + for (let i = 0; i < 59; i++) { + labels[`label${i}`] = 'value'; + } + + expect(() => + functions.runWith({ + labels, + }) + ).to.throw(); + }); + + it('should throw an error if labels has a key that is too long', () => { + expect(() => + functions.runWith({ + labels: { + 'a-very-long-key-that-is-more-than-the-maximum-allowed-length-for-keys': + 'value', + }, + }) + ).to.throw(); + }); + + it('should throw an error if labels has key that is too short', () => { + expect(() => + functions.runWith({ + labels: { '': 'value' }, + }) + ).to.throw(); + }); + + it('should throw an error if labels has a value that is too long', () => { + expect(() => + functions.runWith({ + labels: { + key: + 'a-very-long-value-that-is-more-than-the-maximum-allowed-length-for-values', + }, + }) + ).to.throw(); + }); + + it('should throw an error if labels has a key that contains invalid characters', () => { + expect(() => + functions.runWith({ + labels: { + Key: 'value', + }, + }) + ).to.throw(); + + expect(() => + functions.runWith({ + labels: { + 'key ': 'value', + }, + }) + ).to.throw(); + + expect(() => + functions.runWith({ + labels: { + '1key': 'value', + }, + }) + ).to.throw(); + }); + + it('should throw an error if labels has a value that contains invalid characters', () => { + expect(() => + functions.runWith({ + labels: { + key: 'Value', + }, + }) + ).to.throw(); + + expect(() => + functions.runWith({ + labels: { + 'key ': 'va lue', + }, + }) + ).to.throw(); + }); + + it('should throw an error if a label key starts with a reserved namespace', () => { + expect(() => + functions.runWith({ + labels: { + 'firebase-foo': 'value', + }, + }) + ).to.throw(); + + expect(() => + functions.runWith({ + labels: { + 'deployment-bar': 'value', + }, + }) + ).to.throw(); + }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 93377c822..2a6c770e6 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -417,7 +417,7 @@ export function makeCloudFunction({ }, }); if (!_.isEmpty(labels)) { - trigger.labels = labels; + trigger.labels = { ...trigger.labels, ...labels }; } return trigger; }, @@ -553,5 +553,9 @@ export function optionsToTrigger(options: DeploymentOptions) { } } + if (options.labels) { + trigger.labels = options.labels; + } + return trigger; } diff --git a/src/function-builder.ts b/src/function-builder.ts index f08b16117..b421668d4 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -27,6 +27,7 @@ import { CloudFunction, EventContext } from './cloud-functions'; import { DeploymentOptions, INGRESS_SETTINGS_OPTIONS, + MAX_NUMBER_USER_LABELS, MAX_TIMEOUT_SECONDS, RuntimeOptions, SUPPORTED_REGIONS, @@ -120,6 +121,77 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { `serviceAccount must be set to 'default', a service account email, or '{serviceAccountName}@'` ); } + + if (runtimeOptions.labels) { + // Labels must follow the rules listed in + // https://cloud.google.com/resource-manager/docs/creating-managing-labels#requirements + + if (Object.keys(runtimeOptions.labels).length > MAX_NUMBER_USER_LABELS) { + throw new Error( + `A function must not have more than ${MAX_NUMBER_USER_LABELS} user-defined labels.` + ); + } + + // We reserve the 'deployment' and 'firebase' namespaces for future feature development. + const reservedKeys = Object.keys(runtimeOptions.labels).filter( + (key) => key.startsWith('deployment') || key.startsWith('firebase') + ); + if (reservedKeys.length) { + throw new Error( + `Invalid labels: ${reservedKeys.join( + ', ' + )}. Labels may not start with reserved names 'deployment' or 'firebase'` + ); + } + + const invalidLengthKeys = Object.keys(runtimeOptions.labels).filter( + (key) => key.length < 1 || key.length > 63 + ); + if (invalidLengthKeys.length > 0) { + throw new Error( + `Invalid labels: ${invalidLengthKeys.join( + ', ' + )}. Label keys must be between 1 and 63 characters in length.` + ); + } + + const invalidLengthValues = Object.values(runtimeOptions.labels).filter( + (value) => value.length > 63 + ); + if (invalidLengthValues.length > 0) { + throw new Error( + `Invalid labels: ${invalidLengthValues.join( + ', ' + )}. Label values must be less than 64 charcters.` + ); + } + + // Keys can contain lowercase letters, foreign characters, numbers, _ or -. They must start with a letter. + const validKeyPattern = /^[\p{Ll}\p{Lo}][\p{Ll}\p{Lo}\p{N}_-]{0,62}$/u; + const invalidKeys = Object.keys(runtimeOptions.labels).filter( + (key) => !validKeyPattern.test(key) + ); + if (invalidKeys.length > 0) { + throw new Error( + `Invalid labels: ${invalidKeys.join( + ', ' + )}. Label keys can only contain lowercase letters, international characters, numbers, _ or -, and must start with a letter.` + ); + } + + // Values can contain lowercase letters, foreign characters, numbers, _ or -. + const validValuePattern = /^[\p{Ll}\p{Lo}\p{N}_-]{0,63}$/u; + const invalidValues = Object.values(runtimeOptions.labels).filter( + (value) => !validValuePattern.test(value) + ); + if (invalidValues.length > 0) { + throw new Error( + `Invalid labels: ${invalidValues.join( + ', ' + )}. Label values can only contain lowercase letters, international characters, numbers, _ or -.` + ); + } + } return true; } diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 852482241..6faa7aa42 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -94,6 +94,8 @@ export const DEFAULT_FAILURE_POLICY: FailurePolicy = { retry: {}, }; +export const MAX_NUMBER_USER_LABELS = 58; + export interface RuntimeOptions { /** * Failure policy of the function, with boolean `true` being equivalent to @@ -124,29 +126,34 @@ export interface RuntimeOptions { apiVersion?: 1 | 2; /** - * Max number of actual instances allowed to be running in parallel + * Max number of actual instances allowed to be running in parallel. */ maxInstances?: number; /** - * Connect cloud function to specified VPC connector + * Connect cloud function to specified VPC connector. */ vpcConnector?: string; /** - * Egress settings for VPC connector + * Egress settings for VPC connector. */ vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number]; /** - * Specific service account for the function to run as + * Specific service account for the function to run as. */ serviceAccount?: 'default' | string; /** - * Ingress settings + * Ingress settings which control where this function can be called from. */ ingressSettings?: typeof INGRESS_SETTINGS_OPTIONS[number]; + + /** + * User labels to set on the function. + */ + labels?: Record; } export interface DeploymentOptions extends RuntimeOptions { From 88589371f69ec98723d0e0d8bcb58c6ef23a11e5 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 24 Jun 2021 13:26:13 -0700 Subject: [PATCH 314/705] Support documented case where FIREBASE_CONFIG is a json file. (#905) Support documented case where FIREBASE_CONFIG is a json file. Per https://firebase.google.com/docs/admin/setup#initialize-without-parameters the FIREBASE_CONFIG environment variable can be a name of a JSON file. Because this now requires fs.readFileSync to keep API compliance, firebaseConfg() now uses caching. --- CHANGELOG.md | 1 + spec/config.spec.ts | 50 ++++++++++++++++++++++++++------- spec/providers/database.spec.ts | 7 +++-- spec/providers/storage.spec.ts | 12 ++++++-- src/config.ts | 29 +++++++++++++++---- 5 files changed, 78 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5283950c7..900cd7d55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Adds support for setting user labels on functions via `runWith()`. +- Adds support for FIREBASE_CONFIG env as the name of a JSON file diff --git a/spec/config.spec.ts b/spec/config.spec.ts index b721dc3a5..1f93ea10e 100644 --- a/spec/config.spec.ts +++ b/spec/config.spec.ts @@ -21,55 +21,85 @@ // SOFTWARE. import { expect } from 'chai'; +import * as fs from 'fs'; import * as mockRequire from 'mock-require'; -import { config, firebaseConfig } from '../src/config'; +import Sinon = require('sinon'); + +import * as config from '../src/config'; describe('config()', () => { + let readFileSync: Sinon.SinonStub; + before(() => { + readFileSync = Sinon.stub(fs, 'readFileSync'); + readFileSync.throws('Unexpected call'); process.env.PWD = '/srv'; }); + after(() => { delete process.env.PWD; + Sinon.verifyAndRestore(); }); + afterEach(() => { mockRequire.stopAll(); - delete config.singleton; + delete config.config.singleton; + (config as any).firebaseConfigCache = null; delete process.env.FIREBASE_CONFIG; delete process.env.CLOUD_RUNTIME_CONFIG; }); it('loads config values from .runtimeconfig.json', () => { mockRequire('/srv/.runtimeconfig.json', { foo: 'bar', firebase: {} }); - const loaded = config(); + const loaded = config.config(); expect(loaded).to.not.have.property('firebase'); expect(loaded).to.have.property('foo', 'bar'); }); it('does not provide firebase config if .runtimeconfig.json not invalid', () => { mockRequire('/srv/.runtimeconfig.json', 'does-not-exist'); - expect(firebaseConfig()).to.be.null; + expect(config.firebaseConfig()).to.be.null; }); it('does not provide firebase config if .ruuntimeconfig.json has no firebase property', () => { mockRequire('/srv/.runtimeconfig.json', {}); - expect(firebaseConfig()).to.be.null; + expect(config.firebaseConfig()).to.be.null; }); it('loads Firebase configs from FIREBASE_CONFIG env variable', () => { process.env.FIREBASE_CONFIG = JSON.stringify({ databaseURL: 'foo@firebaseio.com', }); - expect(firebaseConfig()).to.have.property( + expect(config.firebaseConfig()).to.have.property( 'databaseURL', 'foo@firebaseio.com' ); }); + it('loads Firebase configs from FIREBASE_CONFIG env variable pointing to a file', () => { + const oldEnv = process.env; + process.env = { + ...oldEnv, + FIREBASE_CONFIG: '.firebaseconfig.json', + }; + try { + readFileSync.returns( + Buffer.from('{"databaseURL": "foo@firebaseio.com"}') + ); + expect(config.firebaseConfig()).to.have.property( + 'databaseURL', + 'foo@firebaseio.com' + ); + } finally { + process.env = oldEnv; + } + }); + it('accepts alternative locations for config file', () => { process.env.CLOUD_RUNTIME_CONFIG = 'another.json'; mockRequire('another.json', { foo: 'bar', firebase: {} }); - expect(firebaseConfig()).to.not.be.null; - expect(config()).to.have.property('foo', 'bar'); + expect(config.firebaseConfig()).to.not.be.null; + expect(config.config()).to.have.property('foo', 'bar'); }); it('accepts full JSON in env.CLOUD_RUNTIME_CONFIG', () => { @@ -77,7 +107,7 @@ describe('config()', () => { foo: 'bar', firebase: {}, }); - expect(firebaseConfig()).to.not.be.null; - expect(config()).to.have.property('foo', 'bar'); + expect(config.firebaseConfig()).to.not.be.null; + expect(config.config()).to.have.property('foo', 'bar'); }); }); diff --git a/spec/providers/database.spec.ts b/spec/providers/database.spec.ts index bf7e54b6b..10e1b0efb 100644 --- a/spec/providers/database.spec.ts +++ b/spec/providers/database.spec.ts @@ -22,6 +22,7 @@ import { expect } from 'chai'; import { apps as appsNamespace } from '../../src/apps'; +import * as config from '../../src/config'; import * as functions from '../../src/index'; import * as database from '../../src/providers/database'; import { applyChange } from '../../src/utils'; @@ -31,14 +32,14 @@ describe('Database Functions', () => { // TODO add tests for building a data or change based on the type of operation before(() => { - process.env.FIREBASE_CONFIG = JSON.stringify({ + (config as any).firebaseConfigCache = { databaseURL: 'https://subdomain.apse.firebasedatabase.app', - }); + }; appsNamespace.init(); }); after(() => { - delete process.env.FIREBASE_CONFIG; + (config as any).firebaseConfigCache = null; delete appsNamespace.singleton; }); diff --git a/spec/providers/storage.spec.ts b/spec/providers/storage.spec.ts index 18326eab8..c104a076f 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/providers/storage.spec.ts @@ -21,6 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; +import * as config from '../../src/config'; import { Event, EventContext } from '../../src/index'; import * as functions from '../../src/index'; import * as storage from '../../src/providers/storage'; @@ -28,13 +29,13 @@ import * as storage from '../../src/providers/storage'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { before(() => { - process.env.FIREBASE_CONFIG = JSON.stringify({ + (config as any).firebaseConfigCache = { storageBucket: 'bucket', - }); + }; }); after(() => { - delete process.env.FIREBASE_CONFIG; + (config as any).firebaseConfigcache = null; }); it('should allow both region and runtime options to be set', () => { @@ -542,6 +543,11 @@ describe('Storage Functions', () => { }); describe('process.env.FIREBASE_CONFIG not set', () => { + beforeEach(() => { + (config as any).firebaseConfigCache = null; + delete process.env.FIREBASE_CONFIG; + }); + it('should not throw if __trigger is not accessed', () => { expect(() => storage.object().onArchive(() => null)).to.not.throw(Error); }); diff --git a/src/config.ts b/src/config.ts index 8925ff940..c49e7d03f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as firebase from 'firebase-admin'; +import * as fs from 'fs'; import * as path from 'path'; +import * as firebase from 'firebase-admin'; + export function config(): config.Config { if (typeof config.singleton === 'undefined') { init(); @@ -50,18 +52,34 @@ export namespace config { export let singleton: config.Config; } +/** @hidden */ +export let firebaseConfigCache: firebase.AppOptions | null = null; + /** @hidden */ export function firebaseConfig(): firebase.AppOptions | null { - const env = process.env.FIREBASE_CONFIG; + if (firebaseConfigCache) { + return firebaseConfigCache; + } + + let env = process.env.FIREBASE_CONFIG; if (env) { - return JSON.parse(env); + // Firebase Tools will always use a JSON blob in prod, but docs + // explicitly state that the user can set the env to a file: + // https://firebase.google.com/docs/admin/setup#initialize-without-parameters + if (!env.startsWith('{')) { + env = fs.readFileSync(path.join(process.env.PWD, env)).toString('utf8'); + } + + firebaseConfigCache = JSON.parse(env); + return firebaseConfigCache; } // Could have Runtime Config with Firebase in it as an ENV value. try { const config = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG); if (config.firebase) { - return config.firebase; + firebaseConfigCache = config.firebase; + return firebaseConfigCache; } } catch (e) { // Do nothing @@ -74,7 +92,8 @@ export function firebaseConfig(): firebase.AppOptions | null { path.join(process.env.PWD, '.runtimeconfig.json'); const config = require(configPath); if (config.firebase) { - return config.firebase; + firebaseConfigCache = config.firebase; + return firebaseConfigCache; } } catch (e) { // Do nothing From 4028acc07d11cd81cd56ee816bf16f025c0d10df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Nordstr=C3=B6m?= Date: Thu, 24 Jun 2021 22:51:15 +0200 Subject: [PATCH 315/705] Fall back to updateTime if no readTime exists (#843) Fixes #599 --- spec/providers/firestore.spec.ts | 13 +++++++++++++ src/providers/firestore.ts | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/spec/providers/firestore.spec.ts b/spec/providers/firestore.spec.ts index 42cdf97f7..271701108 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/providers/firestore.spec.ts @@ -566,6 +566,7 @@ describe('Firestore Functions', () => { describe('Other DocumentSnapshot methods', () => { let snapshot: FirebaseFirestore.DocumentSnapshot; + let newSnapshot: FirebaseFirestore.DocumentSnapshot; before(() => { snapshot = firestore.snapshotConstructor( @@ -579,6 +580,16 @@ describe('Firestore Functions', () => { }, }) ); + newSnapshot = firestore.snapshotConstructor( + makeEvent({ + value: { + fields: { key: { integerValue: '2' } }, + createTime: '2017-06-17T14:45:17.876479Z', + updateTime: '2017-06-17T14:45:17.876479Z', + name: 'projects/pid/databases/(default)/documents/collection/124', + }, + }) + ); }); it('should support #exists', () => { @@ -606,6 +617,8 @@ describe('Firestore Functions', () => { it('should support #readTime', () => { expect(snapshot.readTime.seconds).to.be.a('number'); expect(snapshot.readTime.nanoseconds).to.be.a('number'); + expect(newSnapshot.readTime.seconds).to.be.a('number'); + expect(newSnapshot.readTime.nanoseconds).to.be.a('number'); }); }); diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index f91e17306..58a6de925 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -155,7 +155,10 @@ export function snapshotConstructor(event: Event): DocumentSnapshot { event.context.resource.name, 'value' ); - const readTime = dateToTimestampProto(_.get(event, 'data.value.readTime')); + const timeString = + _.get(event, 'data.value.readTime') ?? + _.get(event, 'data.value.updateTime'); + const readTime = dateToTimestampProto(timeString); return firestoreInstance.snapshot_(valueProto, readTime, 'json'); } From 33a68eaa5b228ac39c1f0b3a9610dc7457d4e921 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 8 Jul 2021 14:52:26 -0700 Subject: [PATCH 316/705] Create package exports (#906) * Create version packages * Changelog * Make exports list always use explicit file names --- CHANGELOG.md | 1 + package.json | 8 +++ spec/{ => v1}/apps.spec.ts | 2 +- spec/{ => v1}/cloud-functions.spec.ts | 2 +- spec/{ => v1}/config.spec.ts | 2 +- spec/{ => v1}/function-builder.spec.ts | 2 +- .../providers/analytics.spec.input.ts | 2 +- spec/{ => v1}/providers/analytics.spec.ts | 6 +- spec/{ => v1}/providers/auth.spec.ts | 10 ++- spec/{ => v1}/providers/database.spec.ts | 10 +-- spec/{ => v1}/providers/firestore.spec.ts | 4 +- spec/{ => v1}/providers/https.spec.ts | 10 +-- spec/{ => v1}/providers/pubsub.spec.ts | 6 +- spec/{ => v1}/providers/remoteConfig.spec.ts | 6 +- spec/{ => v1}/providers/storage.spec.ts | 8 +-- spec/{ => v1}/providers/testLab.spec.ts | 2 +- spec/{ => v1}/setup.spec.ts | 2 +- spec/{ => v1}/utils.spec.ts | 2 +- src/index.ts | 63 +------------------ src/{logger.ts => logger/index.ts} | 2 +- src/{ => v1}/apps.ts | 0 src/{ => v1}/cloud-functions.ts | 2 +- src/{ => v1}/config.ts | 0 src/{ => v1}/encoder.ts | 0 src/{ => v1}/function-builder.ts | 0 src/{ => v1}/function-configuration.ts | 0 src/{ => v1}/handler-builder.ts | 0 src/v1/index.ts | 62 ++++++++++++++++++ src/{ => v1}/providers/analytics.ts | 0 src/{ => v1}/providers/auth.ts | 0 src/{ => v1}/providers/database.ts | 2 +- src/{ => v1}/providers/firestore.ts | 0 src/{ => v1}/providers/https.ts | 2 +- src/{ => v1}/providers/pubsub.ts | 0 src/{ => v1}/providers/remoteConfig.ts | 0 src/{ => v1}/providers/storage.ts | 0 src/{ => v1}/providers/testLab.ts | 0 src/{ => v1}/setup.ts | 2 +- src/{ => v1}/utils.ts | 0 tsconfig.release.json | 2 +- 40 files changed, 118 insertions(+), 104 deletions(-) rename spec/{ => v1}/apps.spec.ts (98%) rename spec/{ => v1}/cloud-functions.spec.ts (99%) rename spec/{ => v1}/config.spec.ts (98%) rename spec/{ => v1}/function-builder.spec.ts (99%) rename spec/{ => v1}/providers/analytics.spec.input.ts (98%) rename spec/{ => v1}/providers/analytics.spec.ts (98%) rename spec/{ => v1}/providers/auth.spec.ts (97%) rename spec/{ => v1}/providers/database.spec.ts (98%) rename spec/{ => v1}/providers/firestore.spec.ts (99%) rename spec/{ => v1}/providers/https.spec.ts (98%) rename spec/{ => v1}/providers/pubsub.spec.ts (98%) rename spec/{ => v1}/providers/remoteConfig.spec.ts (96%) rename spec/{ => v1}/providers/storage.spec.ts (98%) rename spec/{ => v1}/providers/testLab.spec.ts (99%) rename spec/{ => v1}/setup.spec.ts (97%) rename spec/{ => v1}/utils.spec.ts (97%) rename src/{logger.ts => logger/index.ts} (99%) rename src/{ => v1}/apps.ts (100%) rename src/{ => v1}/cloud-functions.ts (99%) rename src/{ => v1}/config.ts (100%) rename src/{ => v1}/encoder.ts (100%) rename src/{ => v1}/function-builder.ts (100%) rename src/{ => v1}/function-configuration.ts (100%) rename src/{ => v1}/handler-builder.ts (100%) create mode 100644 src/v1/index.ts rename src/{ => v1}/providers/analytics.ts (100%) rename src/{ => v1}/providers/auth.ts (100%) rename src/{ => v1}/providers/database.ts (99%) rename src/{ => v1}/providers/firestore.ts (100%) rename src/{ => v1}/providers/https.ts (99%) rename src/{ => v1}/providers/pubsub.ts (100%) rename src/{ => v1}/providers/remoteConfig.ts (100%) rename src/{ => v1}/providers/storage.ts (100%) rename src/{ => v1}/providers/testLab.ts (100%) rename src/{ => v1}/setup.ts (98%) rename src/{ => v1}/utils.ts (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 900cd7d55..adfc05c3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Adds support for setting user labels on functions via `runWith()`. - Adds support for FIREBASE_CONFIG env as the name of a JSON file +- Formalize module exports. Loggers can now be accessed at 'firebase-functions/logger' and 'firebase-functions/logger/compat' diff --git a/package.json b/package.json index a9c86bf87..413a81c45 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,14 @@ ], "main": "lib/index.js", "types": "lib/index.d.ts", + "exports": { + ".": "./lib/index.js", + "./v1": "./lib/v1/index.js", + "./logger": "./lib/logger/index.js", + "./logger/compat": "./lib/logger/compat.js", + "./lib/logger": "./lib/logger/index.js", + "./lib/logger/compat": "./lib/logger/compat.js" + }, "publishConfig": { "registry": "https://wombat-dressing-room.appspot.com" }, diff --git a/spec/apps.spec.ts b/spec/v1/apps.spec.ts similarity index 98% rename from spec/apps.spec.ts rename to spec/v1/apps.spec.ts index 9fff98c71..33c263f4f 100644 --- a/spec/apps.spec.ts +++ b/spec/v1/apps.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { apps as appsNamespace } from '../src/apps'; +import { apps as appsNamespace } from '../../src/v1/apps'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; diff --git a/spec/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts similarity index 99% rename from spec/cloud-functions.spec.ts rename to spec/v1/cloud-functions.spec.ts index ab17fbc3e..48ecb3072 100644 --- a/spec/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -29,7 +29,7 @@ import { EventContext, makeCloudFunction, MakeCloudFunctionArgs, -} from '../src/cloud-functions'; +} from '../../src/v1/cloud-functions'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { diff --git a/spec/config.spec.ts b/spec/v1/config.spec.ts similarity index 98% rename from spec/config.spec.ts rename to spec/v1/config.spec.ts index 1f93ea10e..8a40fe523 100644 --- a/spec/config.spec.ts +++ b/spec/v1/config.spec.ts @@ -25,7 +25,7 @@ import * as fs from 'fs'; import * as mockRequire from 'mock-require'; import Sinon = require('sinon'); -import * as config from '../src/config'; +import * as config from '../../src/v1/config'; describe('config()', () => { let readFileSync: Sinon.SinonStub; diff --git a/spec/function-builder.spec.ts b/spec/v1/function-builder.spec.ts similarity index 99% rename from spec/function-builder.spec.ts rename to spec/v1/function-builder.spec.ts index 106f874ea..431d018ac 100644 --- a/spec/function-builder.spec.ts +++ b/spec/v1/function-builder.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; -import * as functions from '../src/index'; +import * as functions from '../../src/v1'; describe('FunctionBuilder', () => { before(() => { diff --git a/spec/providers/analytics.spec.input.ts b/spec/v1/providers/analytics.spec.input.ts similarity index 98% rename from spec/providers/analytics.spec.input.ts rename to spec/v1/providers/analytics.spec.input.ts index bd9768b16..74ad65a93 100644 --- a/spec/providers/analytics.spec.input.ts +++ b/spec/v1/providers/analytics.spec.input.ts @@ -21,7 +21,7 @@ // SOFTWARE. /* tslint:disable:max-line-length */ -import { AnalyticsEvent } from '../../src/providers/analytics'; +import { AnalyticsEvent } from '../../../src/v1/providers/analytics'; // A payload, as it might arrive over the wire. Every possible field is filled out at least once. export const fullPayload = JSON.parse(`{ diff --git a/spec/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts similarity index 98% rename from spec/providers/analytics.spec.ts rename to spec/v1/providers/analytics.spec.ts index 4a5e84a0c..a6e6b0af6 100644 --- a/spec/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -22,9 +22,9 @@ import { expect } from 'chai'; -import { Event, EventContext } from '../../src/cloud-functions'; -import * as functions from '../../src/index'; -import * as analytics from '../../src/providers/analytics'; +import * as functions from '../../../src/v1'; +import { Event, EventContext } from '../../../src/v1/cloud-functions'; +import * as analytics from '../../../src/v1/providers/analytics'; import * as analytics_spec_input from './analytics.spec.input'; describe('Analytics Functions', () => { diff --git a/spec/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts similarity index 97% rename from spec/providers/auth.spec.ts rename to spec/v1/providers/auth.spec.ts index bb2ab7761..df0db01f7 100644 --- a/spec/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -23,9 +23,13 @@ import { expect } from 'chai'; import * as firebase from 'firebase-admin'; -import { CloudFunction, Event, EventContext } from '../../src/cloud-functions'; -import * as functions from '../../src/index'; -import * as auth from '../../src/providers/auth'; +import * as functions from '../../../src/index'; +import { + CloudFunction, + Event, + EventContext, +} from '../../../src/v1/cloud-functions'; +import * as auth from '../../../src/v1/providers/auth'; describe('Auth Functions', () => { const event: Event = { diff --git a/spec/providers/database.spec.ts b/spec/v1/providers/database.spec.ts similarity index 98% rename from spec/providers/database.spec.ts rename to spec/v1/providers/database.spec.ts index 10e1b0efb..27d5854c6 100644 --- a/spec/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -21,11 +21,11 @@ // SOFTWARE. import { expect } from 'chai'; -import { apps as appsNamespace } from '../../src/apps'; -import * as config from '../../src/config'; -import * as functions from '../../src/index'; -import * as database from '../../src/providers/database'; -import { applyChange } from '../../src/utils'; +import { apps as appsNamespace } from '../../../src/v1/apps'; +import * as config from '../../../src/v1/config'; +import * as functions from '../../../src/v1/index'; +import * as database from '../../../src/v1/providers/database'; +import { applyChange } from '../../../src/v1/utils'; describe('Database Functions', () => { describe('DatabaseBuilder', () => { diff --git a/spec/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts similarity index 99% rename from spec/providers/firestore.spec.ts rename to spec/v1/providers/firestore.spec.ts index 271701108..07014aeb0 100644 --- a/spec/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -24,8 +24,8 @@ import { expect } from 'chai'; import * as admin from 'firebase-admin'; import * as _ from 'lodash'; -import * as functions from '../../src/index'; -import * as firestore from '../../src/providers/firestore'; +import * as functions from '../../../src/index'; +import * as firestore from '../../../src/v1/providers/firestore'; describe('Firestore Functions', () => { function constructValue(fields: any) { diff --git a/spec/providers/https.spec.ts b/spec/v1/providers/https.spec.ts similarity index 98% rename from spec/providers/https.spec.ts rename to spec/v1/providers/https.spec.ts index 128ea0058..b34e29e6e 100644 --- a/spec/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -24,10 +24,10 @@ import { expect } from 'chai'; import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; -import { apps as appsNamespace } from '../../src/apps'; -import * as functions from '../../src/index'; -import * as https from '../../src/providers/https'; -import * as mocks from '../fixtures/credential/key.json'; +import * as functions from '../../../src/index'; +import { apps as appsNamespace } from '../../../src/v1/apps'; +import * as https from '../../../src/v1/providers/https'; +import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, generateAppCheckToken, @@ -36,7 +36,7 @@ import { mockFetchPublicKeys, MockRequest, mockRequest, -} from '../fixtures/mockrequest'; +} from '../../fixtures/mockrequest'; describe('CloudHttpsBuilder', () => { describe('#onRequest', () => { diff --git a/spec/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts similarity index 98% rename from spec/providers/pubsub.spec.ts rename to spec/v1/providers/pubsub.spec.ts index f64cd2119..3d0569057 100644 --- a/spec/providers/pubsub.spec.ts +++ b/spec/v1/providers/pubsub.spec.ts @@ -21,9 +21,9 @@ // SOFTWARE. import { expect } from 'chai'; -import { Event } from '../../src/index'; -import * as functions from '../../src/index'; -import * as pubsub from '../../src/providers/pubsub'; +import { Event } from '../../../src/index'; +import * as functions from '../../../src/index'; +import * as pubsub from '../../../src/v1/providers/pubsub'; describe('Pubsub Functions', () => { describe('pubsub.Message', () => { diff --git a/spec/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts similarity index 96% rename from spec/providers/remoteConfig.spec.ts rename to spec/v1/providers/remoteConfig.spec.ts index ef6d68572..2ccfe41fd 100644 --- a/spec/providers/remoteConfig.spec.ts +++ b/spec/v1/providers/remoteConfig.spec.ts @@ -22,14 +22,14 @@ import { expect } from 'chai'; import * as _ from 'lodash'; +import * as functions from '../../../src/index'; import { CloudFunction, Event, EventContext, TriggerAnnotated, -} from '../../src/cloud-functions'; -import * as functions from '../../src/index'; -import * as remoteConfig from '../../src/providers/remoteConfig'; +} from '../../../src/v1/cloud-functions'; +import * as remoteConfig from '../../../src/v1/providers/remoteConfig'; describe('RemoteConfig Functions', () => { function constructVersion() { diff --git a/spec/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts similarity index 98% rename from spec/providers/storage.spec.ts rename to spec/v1/providers/storage.spec.ts index c104a076f..aee2d72a9 100644 --- a/spec/providers/storage.spec.ts +++ b/spec/v1/providers/storage.spec.ts @@ -21,10 +21,10 @@ // SOFTWARE. import { expect } from 'chai'; -import * as config from '../../src/config'; -import { Event, EventContext } from '../../src/index'; -import * as functions from '../../src/index'; -import * as storage from '../../src/providers/storage'; +import { Event, EventContext } from '../../../src/v1'; +import * as functions from '../../../src/v1'; +import * as config from '../../../src/v1/config'; +import * as storage from '../../../src/v1/providers/storage'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { diff --git a/spec/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts similarity index 99% rename from spec/providers/testLab.spec.ts rename to spec/v1/providers/testLab.spec.ts index 8a70cf680..5584bfbf7 100644 --- a/spec/providers/testLab.spec.ts +++ b/spec/v1/providers/testLab.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; -import * as testLab from '../../src/providers/testLab'; +import * as testLab from '../../../src/v1/providers/testLab'; describe('Test Lab Functions', () => { describe('#onComplete', () => { diff --git a/spec/setup.spec.ts b/spec/v1/setup.spec.ts similarity index 97% rename from spec/setup.spec.ts rename to spec/v1/setup.spec.ts index 289b90fc1..20ca26d12 100644 --- a/spec/setup.spec.ts +++ b/spec/v1/setup.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { setup } from '../src/setup'; +import { setup } from '../../src/v1/setup'; describe('setup()', () => { afterEach(() => { diff --git a/spec/utils.spec.ts b/spec/v1/utils.spec.ts similarity index 97% rename from spec/utils.spec.ts rename to spec/v1/utils.spec.ts index 51a8478fa..119d203f6 100644 --- a/spec/utils.spec.ts +++ b/spec/v1/utils.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { applyChange } from '../src/utils'; +import { applyChange } from '../../src/v1/utils'; describe('utils', () => { describe('.applyChange(from: any, to: any): any', () => { diff --git a/src/index.ts b/src/index.ts index dbb42003c..5b98253d9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,62 +1 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -// Providers: -import * as analytics from './providers/analytics'; -import * as auth from './providers/auth'; -import * as database from './providers/database'; -import * as firestore from './providers/firestore'; -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 testLab from './providers/testLab'; - -import * as apps from './apps'; -import { handler } from './handler-builder'; -import * as logger from './logger'; -import { setup } from './setup'; - -const app = apps.apps(); - -export { - analytics, - app, - auth, - database, - firestore, - handler, - https, - pubsub, - remoteConfig, - storage, - testLab, - logger, -}; - -// Exported root types: -export * from './cloud-functions'; -export * from './config'; -export * from './function-builder'; -export * from './function-configuration'; - -setup(); +export * from './v1'; diff --git a/src/logger.ts b/src/logger/index.ts similarity index 99% rename from src/logger.ts rename to src/logger/index.ts index 1dd109179..24483087c 100644 --- a/src/logger.ts +++ b/src/logger/index.ts @@ -4,7 +4,7 @@ import { CONSOLE_SEVERITY, SUPPORTS_STRUCTURED_LOGS, UNPATCHED_CONSOLE, -} from './logger/common'; +} from './common'; /** * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity). diff --git a/src/apps.ts b/src/v1/apps.ts similarity index 100% rename from src/apps.ts rename to src/v1/apps.ts diff --git a/src/cloud-functions.ts b/src/v1/cloud-functions.ts similarity index 99% rename from src/cloud-functions.ts rename to src/v1/cloud-functions.ts index 2a6c770e6..ef59c0422 100644 --- a/src/cloud-functions.ts +++ b/src/v1/cloud-functions.ts @@ -22,13 +22,13 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; +import { warn } from '../logger'; import { DEFAULT_FAILURE_POLICY, DeploymentOptions, FailurePolicy, Schedule, } from './function-configuration'; -import { warn } from './logger'; export { Request, Response }; /** @hidden */ diff --git a/src/config.ts b/src/v1/config.ts similarity index 100% rename from src/config.ts rename to src/v1/config.ts diff --git a/src/encoder.ts b/src/v1/encoder.ts similarity index 100% rename from src/encoder.ts rename to src/v1/encoder.ts diff --git a/src/function-builder.ts b/src/v1/function-builder.ts similarity index 100% rename from src/function-builder.ts rename to src/v1/function-builder.ts diff --git a/src/function-configuration.ts b/src/v1/function-configuration.ts similarity index 100% rename from src/function-configuration.ts rename to src/v1/function-configuration.ts diff --git a/src/handler-builder.ts b/src/v1/handler-builder.ts similarity index 100% rename from src/handler-builder.ts rename to src/v1/handler-builder.ts diff --git a/src/v1/index.ts b/src/v1/index.ts new file mode 100644 index 000000000..ec83eeab5 --- /dev/null +++ b/src/v1/index.ts @@ -0,0 +1,62 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + +// Providers: +import * as analytics from './providers/analytics'; +import * as auth from './providers/auth'; +import * as database from './providers/database'; +import * as firestore from './providers/firestore'; +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 testLab from './providers/testLab'; + +import * as logger from '../logger'; +import * as apps from './apps'; +import { handler } from './handler-builder'; +import { setup } from './setup'; + +const app = apps.apps(); + +export { + analytics, + app, + auth, + database, + firestore, + handler, + https, + pubsub, + remoteConfig, + storage, + testLab, + logger, +}; + +// Exported root types: +export * from './cloud-functions'; +export * from './config'; +export * from './function-builder'; +export * from './function-configuration'; + +setup(); diff --git a/src/providers/analytics.ts b/src/v1/providers/analytics.ts similarity index 100% rename from src/providers/analytics.ts rename to src/v1/providers/analytics.ts diff --git a/src/providers/auth.ts b/src/v1/providers/auth.ts similarity index 100% rename from src/providers/auth.ts rename to src/v1/providers/auth.ts diff --git a/src/providers/database.ts b/src/v1/providers/database.ts similarity index 99% rename from src/providers/database.ts rename to src/v1/providers/database.ts index 76252d515..372419169 100644 --- a/src/providers/database.ts +++ b/src/v1/providers/database.ts @@ -22,6 +22,7 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; +import { joinPath, normalizePath, pathParts } from '../../utilities/path'; import { apps } from '../apps'; import { Change, @@ -32,7 +33,6 @@ import { } from '../cloud-functions'; import { firebaseConfig } from '../config'; import { DeploymentOptions } from '../function-configuration'; -import { joinPath, normalizePath, pathParts } from '../utilities/path'; import { applyChange } from '../utils'; /** @hidden */ diff --git a/src/providers/firestore.ts b/src/v1/providers/firestore.ts similarity index 100% rename from src/providers/firestore.ts rename to src/v1/providers/firestore.ts diff --git a/src/providers/https.ts b/src/v1/providers/https.ts similarity index 99% rename from src/providers/https.ts rename to src/v1/providers/https.ts index c6167c50a..c6d5cc8a0 100644 --- a/src/providers/https.ts +++ b/src/v1/providers/https.ts @@ -25,10 +25,10 @@ import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; +import { error, info, warn } from '../../logger'; import { apps } from '../apps'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; -import { error, info, warn } from '../logger'; /** @hidden */ export interface Request extends express.Request { diff --git a/src/providers/pubsub.ts b/src/v1/providers/pubsub.ts similarity index 100% rename from src/providers/pubsub.ts rename to src/v1/providers/pubsub.ts diff --git a/src/providers/remoteConfig.ts b/src/v1/providers/remoteConfig.ts similarity index 100% rename from src/providers/remoteConfig.ts rename to src/v1/providers/remoteConfig.ts diff --git a/src/providers/storage.ts b/src/v1/providers/storage.ts similarity index 100% rename from src/providers/storage.ts rename to src/v1/providers/storage.ts diff --git a/src/providers/testLab.ts b/src/v1/providers/testLab.ts similarity index 100% rename from src/providers/testLab.ts rename to src/v1/providers/testLab.ts diff --git a/src/setup.ts b/src/v1/setup.ts similarity index 98% rename from src/setup.ts rename to src/v1/setup.ts index 6a9db702d..6b0eb3506 100644 --- a/src/setup.ts +++ b/src/v1/setup.ts @@ -21,8 +21,8 @@ // SOFTWARE. /** @hidden */ +import { warn } from '../logger'; import { firebaseConfig } from './config'; -import { warn } from './logger'; // Set up for config and vars export function setup() { diff --git a/src/utils.ts b/src/v1/utils.ts similarity index 100% rename from src/utils.ts rename to src/v1/utils.ts diff --git a/tsconfig.release.json b/tsconfig.release.json index 1a45bd58b..b8f2632fd 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -10,5 +10,5 @@ "target": "es2018", "typeRoots": ["./node_modules/@types"] }, - "files": ["./src/index.ts", "./src/logger.ts", "./src/logger/compat.ts"] + "files": ["./src/index.ts", "./src/logger/index.ts", "./src/logger/compat.ts"] } From 57ca58a1e3b8a4db652bc31e477c8b95fa5899a3 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 12 Jul 2021 11:27:20 -0700 Subject: [PATCH 317/705] RemoteConfig can be loaded in windows CMD.exe (#913) Favors using process.cwd over process.env.PWD as the latter is POSIX only (I might need to go check some of my code in firebase-tools!). While I was at it, I fixed a probably useless but nasty vulnerability where a malformed .runtimeconfig.json file would allow arbitrary code execution. --- CHANGELOG.md | 1 + spec/v1/config.spec.ts | 29 +++++++++++++++++++---------- src/v1/config.ts | 10 ++++++---- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adfc05c3a..45844cd0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ - Adds support for setting user labels on functions via `runWith()`. - Adds support for FIREBASE_CONFIG env as the name of a JSON file - Formalize module exports. Loggers can now be accessed at 'firebase-functions/logger' and 'firebase-functions/logger/compat' +- Fixes an issue where Remote Config coiuld not be emulated in Windows machines on the classic Command Prompt. diff --git a/spec/v1/config.spec.ts b/spec/v1/config.spec.ts index 8a40fe523..d1deea4fd 100644 --- a/spec/v1/config.spec.ts +++ b/spec/v1/config.spec.ts @@ -22,27 +22,27 @@ import { expect } from 'chai'; import * as fs from 'fs'; -import * as mockRequire from 'mock-require'; +import * as process from 'process'; import Sinon = require('sinon'); import * as config from '../../src/v1/config'; describe('config()', () => { let readFileSync: Sinon.SinonStub; + let cwdStub: Sinon.SinonStub; before(() => { readFileSync = Sinon.stub(fs, 'readFileSync'); readFileSync.throws('Unexpected call'); - process.env.PWD = '/srv'; + cwdStub = Sinon.stub(process, 'cwd'); + cwdStub.returns('/srv'); }); after(() => { - delete process.env.PWD; Sinon.verifyAndRestore(); }); afterEach(() => { - mockRequire.stopAll(); delete config.config.singleton; (config as any).firebaseConfigCache = null; delete process.env.FIREBASE_CONFIG; @@ -50,19 +50,27 @@ describe('config()', () => { }); it('loads config values from .runtimeconfig.json', () => { - mockRequire('/srv/.runtimeconfig.json', { foo: 'bar', firebase: {} }); + const json = JSON.stringify({ + foo: 'bar', + firebase: {}, + }); + readFileSync + .withArgs('/srv/.runtimeconfig.json') + .returns(Buffer.from(json)); const loaded = config.config(); expect(loaded).to.not.have.property('firebase'); expect(loaded).to.have.property('foo', 'bar'); }); it('does not provide firebase config if .runtimeconfig.json not invalid', () => { - mockRequire('/srv/.runtimeconfig.json', 'does-not-exist'); + readFileSync.withArgs('/srv/.runtimeconfig.json').returns('invalid JSON'); expect(config.firebaseConfig()).to.be.null; }); it('does not provide firebase config if .ruuntimeconfig.json has no firebase property', () => { - mockRequire('/srv/.runtimeconfig.json', {}); + readFileSync + .withArgs('/srv/.runtimeconfig.json') + .returns(Buffer.from('{}')); expect(config.firebaseConfig()).to.be.null; }); @@ -78,7 +86,7 @@ describe('config()', () => { it('loads Firebase configs from FIREBASE_CONFIG env variable pointing to a file', () => { const oldEnv = process.env; - process.env = { + (process as any).env = { ...oldEnv, FIREBASE_CONFIG: '.firebaseconfig.json', }; @@ -91,13 +99,14 @@ describe('config()', () => { 'foo@firebaseio.com' ); } finally { - process.env = oldEnv; + (process as any).env = oldEnv; } }); it('accepts alternative locations for config file', () => { process.env.CLOUD_RUNTIME_CONFIG = 'another.json'; - mockRequire('another.json', { foo: 'bar', firebase: {} }); + const json = JSON.stringify({ foo: 'bar', firebase: {} }); + readFileSync.withArgs('another.json').returns(Buffer.from(json)); expect(config.firebaseConfig()).to.not.be.null; expect(config.config()).to.have.property('foo', 'bar'); }); diff --git a/src/v1/config.ts b/src/v1/config.ts index c49e7d03f..f0793957d 100644 --- a/src/v1/config.ts +++ b/src/v1/config.ts @@ -89,8 +89,9 @@ export function firebaseConfig(): firebase.AppOptions | null { try { const configPath = process.env.CLOUD_RUNTIME_CONFIG || - path.join(process.env.PWD, '.runtimeconfig.json'); - const config = require(configPath); + path.join(process.cwd(), '.runtimeconfig.json'); + const contents = fs.readFileSync(configPath); + const config = JSON.parse(contents.toString('utf8')); if (config.firebase) { firebaseConfigCache = config.firebase; return firebaseConfigCache; @@ -115,8 +116,9 @@ function init() { try { const configPath = process.env.CLOUD_RUNTIME_CONFIG || - path.join(process.env.PWD, '.runtimeconfig.json'); - const parsed = require(configPath); + path.join(process.cwd(), '.runtimeconfig.json'); + const contents = fs.readFileSync(configPath); + const parsed = JSON.parse(contents.toString('utf8')); delete parsed.firebase; config.singleton = parsed; return; From 5e7fb2cf68821b26fcb8519f88a270577bfe6f11 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 13 Jul 2021 16:19:17 -0700 Subject: [PATCH 318/705] Fixes docgen after file renames. (#914) --- .gitignore | 1 + docgen/content-sources/toc.yaml | 120 +- docgen/generate-docs.js | 95 +- docgen/theme/helpers/cleanBreadcrumb.js | 4 + docgen/theme/partials/breadcrumb.hbs | 2 +- docgen/theme/partials/header.hbs | 2 +- package-lock.json | 5923 ++++++++++++++++++++++- src/logger/index.ts | 1 + 8 files changed, 6020 insertions(+), 128 deletions(-) create mode 100644 docgen/theme/helpers/cleanBreadcrumb.js diff --git a/.gitignore b/.gitignore index ba3cdeec5..b5a890408 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ node_modules npm-debug.log typings yarn.lock +.DS_Store diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/toc.yaml index e970fc80c..ac430151b 100644 --- a/docgen/content-sources/toc.yaml +++ b/docgen/content-sources/toc.yaml @@ -1,148 +1,148 @@ toc: - title: 'functions' - path: /docs/reference/functions/cloud_functions_.html + path: /docs/reference/functions/v1_cloud_functions_.html section: - title: 'CloudFunction' - path: /docs/reference/functions/cloud_functions_.html#cloudfunction + path: /docs/reference/functions/v1_cloud_functions_.html#cloudfunction - title: 'HttpsFunction' - path: /docs/reference/functions/cloud_functions_.html#httpsfunction + path: /docs/reference/functions/v1_cloud_functions_.html#httpsfunction - title: 'EventContext' - path: /docs/reference/functions/cloud_functions_.eventcontext.html + path: /docs/reference/functions/v1_cloud_functions_.eventcontext.html - title: 'FunctionBuilder' - path: /docs/reference/functions/function_builder_.functionbuilder.html + path: /docs/reference/functions/v1_function_builder_.functionbuilder.html - title: 'Change' - path: /docs/reference/functions/cloud_functions_.change.html + path: /docs/reference/functions/v1_cloud_functions_.change.html - title: 'ChangeJson' - path: /docs/reference/functions/cloud_functions_.changejson.html + path: /docs/reference/functions/v1_cloud_functions_.changejson.html - title: 'functions.config' - path: /docs/reference/functions/config_.html + path: /docs/reference/functions/v1_config_.html section: - title: 'Config' - path: /docs/reference/functions/config_.config.html + path: /docs/reference/functions/v1_config_.config.html - title: 'config.Config' - path: /docs/reference/functions/config_.config.config.html + path: /docs/reference/functions/v1_config_.config.config.html - title: 'functions.function-configuration' - path: /docs/reference/functions/function_configuration_.html + path: /docs/reference/functions/v1_function_configuration_.html section: - title: 'config.DeploymentOptions' - path: /docs/reference/functions/function_configuration_.deploymentoptions.html + path: /docs/reference/functions/v1_function_configuration_.deploymentoptions.html - title: 'config.FailurePolicy' - path: /docs/reference/functions/function_configuration_.failurepolicy.html + path: /docs/reference/functions/v1_function_configuration_.failurepolicy.html - title: 'config.RuntimeOptions' - path: /docs/reference/functions/function_configuration_.runtimeoptions.html + path: /docs/reference/functions/v1_function_configuration_.runtimeoptions.html - title: 'config.Schedule' - path: /docs/reference/functions/function_configuration_.schedule.html + path: /docs/reference/functions/v1_function_configuration_.schedule.html - title: 'config.ScheduleRetryConfig' - path: /docs/reference/functions/function_configuration_.scheduleretryconfig.html + path: /docs/reference/functions/v1_function_configuration_.scheduleretryconfig.html - title: 'functions.analytics' - path: /docs/reference/functions/providers_analytics_.html + path: /docs/reference/functions/v1_providers_analytics_.html section: - title: 'AnalyticsEvent' - path: /docs/reference/functions/providers_analytics_.analyticsevent.html + path: /docs/reference/functions/v1_providers_analytics_.analyticsevent.html - title: 'AnalyticsEventBuilder' - path: /docs/reference/functions/providers_analytics_.analyticseventbuilder.html + path: /docs/reference/functions/v1_providers_analytics_.analyticseventbuilder.html - title: 'AppInfo' - path: /docs/reference/functions/providers_analytics_.appinfo.html + path: /docs/reference/functions/v1_providers_analytics_.appinfo.html - title: 'DeviceInfo' - path: /docs/reference/functions/providers_analytics_.deviceinfo.html + path: /docs/reference/functions/v1_providers_analytics_.deviceinfo.html - title: 'ExportBundleInfo' - path: /docs/reference/functions/providers_analytics_.exportbundleinfo.html + path: /docs/reference/functions/v1_providers_analytics_.exportbundleinfo.html - title: 'GeoInfo' - path: /docs/reference/functions/providers_analytics_.geoinfo.html + path: /docs/reference/functions/v1_providers_analytics_.geoinfo.html - title: 'UserDimensions' - path: /docs/reference/functions/providers_analytics_.userdimensions.html + path: /docs/reference/functions/v1_providers_analytics_.userdimensions.html - title: 'UserPropertyValue' - path: /docs/reference/functions/providers_analytics_.userpropertyvalue.html + path: /docs/reference/functions/v1_providers_analytics_.userpropertyvalue.html - title: 'functions.auth' - path: /docs/reference/functions/providers_auth_.html + path: /docs/reference/functions/v1_providers_auth_.html section: - title: 'UserBuilder' - path: /docs/reference/functions/providers_auth_.userbuilder.html + path: /docs/reference/functions/v1_providers_auth_.userbuilder.html - title: 'UserInfo' - path: /docs/reference/functions/providers_auth_.html#userinfo + path: /docs/reference/functions/v1_providers_auth_.html#userinfo - title: 'UserRecordMetadata' - path: /docs/reference/functions/providers_auth_.userrecordmetadata.html + path: /docs/reference/functions/v1_providers_auth_.userrecordmetadata.html - title: 'UserRecord' - path: /docs/reference/functions/providers_auth_.html#userrecord + path: /docs/reference/functions/v1_providers_auth_.html#userrecord - title: 'functions.firestore' - path: /docs/reference/functions/providers_firestore_.html + path: /docs/reference/functions/v1_providers_firestore_.html section: - title: 'DocumentBuilder' - path: /docs/reference/functions/providers_firestore_.documentbuilder.html + path: /docs/reference/functions/v1_providers_firestore_.documentbuilder.html - title: 'DocumentSnapshot' - path: /docs/reference/functions/providers_firestore_.html#documentsnapshot + path: /docs/reference/functions/v1_providers_firestore_.html#documentsnapshot - title: 'functions.database' - path: /docs/reference/functions/providers_database_.html + path: /docs/reference/functions/v1_providers_database_.html section: - title: 'DataSnapshot' - path: /docs/reference/functions/providers_database_.datasnapshot.html + path: /docs/reference/functions/v1_providers_database_.datasnapshot.html - title: 'RefBuilder' - path: /docs/reference/functions/providers_database_.refbuilder.html + path: /docs/reference/functions/v1_providers_database_.refbuilder.html - title: 'InstanceBuilder' - path: /docs/reference/functions/providers_database_.instancebuilder.html + path: /docs/reference/functions/v1_providers_database_.instancebuilder.html - title: 'functions.https' - path: /docs/reference/functions/providers_https_.html + path: /docs/reference/functions/v1_providers_https_.html section: - title: 'HttpsError' - path: /docs/reference/functions/providers_https_.httpserror.html + path: /docs/reference/functions/v1_providers_https_.httpserror.html - title: 'CallableContext' - path: /docs/reference/functions/providers_https_.callablecontext.html + path: /docs/reference/functions/v1_providers_https_.callablecontext.html - title: 'functions.logger' - path: /docs/reference/functions/logger_.html + path: /docs/reference/functions/logger_index_.html section: - title: 'LogEntry' - path: /docs/reference/functions/logger_.logentry.html + path: /docs/reference/functions/logger_index_.logentry.html - title: 'functions.pubsub' - path: /docs/reference/functions/providers_pubsub_.html + path: /docs/reference/functions/v1_providers_pubsub_.html section: - title: 'Message' - path: /docs/reference/functions/providers_pubsub_.message.html + path: /docs/reference/functions/v1_providers_pubsub_.message.html - title: 'TopicBuilder' - path: /docs/reference/functions/providers_pubsub_.topicbuilder.html + path: /docs/reference/functions/v1_providers_pubsub_.topicbuilder.html - title: 'ScheduleBuilder' - path: /docs/reference/functions/providers_pubsub_.schedulebuilder.html + path: /docs/reference/functions/v1_providers_pubsub_.schedulebuilder.html - title: 'functions.remoteconfig' - path: /docs/reference/functions/providers_remoteconfig_.html + path: /docs/reference/functions/v1_providers_remoteconfig_.html section: - title: 'RemoteConfigUser' - path: /docs/reference/functions/providers_remoteconfig_.remoteconfiguser.html + path: /docs/reference/functions/v1_providers_remoteconfig_.remoteconfiguser.html - title: 'TemplateVersion' - path: /docs/reference/functions/providers_remoteconfig_.templateversion.html + path: /docs/reference/functions/v1_providers_remoteconfig_.templateversion.html - title: 'functions.storage' - path: /docs/reference/functions/providers_storage_.html + path: /docs/reference/functions/v1_providers_storage_.html section: - title: 'BucketBuilder' - path: /docs/reference/functions/providers_storage_.bucketbuilder.html + path: /docs/reference/functions/v1_providers_storage_.bucketbuilder.html - title: 'ObjectBuilder' - path: /docs/reference/functions/providers_storage_.objectbuilder.html + path: /docs/reference/functions/v1_providers_storage_.objectbuilder.html - title: 'ObjectMetadata' - path: /docs/reference/functions/providers_storage_.objectmetadata.html + path: /docs/reference/functions/v1_providers_storage_.objectmetadata.html - title: 'functions.testLab' - path: /docs/reference/functions/providers_testlab_.html + path: /docs/reference/functions/v1_providers_testlab_.html section: - title: 'testLab.clientInfo' - path: /docs/reference/functions/providers_testlab_.clientinfo.html + path: /docs/reference/functions/v1_providers_testlab_.clientinfo.html - title: 'testLab.resultStorage' - path: /docs/reference/functions/providers_testlab_.resultstorage.html + path: /docs/reference/functions/v1_providers_testlab_.resultstorage.html - title: 'testLab.testMatrix' - path: /docs/reference/functions/providers_testlab_.testmatrix.html + path: /docs/reference/functions/v1_providers_testlab_.testmatrix.html - title: 'testLab.testMatrixBuilder' - path: /docs/reference/functions/providers_testlab_.testmatrixbuilder.html + path: /docs/reference/functions/v1_providers_testlab_.testmatrixbuilder.html - title: 'functions.handler' - path: /docs/reference/functions/handler_builder_.html + path: /docs/reference/functions/v1_handler_builder_.html section: - title: 'HandlerBuilder' - path: /docs/reference/functions/handler_builder_.handlerbuilder.html + path: /docs/reference/functions/v1_handler_builder_.handlerbuilder.html diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index d36edb7e8..2f8b9abb0 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -26,9 +26,9 @@ const repoPath = path.resolve(`${__dirname}/..`); // Command-line options. const { source: sourceFile } = yargs .option('source', { - default: `${repoPath}/src`, + default: `${repoPath}/src/{v1,logger}`, describe: 'Typescript source file(s)', - type: 'string' + type: 'string', }) .version(false) .help().argv; @@ -38,7 +38,7 @@ const contentPath = path.resolve(`${__dirname}/content-sources`); const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`); const devsitePath = `/docs/reference/functions/`; -const { JSDOM } = require("jsdom"); +const { JSDOM } = require('jsdom'); const typeMap = require('./type-aliases.json'); @@ -72,7 +72,7 @@ function runTypedoc() { * @param {string} subdir Subdir to move files out of. */ async function moveFilesToRoot(subdir) { - await exec(`mv ${docPath}/${subdir}/* ${docPath}`) + await exec(`mv ${docPath}/${subdir}/* ${docPath}`); await exec(`rmdir ${docPath}/${subdir}`); } @@ -86,9 +86,11 @@ async function renameFiles() { const files = await fs.readdir(docPath); const renames = []; for (const file of files) { - if (file.startsWith("_") && file.endsWith("html")) { + if (file.startsWith('_') && file.endsWith('html')) { let newFileName = file.substring(1); - renames.push(fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`)); + renames.push( + fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`) + ); } } await Promise.all(renames); @@ -125,11 +127,13 @@ function addTypeAliasLinks(data) { * Select .tsd-signature-type because all potential external * links will have this identifier. */ - const fileTags = htmlDom.window.document.querySelectorAll(".tsd-signature-type"); - fileTags.forEach(tag => { + const fileTags = htmlDom.window.document.querySelectorAll( + '.tsd-signature-type' + ); + for (const tag of fileTags) { const mapping = typeMap[tag.textContent]; if (mapping) { - console.log('Adding link to '+tag.textContent+" documentation."); + console.log('Adding link to ' + tag.textContent + ' documentation.'); // Add the corresponding document link to this type const linkChild = htmlDom.window.document.createElement('a'); @@ -138,7 +142,7 @@ function addTypeAliasLinks(data) { tag.textContent = null; tag.appendChild(linkChild); } - }); + } return htmlDom.serialize(); } @@ -152,13 +156,13 @@ function addTypeAliasLinks(data) { function generateTempHomeMdFile(tocRaw, homeRaw) { const { toc } = yaml.safeLoad(tocRaw); let tocPageLines = [homeRaw, '# API Reference']; - toc.forEach(group => { + for (const group of toc) { tocPageLines.push(`\n## [${group.title}](${stripPath(group.path)})`); const section = group.section || []; - section.forEach(item => { + for (const item of section) { tocPageLines.push(`- [${item.title}](${stripPath(item.path)})`); - }); - }); + } + } return fs.writeFile(tempHomePath, tocPageLines.join('\n')); } @@ -176,10 +180,10 @@ async function checkForMissingFilesAndFixFilenameCase(tocText) { // Get filenames from toc.yaml. const filenames = tocText .split('\n') - .filter(line => line.includes('path:')) - .map(line => line.split(devsitePath)[1]); + .filter((line) => line.includes('path:')) + .map((line) => line.split(devsitePath)[1].replace(/#.*$/, '')); // Logs warning to console if a file from TOC is not found. - const fileCheckPromises = filenames.map(async filename => { + const fileCheckPromises = filenames.map(async (filename) => { // Warns if file does not exist, fixes filename case if it does. // Preferred filename for devsite should be capitalized and taken from // toc.yaml. @@ -211,29 +215,28 @@ async function checkForMissingFilesAndFixFilenameCase(tocText) { */ async function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { const files = await fs.readdir(docPath); - const htmlFiles = files - .filter(filename => filename.slice(-4) === 'html'); + const htmlFiles = files.filter((filename) => filename.slice(-4) === 'html'); const removePromises = []; const filesToRemove = htmlFiles - .filter(filename => !filenamesFromToc.includes(filename)) - .filter(filename => filename !== 'index' && filename != 'globals'); + .filter((filename) => !filenamesFromToc.includes(filename)) + .filter((filename) => filename !== 'index' && filename != 'globals'); if (filesToRemove.length && !shouldRemove) { // This is just a warning, it doesn't need to finish before // the process continues. console.warn( - `Unlisted files: ${filesToRemove.join(", ")} generated ` + + `Unlisted files: ${filesToRemove.join(', ')} generated ` + `but not listed in toc.yaml.` ); return htmlFiles; } - await Promise.all(filesToRemove.map(filename => { - console.log( - `REMOVING ${docPath}/${filename} - not listed in toc.yaml.` - ); - return fs.unlink(`${docPath}/${filename})`); - })); - return htmlFiles.filter(filename => filenamesFromToc.includes(filename)) + await Promise.all( + filesToRemove.map((filename) => { + console.log(`REMOVING ${docPath}/${filename} - not listed in toc.yaml.`); + return fs.unlink(`${docPath}/${filename})`); + }) + ); + return htmlFiles.filter((filename) => filenamesFromToc.includes(filename)); } /** @@ -243,10 +246,10 @@ async function checkForUnlistedFiles(filenamesFromToc, shouldRemove) { * @param {Array} htmlFiles List of html files found in generated dir. */ async function writeGeneratedFileList(htmlFiles) { - const fileList = htmlFiles.map(filename => { + const fileList = htmlFiles.map((filename) => { return { title: filename, - path: `${devsitePath}${filename}` + path: `${devsitePath}${filename}`, }; }); const generatedTocYAML = yaml.safeDump({ toc: fileList }); @@ -262,10 +265,10 @@ async function writeGeneratedFileList(htmlFiles) { */ function fixAllLinks(htmlFiles) { const writePromises = []; - htmlFiles.forEach(file => { + for (const file of htmlFiles) { // Update links in each html file to match flattened file structure. writePromises.push(fixLinks(`${docPath}/${file}`)); - }); + } return Promise.all(writePromises); } @@ -281,12 +284,12 @@ function fixAllLinks(htmlFiles) { * links as needed. * 5) Check for mismatches between TOC list and generated file list. */ -(async function() { +(async function () { try { const [tocRaw, homeRaw] = await Promise.all([ fs.readFile(`${contentPath}/toc.yaml`, 'utf8'), - fs.readFile(`${contentPath}/HOME.md`, 'utf8') - ]) + fs.readFile(`${contentPath}/HOME.md`, 'utf8'), + ]); // Run main Typedoc process (uses index.d.ts and generated temp file above). await generateTempHomeMdFile(tocRaw, homeRaw); @@ -324,7 +327,9 @@ function fixAllLinks(htmlFiles) { // Check for files listed in TOC that are missing and warn if so. // Not blocking. - const filenamesFromToc = await checkForMissingFilesAndFixFilenameCase(tocRaw); + const filenamesFromToc = await checkForMissingFilesAndFixFilenameCase( + tocRaw + ); // Check for files that exist but aren't listed in the TOC and warn. // (If API is node, actually remove the file.) @@ -340,13 +345,15 @@ function fixAllLinks(htmlFiles) { const data = await fs.readFile(`${docPath}/index.html`, 'utf8'); // String to include devsite local variables. const localVariablesIncludeString = `{% include "docs/web/_local_variables.html" %}\n`; - await fs.writeFile(`${docPath}/index.html`, localVariablesIncludeString + data); + await fs.writeFile( + `${docPath}/index.html`, + localVariablesIncludeString + data + ); } catch (err) { - if (err.stdout) { - console.error(err.stdout); - } else { - console.error(err); + if (err.stdout) { + console.error(err.stdout); + } else { + console.error(err); + } } -} })(); - diff --git a/docgen/theme/helpers/cleanBreadcrumb.js b/docgen/theme/helpers/cleanBreadcrumb.js new file mode 100644 index 000000000..ad52e64a7 --- /dev/null +++ b/docgen/theme/helpers/cleanBreadcrumb.js @@ -0,0 +1,4 @@ +exports.cleanBreadcrumb = function (value) { + const parts = value.replace(/"/g, '').split('/'); + return parts[parts.length - 1]; +}; diff --git a/docgen/theme/partials/breadcrumb.hbs b/docgen/theme/partials/breadcrumb.hbs index db115163f..6a2147724 100644 --- a/docgen/theme/partials/breadcrumb.hbs +++ b/docgen/theme/partials/breadcrumb.hbs @@ -3,7 +3,7 @@ {{#with parent}}{{> breadcrumb}}{{/with}}
  • {{#if url}} - {{name}}. + {{cleanBreadcrumb name}}. {{else}} {{name}} {{/if}} diff --git a/docgen/theme/partials/header.hbs b/docgen/theme/partials/header.hbs index 4aee65a6b..edb115a07 100644 --- a/docgen/theme/partials/header.hbs +++ b/docgen/theme/partials/header.hbs @@ -6,7 +6,7 @@ {{else}}
      {{#with model.parent}}{{> breadcrumb}}{{/with}} -
    • {{model.name}}
      • +
    • {{cleanBreadcrumb model.name}}
      • {{#if model.typeParameters}} < {{#each model.typeParameters}} diff --git a/package-lock.json b/package-lock.json index 16606db37..688f61a8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,5885 @@ { "name": "firebase-functions", "version": "3.14.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "version": "3.14.1", + "license": "MIT", + "dependencies": { + "@types/express": "4.17.3", + "cors": "^2.8.5", + "express": "^4.17.1", + "lodash": "^4.17.14" + }, + "devDependencies": { + "@types/chai": "^4.1.7", + "@types/chai-as-promised": "^7.1.0", + "@types/cors": "^2.8.5", + "@types/jsonwebtoken": "^8.3.2", + "@types/lodash": "^4.14.135", + "@types/mocha": "^5.2.7", + "@types/mock-require": "^2.0.0", + "@types/nock": "^10.0.3", + "@types/node": "^8.10.50", + "@types/sinon": "^7.0.13", + "chai": "^4.2.0", + "chai-as-promised": "^7.1.1", + "child-process-promise": "^2.2.1", + "firebase-admin": "^9.8.0", + "js-yaml": "^3.13.1", + "jsdom": "^16.2.1", + "jsonwebtoken": "^8.5.1", + "jwk-to-pem": "^2.0.5", + "mocha": "^6.1.4", + "mock-require": "^3.0.3", + "mz": "^2.7.0", + "nock": "^10.0.6", + "prettier": "^1.18.2", + "sinon": "^7.3.2", + "ts-node": "^8.3.0", + "tslint": "^5.18.0", + "tslint-config-prettier": "^1.18.0", + "tslint-no-unused-expression-chai": "^0.1.4", + "tslint-plugin-prettier": "^2.0.1", + "typedoc": "^0.19.1", + "typescript": "^3.8.3", + "yargs": "^15.3.1" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + }, + "peerDependencies": { + "firebase-admin": "^8.0.0 || ^9.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "node_modules/@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "node_modules/@firebase/app-types": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.2.tgz", + "integrity": "sha512-2VXvq/K+n8XMdM4L2xy5bYp2ZXMawJXluUIDzUBvMthVR+lhxK4pfFiqr1mmDbv9ydXvEAuFsD+6DpcZuJcSSw==", + "dev": true + }, + "node_modules/@firebase/auth-interop-types": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", + "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", + "dev": true, + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/component": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.0.tgz", + "integrity": "sha512-v18csWtXb0ri+3m7wuGLY/UDgcb89vuMlZGQ//+7jEPLIQeLbylvZhol1uzW9WzoOpxMxOS2W5qyVGX36wZvEA==", + "dev": true, + "dependencies": { + "@firebase/util": "1.1.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/component/node_modules/tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + }, + "node_modules/@firebase/database": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.0.tgz", + "integrity": "sha512-GsHvuES83Edtboij2h3txKg+yV/TD4b5Owc01SgXEQtvj1lulkHt4Ufmd9OZz1WreWQJMIqKpbVowIDHjlkZJQ==", + "dev": true, + "dependencies": { + "@firebase/auth-interop-types": "0.1.6", + "@firebase/component": "0.5.0", + "@firebase/database-types": "0.7.2", + "@firebase/logger": "0.2.6", + "@firebase/util": "1.1.0", + "faye-websocket": "0.11.3", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/database-types": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.2.tgz", + "integrity": "sha512-cdAd/dgwvC0r3oLEDUR+ULs1vBsEvy0b27nlzKhU6LQgm9fCDzgaH9nFGv8x+S9dly4B0egAXkONkVoWcOAisg==", + "dev": true, + "dependencies": { + "@firebase/app-types": "0.6.2" + } + }, + "node_modules/@firebase/database/node_modules/tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + }, + "node_modules/@firebase/logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz", + "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==", + "dev": true + }, + "node_modules/@firebase/util": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.1.0.tgz", + "integrity": "sha512-lfuSASuPKNdfebuFR8rjFamMQUPH9iiZHcKS755Rkm/5gRT0qC7BMhCh3ZkHf7NVbplzIc/GhmX2jM+igDRCag==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/util/node_modules/tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + }, + "node_modules/@google-cloud/common": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", + "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", + "dev": true, + "optional": true, + "dependencies": { + "@google-cloud/projectify": "^2.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.1", + "duplexify": "^4.1.1", + "ent": "^2.2.0", + "extend": "^3.0.2", + "google-auth-library": "^7.0.2", + "retry-request": "^4.1.1", + "teeny-request": "^7.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/firestore": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", + "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", + "dev": true, + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "functional-red-black-tree": "^1.0.1", + "google-gax": "^2.9.2", + "protobufjs": "^6.8.6" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@google-cloud/paginator": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", + "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", + "dev": true, + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "extend": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/projectify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", + "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/promisify": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", + "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", + "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", + "dev": true, + "optional": true, + "dependencies": { + "@google-cloud/common": "^3.6.0", + "@google-cloud/paginator": "^3.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.0", + "async-retry": "^1.3.1", + "compressible": "^2.0.12", + "date-and-time": "^1.0.0", + "duplexify": "^4.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "gcs-resumable-upload": "^3.1.4", + "get-stream": "^6.0.0", + "hash-stream-validation": "^0.2.2", + "mime": "^2.2.0", + "mime-types": "^2.0.8", + "onetime": "^5.1.0", + "p-limit": "^3.0.1", + "pumpify": "^2.0.0", + "snakeize": "^0.1.0", + "stream-events": "^1.0.1", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage/node_modules/mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true, + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/@google-cloud/storage/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "optional": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@grpc/grpc-js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", + "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", + "dev": true, + "optional": true, + "dependencies": { + "@types/node": ">=12.12.47" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + } + }, + "node_modules/@grpc/grpc-js/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", + "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", + "dev": true, + "optional": true, + "dependencies": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^6.10.0", + "yargs": "^16.1.1" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@grpc/proto-loader/node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@grpc/proto-loader/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "optional": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/@grpc/proto-loader/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@grpc/proto-loader/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "optional": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "optional": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@panva/asn1.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", + "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "dev": true, + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", + "dev": true, + "optional": true + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/formatio": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", + "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", + "dev": true + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/chai": { + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", + "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", + "dev": true + }, + "node_modules/@types/chai-as-promised": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", + "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, + "dependencies": { + "@types/chai": "*" + } + }, + "node_modules/@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "node_modules/@types/connect": { + "version": "3.4.33", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", + "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", + "dev": true, + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", + "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-jwt": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", + "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", + "dev": true, + "dependencies": { + "@types/express": "*", + "@types/express-unless": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", + "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "node_modules/@types/express-unless": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", + "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", + "dev": true, + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/jsonwebtoken": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", + "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/lodash": { + "version": "4.14.161", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", + "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "dev": true + }, + "node_modules/@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "dev": true, + "optional": true + }, + "node_modules/@types/mime": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", + "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" + }, + "node_modules/@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "node_modules/@types/mock-require": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", + "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/nock": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", + "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "8.10.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", + "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" + }, + "node_modules/@types/qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" + }, + "node_modules/@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha1-fuMwunyq+5gJC+zoal7kQRWQTCw=" + }, + "node_modules/@types/serve-static": { + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", + "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, + "node_modules/@types/sinon": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", + "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "dev": true + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "optional": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dev": true, + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", + "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, + "node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", + "dev": true, + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/async-retry": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", + "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", + "dev": true, + "optional": true, + "dependencies": { + "retry": "0.12.0" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bignumber.js": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", + "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", + "dev": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", + "dev": true + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", + "dev": true + }, + "node_modules/buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", + "dev": true + }, + "node_modules/builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "node_modules/chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "dependencies": { + "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 5" + } + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", + "dev": true, + "dependencies": { + "cross-spawn": "^4.0.2", + "node-version": "^1.0.0", + "promise-polyfill": "^6.0.1" + } + }, + "node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "dev": true + }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "optional": true, + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compressible/node_modules/mime-db": { + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "dev": true, + "optional": true, + "dependencies": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "dev": true, + "dependencies": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/date-and-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", + "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", + "dev": true, + "optional": true + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", + "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", + "dev": true + }, + "node_modules/deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "node_modules/define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", + "dev": true, + "dependencies": { + "object-keys": "^1.0.12" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/dicer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", + "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", + "dev": true, + "dependencies": { + "streamsearch": "0.1.2" + }, + "engines": { + "node": ">=4.5.0" + } + }, + "node_modules/diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "optional": true, + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/duplexify": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", + "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", + "dev": true, + "optional": true, + "dependencies": { + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", + "stream-shift": "^1.0.0" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "node_modules/elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "optional": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true, + "optional": true + }, + "node_modules/es-abstract": { + "version": "1.17.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", + "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "dev": true, + "dependencies": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-regex": "^1.1.0", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", + "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" + }, + "engines": { + "node": ">=4.0.0" + }, + "peerDependencies": { + "prettier": ">= 0.11.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", + "dev": true + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true, + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "node_modules/fast-text-encoding": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", + "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", + "dev": true, + "optional": true + }, + "node_modules/faye-websocket": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "dev": true, + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/firebase-admin": { + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.8.0.tgz", + "integrity": "sha512-v8B1qU8McZZT2hlLZ018TKz2FoKlfFkZq9mOIyzN7wJUOlAywqQX0JyqNpVGyPeU+B+77ojlvmkGTNXt2OFkgw==", + "dev": true, + "dependencies": { + "@firebase/database": "^0.10.0", + "@firebase/database-types": "^0.7.2", + "@types/node": ">=12.12.47", + "dicer": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^2.0.2", + "node-forge": "^0.10.0" + }, + "engines": { + "node": ">=10.10.0" + }, + "optionalDependencies": { + "@google-cloud/firestore": "^4.5.0", + "@google-cloud/storage": "^5.3.0" + } + }, + "node_modules/firebase-admin/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true + }, + "node_modules/flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "deprecated": "Fixed a prototype pollution security issue in 4.1.0, please upgrade to ^4.1.1 or ^5.0.1.", + "dev": true, + "dependencies": { + "is-buffer": "~2.0.3" + }, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat/node_modules/is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs-extra": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true, + "optional": true + }, + "node_modules/gaxios": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", + "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", + "dev": true, + "optional": true, + "dependencies": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.3.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gcp-metadata": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", + "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", + "dev": true, + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gcs-resumable-upload": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", + "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", + "dev": true, + "optional": true, + "dependencies": { + "abort-controller": "^3.0.0", + "configstore": "^5.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "google-auth-library": "^7.0.0", + "pumpify": "^2.0.0", + "stream-events": "^1.0.4" + }, + "bin": { + "gcs-upload": "build/src/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/google-auth-library": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", + "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", + "dev": true, + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "fast-text-encoding": "^1.0.0", + "gaxios": "^4.0.0", + "gcp-metadata": "^4.2.0", + "gtoken": "^5.0.4", + "jws": "^4.0.0", + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "optional": true + }, + "node_modules/google-gax": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", + "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", + "dev": true, + "optional": true, + "dependencies": { + "@grpc/grpc-js": "~1.3.0", + "@grpc/proto-loader": "^0.6.1", + "@types/long": "^4.0.0", + "abort-controller": "^3.0.0", + "duplexify": "^4.0.0", + "fast-text-encoding": "^1.0.3", + "google-auth-library": "^7.0.2", + "is-stream-ended": "^0.1.4", + "node-fetch": "^2.6.1", + "object-hash": "^2.1.1", + "protobufjs": "^6.10.2", + "retry-request": "^4.0.0" + }, + "bin": { + "compileProtos": "build/tools/compileProtos.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-p12-pem": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", + "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", + "dev": true, + "optional": true, + "dependencies": { + "node-forge": "^0.10.0" + }, + "bin": { + "gp12-pem": "build/src/bin/gp12-pem.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/gtoken": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", + "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", + "dev": true, + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "google-p12-pem": "^3.0.3", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gtoken/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/gtoken/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dev": true, + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hash-stream-validation": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", + "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", + "dev": true, + "optional": true + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/highlight.js": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", + "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "dev": true + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-callable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", + "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-stream-ended": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", + "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", + "dev": true, + "optional": true + }, + "node_modules/is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "node_modules/jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, + "node_modules/jose": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", + "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", + "dev": true, + "dependencies": { + "@panva/asn1.js": "^1.0.0" + }, + "engines": { + "node": ">=10.13.0 < 13 || >=13.7.0" + }, + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/js-yaml/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "node_modules/jsdom": { + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "dev": true, + "dependencies": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/jsdom/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jsdom/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "dev": true, + "optional": true, + "dependencies": { + "bignumber.js": "^9.0.0" + } + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "node_modules/jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "dev": true, + "dependencies": { + "universalify": "^1.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dev": true, + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/just-extend": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", + "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", + "dev": true + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "dev": true, + "dependencies": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwks-rsa": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", + "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", + "dev": true, + "dependencies": { + "@types/express-jwt": "0.0.42", + "debug": "^4.1.0", + "jose": "^2.0.5", + "limiter": "^1.1.5", + "lru-memoizer": "^2.1.2" + }, + "engines": { + "node": ">=10 < 13 || >=14" + } + }, + "node_modules/jwks-rsa/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/jwks-rsa/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/limiter": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", + "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", + "dev": true + }, + "node_modules/lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, + "node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true, + "optional": true + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", + "dev": true + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", + "dev": true + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", + "dev": true + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", + "dev": true + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", + "dev": true + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", + "dev": true + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, + "node_modules/log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "dependencies": { + "chalk": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/lolex": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", + "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", + "dev": true + }, + "node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", + "dev": true, + "optional": true + }, + "node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/lru-memoizer": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", + "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", + "dev": true, + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" + } + }, + "node_modules/lru-memoizer/node_modules/lru-cache": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" + } + }, + "node_modules/lunr": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "dev": true + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "optional": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "optional": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/marked": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", + "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==", + "dev": true, + "bin": { + "marked": "bin/marked" + }, + "engines": { + "node": ">= 8.16.2" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dependencies": { + "mime-db": "1.40.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp/node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mocha": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", + "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", + "dev": true, + "dependencies": { + "ansi-colors": "3.2.3", + "browser-stdout": "1.3.1", + "debug": "3.2.6", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "find-up": "3.0.0", + "glob": "7.1.3", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.13.1", + "log-symbols": "2.2.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.4", + "ms": "2.1.1", + "node-environment-flags": "1.0.5", + "object.assign": "4.1.0", + "strip-json-comments": "2.0.1", + "supports-color": "6.0.0", + "which": "1.3.1", + "wide-align": "1.1.3", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/mocha/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/mocha/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mocha/node_modules/mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "node_modules/mocha/node_modules/object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mocha/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", + "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/mocha/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/mock-require": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", + "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", + "dev": true, + "dependencies": { + "get-caller-file": "^1.0.2", + "normalize-path": "^2.1.1" + }, + "engines": { + "node": ">=4.3.0" + } + }, + "node_modules/mock-require/node_modules/get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node_modules/nise": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", + "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", + "dev": true, + "dependencies": { + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^5.0.1", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/nise/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "node_modules/nise/node_modules/lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/nise/node_modules/path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/nock": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", + "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", + "dev": true, + "dependencies": { + "chai": "^4.1.2", + "debug": "^4.1.0", + "deep-equal": "^1.0.0", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.5", + "mkdirp": "^0.5.0", + "propagate": "^1.0.0", + "qs": "^6.5.1", + "semver": "^5.5.0" + }, + "engines": { + "node": ">= 6.0" + } + }, + "node_modules/nock/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/nock/node_modules/deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "dependencies": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/nock/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/node-environment-flags": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", + "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", + "dev": true, + "dependencies": { + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + } + }, + "node_modules/node-environment-flags/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true, + "optional": true, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "dev": true, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/node-version": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", + "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", + "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", + "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.assign/node_modules/es-abstract": { + "version": "1.18.0-next.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", + "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "dev": true, + "dependencies": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.getownpropertydescriptors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "optional": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "dev": true + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "node_modules/pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", + "dev": true + }, + "node_modules/propagate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", + "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", + "dev": true, + "engines": [ + "node >= 0.8.1" + ] + }, + "node_modules/protobufjs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + } + }, + "node_modules/protobufjs/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true, + "optional": true + }, + "node_modules/proxy-addr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "dependencies": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "node_modules/psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "optional": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", + "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", + "dev": true, + "optional": true, + "dependencies": { + "duplexify": "^4.1.1", + "inherits": "^2.0.3", + "pump": "^3.0.0" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "dependencies": { + "resolve": "^1.1.6" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dev": true, + "dependencies": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.12.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "dev": true, + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/retry-request": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", + "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", + "dev": true, + "optional": true, + "dependencies": { + "debug": "^4.1.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/retry-request/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/retry-request/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/shelljs": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "dev": true, + "dependencies": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + }, + "bin": { + "shjs": "bin/shjs" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true, + "optional": true + }, + "node_modules/sinon": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + } + }, + "node_modules/sinon/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/snakeize": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", + "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", + "dev": true, + "optional": true + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stream-events": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", + "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", + "dev": true, + "optional": true, + "dependencies": { + "stubs": "^3.0.0" + } + }, + "node_modules/stream-shift": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "dev": true, + "optional": true + }, + "node_modules/streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "optional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "optional": true + }, + "node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stubs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", + "dev": true, + "optional": true + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "node_modules/teeny-request": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", + "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", + "dev": true, + "optional": true, + "dependencies": { + "http-proxy-agent": "^4.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "stream-events": "^1.0.5", + "uuid": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", + "dev": true, + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "dependencies": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ts-node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", + "dev": true, + "dependencies": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "engines": { + "node": ">=6.0.0" + }, + "peerDependencies": { + "typescript": ">=2.7" + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, + "node_modules/tslint": { + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^4.0.1", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, + "bin": { + "tslint": "bin/tslint" + }, + "engines": { + "node": ">=4.8.0" + }, + "peerDependencies": { + "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" + } + }, + "node_modules/tslint-config-prettier": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", + "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", + "dev": true, + "bin": { + "tslint-config-prettier-check": "bin/check.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/tslint-no-unused-expression-chai": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", + "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", + "dev": true, + "dependencies": { + "tsutils": "^3.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "tslint": ">=5.1.0" + } + }, + "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tslint-plugin-prettier": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", + "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", + "dev": true, + "dependencies": { + "eslint-plugin-prettier": "^2.2.0", + "lines-and-columns": "^1.1.6", + "tslib": "^1.7.1" + }, + "engines": { + "node": ">= 4" + }, + "peerDependencies": { + "prettier": "^1.9.0 || ^2.0.0", + "tslint": "^5.0.0 || ^6.0.0" + } + }, + "node_modules/tslint/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslint/node_modules/resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "peerDependencies": { + "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "optional": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typedoc": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.19.1.tgz", + "integrity": "sha512-EqZpRJQUnkwHA1yBhaDExEXUZIiWKddkrDXhRcfUzpnu6pizxNmVTw5IZ3mu682Noa4zQCniE0YNjaAwHQodrA==", + "dev": true, + "dependencies": { + "fs-extra": "^9.0.1", + "handlebars": "^4.7.6", + "highlight.js": "^10.0.0", + "lodash": "^4.17.20", + "lunr": "^2.3.9", + "marked": "^1.1.1", + "minimatch": "^3.0.0", + "progress": "^2.0.3", + "semver": "^7.3.2", + "shelljs": "^0.8.4", + "typedoc-default-themes": "^0.11.1" + }, + "bin": { + "typedoc": "bin/typedoc" + }, + "engines": { + "node": ">= 10.0.0" + }, + "peerDependencies": { + "typescript": "3.9.x || 4.0.x" + } + }, + "node_modules/typedoc-default-themes": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.3.tgz", + "integrity": "sha512-SwyN188QGNA2iFS5mdWYTGzohKqJ1PWAXVmGolKnVc2NnpX234FEPF2nUvEg+O9jjwAu7ZSVZ5UrZri0raJOjQ==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/typedoc/node_modules/handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/typedoc/node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/typedoc/node_modules/semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/typescript": { + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uglify-js": { + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", + "dev": true, + "optional": true, + "dependencies": { + "commander": "~2.17.1", + "source-map": "~0.6.1" + }, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/uglify-js/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "dev": true, + "optional": true, + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true, + "optional": true + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "optional": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dev": true, + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true, + "engines": { + "node": ">=10.4" + } + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", + "dev": true, + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/yargs-unparser": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", + "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", + "dev": true, + "dependencies": { + "flat": "^4.1.0", + "lodash": "^4.17.15", + "yargs": "^13.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/yargs-unparser/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "dependencies": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/yargs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/yargs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, "dependencies": { "@babel/code-frame": { "version": "7.10.4", @@ -40,7 +5917,8 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true + "dev": true, + "requires": {} }, "@firebase/component": { "version": "0.5.0", @@ -3863,6 +9741,25 @@ "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", "dev": true }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "optional": true + } + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -3893,25 +9790,6 @@ "es-abstract": "^1.17.5" } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "optional": true - } - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -4459,7 +10337,8 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", - "dev": true + "dev": true, + "requires": {} }, "xdg-basedir": { "version": "4.0.0", diff --git a/src/logger/index.ts b/src/logger/index.ts index 24483087c..81d1a0899 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -30,6 +30,7 @@ export interface LogEntry { [key: string]: any; } +/** @internal */ function removeCircular(obj: any, refs: any[] = []): any { if (typeof obj !== 'object' || !obj) { return obj; From e88a15a8262e43cc6f508e7cffa3fa5c687d939e Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 14 Jul 2021 11:23:10 -0700 Subject: [PATCH 319/705] Moves most of https pacakge into /common/providers/https. (#915) Moves most of https pacakge into /common/providers/https. The actual encoding/decoding/error logic etc. of callable functions will stay the same between v1 and v2, so they should be in a /common file. The rest of /v1 is about trigger options, cors, etc. onCall's CORS options are part of the v1 namespace because v2 adds a "cors" option to HttpsOptions. In the v2 API, we will default to `"cors": true`, but a customer could say `"cors": "my.firebase.app"` and we will respsect it. I wish there was a way to make this diff not so noisy. Most of this is cut & paste. --- spec/common/providers/https.spec.ts | 551 ++++++++++++++++++++++++ spec/v1/function-builder.spec.ts | 4 +- spec/v1/providers/https.spec.ts | 627 ++++------------------------ src/common/encoding.ts | 66 +++ src/common/providers/https.ts | 605 +++++++++++++++++++++++++++ src/v1/cloud-functions.ts | 118 +++--- src/v1/function-configuration.ts | 18 +- src/v1/providers/https.ts | 591 +------------------------- 8 files changed, 1383 insertions(+), 1197 deletions(-) create mode 100644 spec/common/providers/https.spec.ts create mode 100644 src/common/encoding.ts create mode 100644 src/common/providers/https.ts diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts new file mode 100644 index 000000000..66c8e661c --- /dev/null +++ b/spec/common/providers/https.spec.ts @@ -0,0 +1,551 @@ +import { expect } from 'chai'; +import * as express from 'express'; +import * as firebase from 'firebase-admin'; + +import * as https from '../../../src/common/providers/https'; +import { apps as appsNamespace } from '../../../src/v1/apps'; +import * as mocks from '../../fixtures/credential/key.json'; +import { + expectedResponseHeaders, + generateAppCheckToken, + generateIdToken, + mockFetchAppCheckPublicJwks, + mockFetchPublicKeys, + mockRequest, +} from '../../fixtures/mockrequest'; + +/** + * RunHandlerResult contains the data from an express.Response. + */ +interface RunHandlerResult { + status: number; + headers: { [name: string]: string }; + body: any; +} + +/** + * A CallTest is a specification for a test of a callable function that + * simulates triggering the http endpoint, and checks that the request + * and response are properly converted to their http equivalents. + */ +interface CallTest { + // An http request, mocking a subset of https.Request. + httpRequest: any; + + // The expected format of the request passed to the handler. + expectedData: any; + + // The function to execute with the request. + callableFunction: (data: any, context: https.CallableContext) => any; + + // The expected shape of the http response returned to the callable SDK. + expectedHttpResponse: RunHandlerResult; +} + +/** + * Runs an express handler with a given request asynchronously and returns the + * data populated into the response. + */ +function runHandler( + handler: express.Handler, + request: https.Request +): Promise { + return new Promise((resolve, reject) => { + // MockResponse mocks an express.Response. + // This class lives here so it can reference resolve and reject. + class MockResponse { + private statusCode = 0; + private headers: { [name: string]: string } = {}; + + public status(code: number) { + this.statusCode = code; + return this; + } + + // Headers are only set by the cors handler. + public setHeader(name: string, value: string) { + this.headers[name] = value; + } + + public getHeader(name: string): string { + return this.headers[name]; + } + + public send(body: any) { + resolve({ + status: this.statusCode, + headers: this.headers, + body, + }); + } + + public end() { + this.send(undefined); + } + } + + const response = new MockResponse(); + handler(request, response as any, () => undefined); + }); +} + +// Runs a CallTest test. +async function runTest(test: CallTest): Promise { + const opts = { origin: true, methods: 'POST' }; + const callableFunction = https.onCallHandler(opts, (data, context) => { + expect(data).to.deep.equal(test.expectedData); + return test.callableFunction(data, context); + }); + + const response = await runHandler(callableFunction, test.httpRequest); + + expect(response.body).to.deep.equal(test.expectedHttpResponse.body); + expect(response.headers).to.deep.equal(test.expectedHttpResponse.headers); + expect(response.status).to.equal(test.expectedHttpResponse.status); +} + +describe('onCallHandler', () => { + let app: firebase.app.App; + + before(() => { + const credential = { + getAccessToken: () => { + return Promise.resolve({ + expires_in: 1000, + access_token: 'fake', + }); + }, + getCertificate: () => { + return { + projectId: 'aProjectId', + }; + }, + }; + app = firebase.initializeApp({ + projectId: 'aProjectId', + credential, + }); + Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); + }); + + after(() => { + app.delete(); + delete appsNamespace.singleton; + }); + + it('should handle success', () => { + return runTest({ + httpRequest: mockRequest({ foo: 'bar' }), + expectedData: { foo: 'bar' }, + callableFunction: (data, context) => ({ baz: 'qux' }), + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: { baz: 'qux' } }, + }, + }); + }); + + it('should handle null data and return', () => { + return runTest({ + httpRequest: mockRequest(null), + expectedData: null, + callableFunction: (data, context) => null, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + + it('should handle void return', () => { + return runTest({ + httpRequest: mockRequest(null), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + + it('should reject bad method', () => { + const req = mockRequest(null); + req.method = 'GET'; + return runTest({ + httpRequest: req, + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 400, + headers: expectedResponseHeaders, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, + }, + }); + }); + + it('should ignore charset', () => { + return runTest({ + httpRequest: mockRequest(null, 'application/json; charset=utf-8'), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + + it('should reject bad content type', () => { + return runTest({ + httpRequest: mockRequest(null, 'text/plain'), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 400, + headers: expectedResponseHeaders, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, + }, + }); + }); + + it('should reject extra body fields', () => { + const req = mockRequest(null); + req.body.extra = 'bad'; + return runTest({ + httpRequest: req, + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 400, + headers: expectedResponseHeaders, + body: { + error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, + }, + }, + }); + }); + + it('should handle unhandled error', () => { + return runTest({ + httpRequest: mockRequest(null), + expectedData: null, + callableFunction: (data, context) => { + throw new Error(`ceci n'est pas une error`); + }, + expectedHttpResponse: { + status: 500, + headers: expectedResponseHeaders, + body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, + }, + }); + }); + + it('should handle unknown error status', () => { + return runTest({ + httpRequest: mockRequest(null), + expectedData: null, + callableFunction: (data, context) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, + expectedHttpResponse: { + status: 500, + headers: expectedResponseHeaders, + body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, + }, + }); + }); + + it('should handle well-formed error', () => { + return runTest({ + httpRequest: mockRequest(null), + expectedData: null, + callableFunction: (data, context) => { + throw new https.HttpsError('not-found', 'i am error'); + }, + expectedHttpResponse: { + status: 404, + headers: expectedResponseHeaders, + body: { error: { status: 'NOT_FOUND', message: 'i am error' } }, + }, + }); + }); + + it('should handle auth', async () => { + const mock = mockFetchPublicKeys(); + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateIdToken(projectId); + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + callableFunction: (data, context) => { + expect(context.auth).to.not.be.undefined; + expect(context.auth).to.not.be.null; + expect(context.auth.uid).to.equal(mocks.user_id); + expect(context.auth.token.uid).to.equal(mocks.user_id); + expect(context.auth.token.sub).to.equal(mocks.user_id); + expect(context.auth.token.aud).to.equal(projectId); + expect(context.instanceIdToken).to.be.undefined; + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + mock.done(); + }); + + it('should reject bad auth', async () => { + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer FAKE', + }), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 401, + headers: expectedResponseHeaders, + body: { + error: { + status: 'UNAUTHENTICATED', + message: 'Unauthenticated', + }, + }, + }, + }); + }); + + it('should handle AppCheck token', async () => { + const mock = mockFetchAppCheckPublicJwks(); + const projectId = appsNamespace().admin.options.projectId; + const appId = '1:65211879909:web:3ae38ef1cdcb2e01fe5f0c'; + const appCheckToken = generateAppCheckToken(projectId, appId); + await runTest({ + httpRequest: mockRequest(null, 'application/json', { appCheckToken }), + expectedData: null, + callableFunction: (data, context) => { + expect(context.app).to.not.be.undefined; + expect(context.app).to.not.be.null; + expect(context.app.appId).to.equal(appId); + expect(context.app.token.app_id).to.be.equal(appId); + expect(context.app.token.sub).to.be.equal(appId); + expect(context.app.token.aud).to.be.deep.equal([ + `projects/${projectId}`, + ]); + expect(context.auth).to.be.undefined; + expect(context.instanceIdToken).to.be.undefined; + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + mock.done(); + }); + + it('should reject bad AppCheck token', async () => { + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + appCheckToken: 'FAKE', + }), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + expectedHttpResponse: { + status: 401, + headers: expectedResponseHeaders, + body: { + error: { + status: 'UNAUTHENTICATED', + message: 'Unauthenticated', + }, + }, + }, + }); + }); + + it('should handle instance id', async () => { + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + instanceIdToken: 'iid-token', + }), + expectedData: null, + callableFunction: (data, context) => { + expect(context.auth).to.be.undefined; + expect(context.instanceIdToken).to.equal('iid-token'); + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + + it('should expose raw request', async () => { + const mockReq = mockRequest(null, 'application/json', {}); + await runTest({ + httpRequest: mockReq, + expectedData: null, + callableFunction: (data, context) => { + expect(context.rawRequest).to.not.be.undefined; + expect(context.rawRequest).to.equal(mockReq); + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); +}); + +describe('encoding/decoding', () => { + it('encodes null', () => { + expect(https.encode(null)).to.be.null; + expect(https.encode(undefined)).to.be.null; + }); + + it('encodes int', () => { + expect(https.encode(1)).to.equal(1); + // Number isn't allowed in our own codebase, but we need to test it, in case + // a user passes one in. There's no reason not to support it, and we don't + // want to unintentionally encode them as {}. + // tslint:disable-next-line + expect(https.encode(new Number(1))).to.equal(1); + }); + + it('decodes int', () => { + expect(https.decode(1)).to.equal(1); + }); + + it('encodes long', () => { + expect(https.encode(-9223372036854775000)).to.equal(-9223372036854775000); + }); + + it('decodes long', () => { + expect( + https.decode({ + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + value: '-9223372036854775000', + }) + ).to.equal(-9223372036854775000); + }); + + it('encodes unsigned long', () => { + expect(https.encode(9223372036854800000)).to.equal(9223372036854800000); + }); + + it('decodes unsigned long', () => { + expect( + https.decode({ + '@type': 'type.googleapis.com/google.protobuf.UInt64Value', + value: '9223372036854800000', + }) + ).to.equal(9223372036854800000); + }); + + it('encodes double', () => { + expect(https.encode(1.2)).to.equal(1.2); + }); + + it('decodes double', () => { + expect(https.decode(1.2)).to.equal(1.2); + }); + + it('encodes string', () => { + expect(https.encode('hello')).to.equal('hello'); + }); + + it('decodes string', () => { + expect(https.decode('hello')).to.equal('hello'); + }); + + it('encodes array', () => { + // TODO(klimt): Make this test more interesting once there's some type + // that needs encoding that can be created from JavaScript. + expect(https.encode([1, '2', [3, 4]])).to.deep.equal([1, '2', [3, 4]]); + }); + + it('decodes array', () => { + expect( + https.decode([ + 1, + '2', + [ + 3, + { + value: '1099511627776', + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + }, + ], + ]) + ).to.deep.equal([1, '2', [3, 1099511627776]]); + }); + + it('encodes object', () => { + // TODO(klimt): Make this test more interesting once there's some type + // that needs encoding that can be created from JavaScript. + expect( + https.encode({ + foo: 1, + bar: 'hello', + baz: [1, 2, 3], + }) + ).to.deep.equal({ + foo: 1, + bar: 'hello', + baz: [1, 2, 3], + }); + }); + + it('decodes object', () => { + expect( + https.decode({ + foo: 1, + bar: 'hello', + baz: [ + 1, + 2, + { + value: '1099511627776', + '@type': 'type.googleapis.com/google.protobuf.Int64Value', + }, + ], + }) + ).to.deep.equal({ + foo: 1, + bar: 'hello', + baz: [1, 2, 1099511627776], + }); + }); +}); diff --git a/spec/v1/function-builder.spec.ts b/spec/v1/function-builder.spec.ts index 431d018ac..bfb9e99fc 100644 --- a/spec/v1/function-builder.spec.ts +++ b/spec/v1/function-builder.spec.ts @@ -287,7 +287,7 @@ describe('FunctionBuilder', () => { ); }); - it('should not set a serviceAccountEmail if service account is set to `default`', () => { + it('should set a null serviceAccountEmail if service account is set to `default`', () => { const serviceAccount = 'default'; const fn = functions .runWith({ @@ -296,7 +296,7 @@ describe('FunctionBuilder', () => { .auth.user() .onCreate((user) => user); - expect(fn.__trigger.serviceAccountEmail).to.be.undefined; + expect(fn.__trigger.serviceAccountEmail).to.be.null; }); it('should throw an error if serviceAccount is set to an invalid value', () => { diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index b34e29e6e..f41ae00fe 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -22,64 +22,15 @@ import { expect } from 'chai'; import * as express from 'express'; -import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import * as functions from '../../../src/index'; -import { apps as appsNamespace } from '../../../src/v1/apps'; import * as https from '../../../src/v1/providers/https'; -import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, - generateAppCheckToken, - generateIdToken, - mockFetchAppCheckPublicJwks, - mockFetchPublicKeys, MockRequest, - mockRequest, } from '../../fixtures/mockrequest'; -describe('CloudHttpsBuilder', () => { - describe('#onRequest', () => { - it('should return a Trigger with appropriate values', () => { - const result = https.onRequest((req, resp) => { - resp.send(200); - }); - expect(result.__trigger).to.deep.equal({ httpsTrigger: {} }); - }); - - it('should allow both region and runtime options to be set', () => { - const fn = functions - .region('us-east1') - .runWith({ - timeoutSeconds: 90, - memory: '256MB', - }) - .https.onRequest(() => null); - - expect(fn.__trigger.regions).to.deep.equal(['us-east1']); - expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); - expect(fn.__trigger.timeout).to.deep.equal('90s'); - }); - }); -}); - -describe('handler namespace', () => { - describe('#onRequest', () => { - it('should return an empty trigger', () => { - const result = functions.handler.https.onRequest((req, res) => { - res.send(200); - }); - expect(result.__trigger).to.deep.equal({}); - }); - }); - - describe('#onCall', () => { - it('should return an empty trigger', () => { - const result = functions.handler.https.onCall(() => null); - expect(result.__trigger).to.deep.equal({}); - }); - }); -}); +// TODO(inlined) dedup this between v1, common, etc. /** * RunHandlerResult contains the data from an express.Response. @@ -90,29 +41,6 @@ interface RunHandlerResult { body: any; } -/** - * A CallTest is a specification for a test of a callable function that - * simulates triggering the http endpoint, and checks that the request - * and response are properly converted to their http equivalents. - */ -interface CallTest { - // An http request, mocking a subset of https.Request. - httpRequest: any; - - // The expected format of the request passed to the handler. - expectedData: any; - - // The function to execute with the request. - callableFunction: (data: any, context: https.CallableContext) => any; - - // The expected shape of the http response returned to the callable SDK. - expectedHttpResponse: RunHandlerResult; -} - -/** - * Runs an express handler with a given request asynchronously and returns the - * data populated into the response. - */ function runHandler( handler: express.Handler, request: https.Request @@ -156,353 +84,13 @@ function runHandler( }); } -// Runs a CallTest test. -async function runTest(test: CallTest): Promise { - const callableFunction = https.onCall((data, context) => { - expect(data).to.deep.equal(test.expectedData); - return test.callableFunction(data, context); - }); - - const response = await runHandler(callableFunction, test.httpRequest); - - expect(response.body).to.deep.equal(test.expectedHttpResponse.body); - expect(response.headers).to.deep.equal(test.expectedHttpResponse.headers); - expect(response.status).to.equal(test.expectedHttpResponse.status); -} - -describe('callable.FunctionBuilder', () => { - let app: firebase.app.App; - - before(() => { - const credential = { - getAccessToken: () => { - return Promise.resolve({ - expires_in: 1000, - access_token: 'fake', - }); - }, - getCertificate: () => { - return { - projectId: 'aProjectId', - }; - }, - }; - app = firebase.initializeApp({ - projectId: 'aProjectId', - credential, - }); - Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); - }); - - after(() => { - app.delete(); - delete appsNamespace.singleton; - }); - - describe('#onCall', () => { +describe('CloudHttpsBuilder', () => { + describe('#onRequest', () => { it('should return a Trigger with appropriate values', () => { - const result = https.onCall((data) => { - return 'response'; - }); - expect(result.__trigger).to.deep.equal({ - httpsTrigger: {}, - labels: { 'deployment-callable': 'true' }, - }); - }); - - it('should handle success', () => { - return runTest({ - httpRequest: mockRequest({ foo: 'bar' }), - expectedData: { foo: 'bar' }, - callableFunction: (data, context) => ({ baz: 'qux' }), - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: { baz: 'qux' } }, - }, - }); - }); - - it('should handle null data and return', () => { - return runTest({ - httpRequest: mockRequest(null), - expectedData: null, - callableFunction: (data, context) => null, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - }); - - it('should handle void return', () => { - return runTest({ - httpRequest: mockRequest(null), - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - }); - - it('should reject bad method', () => { - const req = mockRequest(null); - req.method = 'GET'; - return runTest({ - httpRequest: req, - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 400, - headers: expectedResponseHeaders, - body: { - error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, - }, - }, - }); - }); - - it('should ignore charset', () => { - return runTest({ - httpRequest: mockRequest(null, 'application/json; charset=utf-8'), - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - }); - - it('should reject bad content type', () => { - return runTest({ - httpRequest: mockRequest(null, 'text/plain'), - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 400, - headers: expectedResponseHeaders, - body: { - error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, - }, - }, - }); - }); - - it('should reject extra body fields', () => { - const req = mockRequest(null); - req.body.extra = 'bad'; - return runTest({ - httpRequest: req, - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 400, - headers: expectedResponseHeaders, - body: { - error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' }, - }, - }, - }); - }); - - it('should handle unhandled error', () => { - return runTest({ - httpRequest: mockRequest(null), - expectedData: null, - callableFunction: (data, context) => { - throw new Error(`ceci n'est pas une error`); - }, - expectedHttpResponse: { - status: 500, - headers: expectedResponseHeaders, - body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, - }, - }); - }); - - it('should handle unknown error status', () => { - return runTest({ - httpRequest: mockRequest(null), - expectedData: null, - callableFunction: (data, context) => { - throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); - }, - expectedHttpResponse: { - status: 500, - headers: expectedResponseHeaders, - body: { error: { status: 'INTERNAL', message: 'INTERNAL' } }, - }, - }); - }); - - it('should handle well-formed error', () => { - return runTest({ - httpRequest: mockRequest(null), - expectedData: null, - callableFunction: (data, context) => { - throw new https.HttpsError('not-found', 'i am error'); - }, - expectedHttpResponse: { - status: 404, - headers: expectedResponseHeaders, - body: { error: { status: 'NOT_FOUND', message: 'i am error' } }, - }, - }); - }); - - it('should handle auth', async () => { - const mock = mockFetchPublicKeys(); - const projectId = appsNamespace().admin.options.projectId; - const idToken = generateIdToken(projectId); - await runTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer ' + idToken, - }), - expectedData: null, - callableFunction: (data, context) => { - expect(context.auth).to.not.be.undefined; - expect(context.auth).to.not.be.null; - expect(context.auth.uid).to.equal(mocks.user_id); - expect(context.auth.token.uid).to.equal(mocks.user_id); - expect(context.auth.token.sub).to.equal(mocks.user_id); - expect(context.auth.token.aud).to.equal(projectId); - expect(context.instanceIdToken).to.be.undefined; - return null; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - mock.done(); - }); - - it('should reject bad auth', async () => { - await runTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer FAKE', - }), - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 401, - headers: expectedResponseHeaders, - body: { - error: { - status: 'UNAUTHENTICATED', - message: 'Unauthenticated', - }, - }, - }, - }); - }); - - it('should handle AppCheck token', async () => { - const mock = mockFetchAppCheckPublicJwks(); - const projectId = appsNamespace().admin.options.projectId; - const appId = '1:65211879909:web:3ae38ef1cdcb2e01fe5f0c'; - const appCheckToken = generateAppCheckToken(projectId, appId); - await runTest({ - httpRequest: mockRequest(null, 'application/json', { appCheckToken }), - expectedData: null, - callableFunction: (data, context) => { - expect(context.app).to.not.be.undefined; - expect(context.app).to.not.be.null; - expect(context.app.appId).to.equal(appId); - expect(context.app.token.app_id).to.be.equal(appId); - expect(context.app.token.sub).to.be.equal(appId); - expect(context.app.token.aud).to.be.deep.equal([ - `projects/${projectId}`, - ]); - expect(context.auth).to.be.undefined; - expect(context.instanceIdToken).to.be.undefined; - return null; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - mock.done(); - }); - - it('should reject bad AppCheck token', async () => { - await runTest({ - httpRequest: mockRequest(null, 'application/json', { - appCheckToken: 'FAKE', - }), - expectedData: null, - callableFunction: (data, context) => { - return; - }, - expectedHttpResponse: { - status: 401, - headers: expectedResponseHeaders, - body: { - error: { - status: 'UNAUTHENTICATED', - message: 'Unauthenticated', - }, - }, - }, - }); - }); - - it('should handle instance id', async () => { - await runTest({ - httpRequest: mockRequest(null, 'application/json', { - instanceIdToken: 'iid-token', - }), - expectedData: null, - callableFunction: (data, context) => { - expect(context.auth).to.be.undefined; - expect(context.instanceIdToken).to.equal('iid-token'); - return null; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, - }); - }); - - it('should expose raw request', async () => { - const mockReq = mockRequest(null, 'application/json', {}); - await runTest({ - httpRequest: mockReq, - expectedData: null, - callableFunction: (data, context) => { - expect(context.rawRequest).to.not.be.undefined; - expect(context.rawRequest).to.equal(mockReq); - return null; - }, - expectedHttpResponse: { - status: 200, - headers: expectedResponseHeaders, - body: { result: null }, - }, + const result = https.onRequest((req, resp) => { + resp.send(200); }); + expect(result.__trigger).to.deep.equal({ httpsTrigger: {} }); }); it('should allow both region and runtime options to be set', () => { @@ -512,31 +100,75 @@ describe('callable.FunctionBuilder', () => { timeoutSeconds: 90, memory: '256MB', }) - .https.onCall(() => null); + .https.onRequest(() => null); expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); }); + }); +}); - it('has a .run method', () => { - const cf = https.onCall((d, c) => { - return { data: d, context: c }; +describe('handler namespace', () => { + describe('#onRequest', () => { + it('should return an empty trigger', () => { + const result = functions.handler.https.onRequest((req, res) => { + res.send(200); }); + expect(result.__trigger).to.deep.equal({}); + }); + }); - const data = 'data'; - const context = { - instanceIdToken: 'token', - auth: { - uid: 'abc', - token: 'token', - }, - }; - expect(cf.run(data, context)).to.deep.equal({ data, context }); + describe('#onCall', () => { + it('should return an empty trigger', () => { + const result = functions.handler.https.onCall(() => null); + expect(result.__trigger).to.deep.equal({}); }); }); }); +describe('#onCall', () => { + it('should return a Trigger with appropriate values', () => { + const result = https.onCall((data) => { + return 'response'; + }); + expect(result.__trigger).to.deep.equal({ + httpsTrigger: {}, + labels: { 'deployment-callable': 'true' }, + }); + }); + + it('should allow both region and runtime options to be set', () => { + const fn = functions + .region('us-east1') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .https.onCall(() => null); + + expect(fn.__trigger.regions).to.deep.equal(['us-east1']); + expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); + expect(fn.__trigger.timeout).to.deep.equal('90s'); + }); + + it('has a .run method', () => { + const cf = https.onCall((d, c) => { + return { data: d, context: c }; + }); + + const data = 'data'; + const context = { + instanceIdToken: 'token', + auth: { + uid: 'abc', + token: 'token', + }, + }; + expect(cf.run(data, context)).to.deep.equal({ data, context }); + }); +}); + describe('callable CORS', () => { it('handles OPTIONS preflight', async () => { const func = https.onCall((data, context) => { @@ -565,125 +197,24 @@ describe('callable CORS', () => { Vary: 'Origin, Access-Control-Request-Headers', }); }); -}); - -describe('callable', () => { - it('encodes null', () => { - expect(https.encode(null)).to.be.null; - expect(https.encode(undefined)).to.be.null; - }); - - it('encodes int', () => { - expect(https.encode(1)).to.equal(1); - // Number isn't allowed in our own codebase, but we need to test it, in case - // a user passes one in. There's no reason not to support it, and we don't - // want to unintentionally encode them as {}. - // tslint:disable-next-line - expect(https.encode(new Number(1))).to.equal(1); - }); - - it('decodes int', () => { - expect(https.decode(1)).to.equal(1); - }); - - it('encodes long', () => { - expect(https.encode(-9223372036854775000)).to.equal(-9223372036854775000); - }); - - it('decodes long', () => { - expect( - https.decode({ - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - value: '-9223372036854775000', - }) - ).to.equal(-9223372036854775000); - }); - - it('encodes unsigned long', () => { - expect(https.encode(9223372036854800000)).to.equal(9223372036854800000); - }); - - it('decodes unsigned long', () => { - expect( - https.decode({ - '@type': 'type.googleapis.com/google.protobuf.UInt64Value', - value: '9223372036854800000', - }) - ).to.equal(9223372036854800000); - }); - it('encodes double', () => { - expect(https.encode(1.2)).to.equal(1.2); - }); - - it('decodes double', () => { - expect(https.decode(1.2)).to.equal(1.2); - }); - - it('encodes string', () => { - expect(https.encode('hello')).to.equal('hello'); - }); - - it('decodes string', () => { - expect(https.decode('hello')).to.equal('hello'); - }); - - it('encodes array', () => { - // TODO(klimt): Make this test more interesting once there's some type - // that needs encoding that can be created from JavaScript. - expect(https.encode([1, '2', [3, 4]])).to.deep.equal([1, '2', [3, 4]]); - }); - - it('decodes array', () => { - expect( - https.decode([ - 1, - '2', - [ - 3, - { - value: '1099511627776', - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - }, - ], - ]) - ).to.deep.equal([1, '2', [3, 1099511627776]]); - }); + it('adds CORS headers', async () => { + const func = https.onCall((data, context) => 42); + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; - it('encodes object', () => { - // TODO(klimt): Make this test more interesting once there's some type - // that needs encoding that can be created from JavaScript. - expect( - https.encode({ - foo: 1, - bar: 'hello', - baz: [1, 2, 3], - }) - ).to.deep.equal({ - foo: 1, - bar: 'hello', - baz: [1, 2, 3], - }); - }); + const response = await runHandler(func, req as any); - it('decodes object', () => { - expect( - https.decode({ - foo: 1, - bar: 'hello', - baz: [ - 1, - 2, - { - value: '1099511627776', - '@type': 'type.googleapis.com/google.protobuf.Int64Value', - }, - ], - }) - ).to.deep.equal({ - foo: 1, - bar: 'hello', - baz: [1, 2, 1099511627776], - }); + expect(response.status).to.equal(200); + expect(response.body).to.be.deep.equal({ result: 42 }); + expect(response.headers).to.deep.equal(expectedResponseHeaders); }); }); diff --git a/src/common/encoding.ts b/src/common/encoding.ts new file mode 100644 index 000000000..4fe2e2729 --- /dev/null +++ b/src/common/encoding.ts @@ -0,0 +1,66 @@ +// Copied from firebase-tools/src/gcp/proto + +/** + * A type alias used to annotate interfaces as using a google.protobuf.Duration. + * This type is parsed/encoded as a string of seconds + the "s" prefix. + */ +export type Duration = string; + +/** Get a google.protobuf.Duration for a number of seconds. */ +export function durationFromSeconds(s: number): Duration { + return `${s}s`; +} + +/** + * Utility function to help copy fields from type A to B. + * As a safety net, catches typos or fields that aren't named the same + * in A and B, but cannot verify that both Src and Dest have the same type for the same field. + */ +export function copyIfPresent( + dest: Dest, + src: Src, + ...fields: Array +) { + for (const field of fields) { + if (!Object.prototype.hasOwnProperty.call(src, field)) { + continue; + } + dest[field] = src[field] as any; + } +} + +export function convertIfPresent( + dest: Dest, + src: Src, + destField: keyof Dest, + srcField: keyof Src, + converter: (from: any) => any = (from: any) => { + return from; + } +) { + if (!Object.prototype.hasOwnProperty.call(src, srcField)) { + return; + } + dest[destField] = converter(src[srcField]); +} + +export function serviceAccountFromShorthand( + serviceAccount: string +): string | null { + if (serviceAccount === 'default') { + return null; + } else if (serviceAccount.endsWith('@')) { + if (!process.env.GCLOUD_PROJECT) { + throw new Error( + `Unable to determine email for service account '${serviceAccount}' because process.env.GCLOUD_PROJECT is not set.` + ); + } + return `${serviceAccount}${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`; + } else if (serviceAccount.includes('@')) { + return serviceAccount; + } else { + throw new Error( + `Invalid option for serviceAccount: '${serviceAccount}'. Valid options are 'default', a service account email, or '{serviceAccountName}@'` + ); + } +} diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts new file mode 100644 index 000000000..1b3d93a8b --- /dev/null +++ b/src/common/providers/https.ts @@ -0,0 +1,605 @@ +// 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. + +import * as cors from 'cors'; +import * as express from 'express'; +import * as firebase from 'firebase-admin'; + +import * as logger from '../../logger'; + +// TODO(inlined): Decide whether we want to un-version apps or whether we want a +// different strategy +import { apps } from '../../v1/apps'; + +/** @hidden */ +export interface Request extends express.Request { + rawBody: Buffer; +} + +/** + * The interface for metadata for the API as passed to the handler. + */ +export interface CallableContext { + /** + * The result of decoding and verifying a Firebase AppCheck token. + */ + app?: { + appId: string; + + // This is actually a firebase.appCheck.DecodedAppCheckToken, but + // that type may not be available in some supported SDK versions. + // Declare as an inline type, which DecodedAppCheckToken will be + // able to merge with. + // TODO: Replace with the real type once we bump the min-version of + // the admin SDK + token: { + /** + * The issuer identifier for the issuer of the response. + * + * This value is a URL with the format + * `https://firebaseappcheck.googleapis.com/`, where `` is the + * same project number specified in the [`aud`](#aud) property. + */ + iss: string; + + /** + * The Firebase App ID corresponding to the app the token belonged to. + * + * As a convenience, this value is copied over to the [`app_id`](#app_id) property. + */ + sub: string; + + /** + * The audience for which this token is intended. + * + * This value is a JSON array of two strings, the first is the project number of your + * Firebase project, and the second is the project ID of the same project. + */ + aud: string[]; + + /** + * The App Check token's expiration time, in seconds since the Unix epoch. That is, the + * time at which this App Check token expires and should no longer be considered valid. + */ + exp: number; + + /** + * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the + * time at which this App Check token was issued and should start to be considered + * valid. + */ + iat: number; + + /** + * The App ID corresponding to the App the App Check token belonged to. + * + * This value is not actually one of the JWT token claims. It is added as a + * convenience, and is set as the value of the [`sub`](#sub) property. + */ + app_id: string; + [key: string]: any; + }; + }; + + /** + * The result of decoding and verifying a Firebase Auth ID token. + */ + auth?: { + uid: string; + token: firebase.auth.DecodedIdToken; + }; + + /** + * An unverified token for a Firebase Instance ID. + */ + instanceIdToken?: string; + + /** + * The raw request handled by the callable. + */ + rawRequest: Request; +} + +/** + * The set of Firebase Functions status codes. The codes are the same at the + * ones exposed by gRPC here: + * https://github.com/grpc/grpc/blob/master/doc/statuscodes.md + * + * Possible values: + * - 'cancelled': The operation was cancelled (typically by the caller). + * - 'unknown': Unknown error or an error from a different error domain. + * - 'invalid-argument': Client specified an invalid argument. Note that this + * differs from 'failed-precondition'. 'invalid-argument' indicates + * arguments that are problematic regardless of the state of the system + * (e.g. an invalid field name). + * - 'deadline-exceeded': Deadline expired before operation could complete. + * For operations that change the state of the system, this error may be + * returned even if the operation has completed successfully. For example, + * a successful response from a server could have been delayed long enough + * for the deadline to expire. + * - 'not-found': Some requested document was not found. + * - 'already-exists': Some document that we attempted to create already + * exists. + * - 'permission-denied': The caller does not have permission to execute the + * specified operation. + * - 'resource-exhausted': Some resource has been exhausted, perhaps a + * per-user quota, or perhaps the entire file system is out of space. + * - 'failed-precondition': Operation was rejected because the system is not + * in a state required for the operation's execution. + * - 'aborted': The operation was aborted, typically due to a concurrency + * issue like transaction aborts, etc. + * - 'out-of-range': Operation was attempted past the valid range. + * - 'unimplemented': Operation is not implemented or not supported/enabled. + * - 'internal': Internal errors. Means some invariants expected by + * underlying system has been broken. If you see one of these errors, + * something is very broken. + * - 'unavailable': The service is currently unavailable. This is most likely + * a transient condition and may be corrected by retrying with a backoff. + * - 'data-loss': Unrecoverable data loss or corruption. + * - 'unauthenticated': The request does not have valid authentication + * credentials for the operation. + */ +export type FunctionsErrorCode = + | 'ok' + | 'cancelled' + | 'unknown' + | 'invalid-argument' + | 'deadline-exceeded' + | 'not-found' + | 'already-exists' + | 'permission-denied' + | 'resource-exhausted' + | 'failed-precondition' + | 'aborted' + | 'out-of-range' + | 'unimplemented' + | 'internal' + | 'unavailable' + | 'data-loss' + | 'unauthenticated'; + +/** @hidden */ +export type CanonicalErrorCodeName = + | 'OK' + | 'CANCELLED' + | 'UNKNOWN' + | 'INVALID_ARGUMENT' + | 'DEADLINE_EXCEEDED' + | 'NOT_FOUND' + | 'ALREADY_EXISTS' + | 'PERMISSION_DENIED' + | 'UNAUTHENTICATED' + | 'RESOURCE_EXHAUSTED' + | 'FAILED_PRECONDITION' + | 'ABORTED' + | 'OUT_OF_RANGE' + | 'UNIMPLEMENTED' + | 'INTERNAL' + | 'UNAVAILABLE' + | 'DATA_LOSS'; + +/** @hidden */ +interface HttpErrorCode { + canonicalName: CanonicalErrorCodeName; + status: number; +} + +/** + * Standard error codes and HTTP statuses for different ways a request can fail, + * as defined by: + * https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto + * + * This map is used primarily to convert from a client error code string to + * to the HTTP format error code string and status, and make sure it's in the + * supported set. + */ +const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { + ok: { canonicalName: 'OK', status: 200 }, + cancelled: { canonicalName: 'CANCELLED', status: 499 }, + unknown: { canonicalName: 'UNKNOWN', status: 500 }, + 'invalid-argument': { canonicalName: 'INVALID_ARGUMENT', status: 400 }, + 'deadline-exceeded': { canonicalName: 'DEADLINE_EXCEEDED', status: 504 }, + 'not-found': { canonicalName: 'NOT_FOUND', status: 404 }, + 'already-exists': { canonicalName: 'ALREADY_EXISTS', status: 409 }, + 'permission-denied': { canonicalName: 'PERMISSION_DENIED', status: 403 }, + unauthenticated: { canonicalName: 'UNAUTHENTICATED', status: 401 }, + 'resource-exhausted': { canonicalName: 'RESOURCE_EXHAUSTED', status: 429 }, + 'failed-precondition': { canonicalName: 'FAILED_PRECONDITION', status: 400 }, + aborted: { canonicalName: 'ABORTED', status: 409 }, + 'out-of-range': { canonicalName: 'OUT_OF_RANGE', status: 400 }, + unimplemented: { canonicalName: 'UNIMPLEMENTED', status: 501 }, + internal: { canonicalName: 'INTERNAL', status: 500 }, + unavailable: { canonicalName: 'UNAVAILABLE', status: 503 }, + 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, +}; + +/** @hidden */ +interface HttpErrorWireFormat { + details?: unknown; + message: string; + status: CanonicalErrorCodeName; +} + +/** + * An explicit error that can be thrown from a handler to send an error to the + * client that called the function. + */ +export class HttpsError extends Error { + /** + * A standard error code that will be returned to the client. This also + * determines the HTTP status code of the response, as defined in code.proto. + */ + public readonly code: FunctionsErrorCode; + + /** + * Extra data to be converted to JSON and included in the error response. + */ + public readonly details: unknown; + + /** + * A wire format representation of a provided error code. + * + * @hidden + */ + public readonly httpErrorCode: HttpErrorCode; + + constructor(code: FunctionsErrorCode, message: string, details?: unknown) { + super(message); + + // A sanity check for non-TypeScript consumers. + if (code in errorCodeMap === false) { + throw new Error(`Unknown error code: ${code}.`); + } + + this.code = code; + this.details = details; + this.httpErrorCode = errorCodeMap[code]; + } + + public toJSON(): HttpErrorWireFormat { + const { + details, + httpErrorCode: { canonicalName: status }, + message, + } = this; + + return { + ...(details === undefined ? {} : { details }), + message, + status, + }; + } +} + +/** @hidden */ +// The allowed interface for an HTTP request to a Callable function. +interface HttpRequest extends Request { + body: { + data: any; + }; +} + +/** @hidden */ +// The format for an HTTP body response from a Callable function. +interface HttpResponseBody { + result?: any; + error?: HttpsError; +} + +/** @hidden */ +// Returns true if req is a properly formatted callable request. +function isValidRequest(req: Request): req is HttpRequest { + // The body must not be empty. + if (!req.body) { + logger.warn('Request is missing body.'); + return false; + } + + // Make sure it's a POST. + if (req.method !== 'POST') { + logger.warn('Request has invalid method.', req.method); + return false; + } + + // Check that the Content-Type is JSON. + let contentType = (req.header('Content-Type') || '').toLowerCase(); + // If it has a charset, just ignore it for now. + const semiColon = contentType.indexOf(';'); + if (semiColon >= 0) { + contentType = contentType.substr(0, semiColon).trim(); + } + if (contentType !== 'application/json') { + logger.warn('Request has incorrect Content-Type.', contentType); + return false; + } + + // The body must have data. + if (typeof req.body.data === 'undefined') { + logger.warn('Request body is missing data.', req.body); + return false; + } + + // TODO(klimt): Allow only specific http headers. + + // Verify that the body does not have any extra fields. + const extraKeys = Object.keys(req.body).filter((field) => field !== 'data'); + if (extraKeys.length !== 0) { + logger.warn('Request body has extra fields: ', extraKeys.join(', ')); + return false; + } + return true; +} + +/** @hidden */ +const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value'; +/** @hidden */ +const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value'; + +/** + * Encodes arbitrary data in our special format for JSON. + * This is exposed only for testing. + */ +/** @hidden */ +export function encode(data: any): any { + if (data === null || typeof data === 'undefined') { + return null; + } + if (data instanceof Number) { + data = data.valueOf(); + } + if (Number.isFinite(data)) { + // Any number in JS is safe to put directly in JSON and parse as a double + // without any loss of precision. + return data; + } + if (typeof data === 'boolean') { + return data; + } + if (typeof data === 'string') { + return data; + } + if (Array.isArray(data)) { + return data.map(encode); + } + if (typeof data === 'object') { + // Sadly we don't have Object.fromEntries in Node 10, so we can't use a single + // list comprehension + const obj: Record = {}; + for (const [k, v] of Object.entries(data)) { + obj[k] = encode(v); + } + return obj; + } + // If we got this far, the data is not encodable. + logger.error('Data cannot be encoded in JSON.', data); + throw new Error('Data cannot be encoded in JSON: ' + data); +} + +/** + * Decodes our special format for JSON into native types. + * This is exposed only for testing. + */ +/** @hidden */ +export function decode(data: any): any { + if (data === null) { + return data; + } + if (data['@type']) { + switch (data['@type']) { + case LONG_TYPE: + // Fall through and handle this the same as unsigned. + case UNSIGNED_LONG_TYPE: { + // Technically, this could work return a valid number for malformed + // data if there was a number followed by garbage. But it's just not + // worth all the extra code to detect that case. + const value = parseFloat(data.value); + if (isNaN(value)) { + logger.error('Data cannot be decoded from JSON.', data); + throw new Error('Data cannot be decoded from JSON: ' + data); + } + return value; + } + default: { + logger.error('Data cannot be decoded from JSON.', data); + throw new Error('Data cannot be decoded from JSON: ' + data); + } + } + } + if (Array.isArray(data)) { + return data.map(decode); + } + if (typeof data === 'object') { + const obj: Record = {}; + for (const [k, v] of Object.entries(data)) { + obj[k] = decode(v); + } + return obj; + } + // Anything else is safe to return. + return data; +} + +/** + * Be careful when changing token status values. + * + * Users are encouraged to setup log-based metric based on these values, and + * changing their values may cause their metrics to break. + * + */ +/** @hidden */ +type TokenStatus = 'MISSING' | 'VALID' | 'INVALID'; + +/** @hidden */ +interface CallableTokenStatus { + app: TokenStatus; + auth: TokenStatus; +} + +/** + * Check and verify tokens included in the requests. Once verified, tokens + * are injected into the callable context. + * + * @param {Request} req - Request sent to the Callable function. + * @param {CallableContext} ctx - Context to be sent to callable function handler. + * @return {CallableTokenStatus} Status of the token verifications. + */ +/** @hidden */ +async function checkTokens( + req: Request, + ctx: CallableContext +): Promise { + const verifications: CallableTokenStatus = { + app: 'MISSING', + auth: 'MISSING', + }; + + const appCheck = req.header('X-Firebase-AppCheck'); + if (appCheck) { + verifications.app = 'INVALID'; + try { + if (!apps().admin.appCheck) { + throw new Error( + 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' + ); + } + const appCheckToken = await apps() + .admin.appCheck() + .verifyToken(appCheck); + ctx.app = { + appId: appCheckToken.appId, + token: appCheckToken.token, + }; + verifications.app = 'VALID'; + } catch (err) { + logger.warn('Failed to validate AppCheck token.', err); + } + } + + const authorization = req.header('Authorization'); + if (authorization) { + verifications.auth = 'INVALID'; + const match = authorization.match(/^Bearer (.*)$/); + if (match) { + const idToken = match[1]; + try { + const authToken = await apps() + .admin.auth() + .verifyIdToken(idToken); + + verifications.auth = 'VALID'; + ctx.auth = { + uid: authToken.uid, + token: authToken, + }; + } catch (err) { + logger.warn('Failed to validate auth token.', err); + } + } + } + + const logPayload = { + verifications, + 'logging.googleapis.com/labels': { + 'firebase-log-type': 'callable-request-verification', + }, + }; + + const errs = []; + if (verifications.app === 'INVALID') { + errs.push('AppCheck token was rejected.'); + } + if (verifications.auth === 'INVALID') { + errs.push('Auth token was rejected.'); + } + + if (errs.length == 0) { + logger.info('Callable request verification passed', logPayload); + } else { + logger.warn( + `Callable request verification failed: ${errs.join(' ')}`, + logPayload + ); + } + + return verifications; +} + +/** @hidden */ +export function onCallHandler( + options: cors.CorsOptions, + handler: (data: any, context: CallableContext) => any | Promise +): (req: Request, res: express.Response) => Promise { + const wrapped = wrapOnCallHandler(handler); + return async (req: Request, res: express.Response) => { + cors(options)(req, res, () => { + return wrapped(req, res); + }); + }; +} + +/** @internal */ +const wrapOnCallHandler = ( + handler: (data: any, context: CallableContext) => any | Promise +) => async (req: Request, res: express.Response) => { + try { + if (!isValidRequest(req)) { + logger.error('Invalid request, unable to process.'); + throw new HttpsError('invalid-argument', 'Bad Request'); + } + + const context: CallableContext = { rawRequest: req }; + const tokenStatus = await checkTokens(req, context); + if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { + throw new HttpsError('unauthenticated', 'Unauthenticated'); + } + + const instanceId = req.header('Firebase-Instance-ID-Token'); + if (instanceId) { + // Validating the token requires an http request, so we don't do it. + // If the user wants to use it for something, it will be validated then. + // Currently, the only real use case for this token is for sending + // pushes with FCM. In that case, the FCM APIs will validate the token. + context.instanceIdToken = req.header('Firebase-Instance-ID-Token'); + } + + const data = decode(req.body.data); + let result: any = await handler(data, context); + + // Encode the result as JSON to preserve types like Dates. + result = encode(result); + + // If there was some result, encode it in the body. + const responseBody: HttpResponseBody = { result }; + res.status(200).send(responseBody); + } catch (err) { + if (!(err instanceof HttpsError)) { + // This doesn't count as an 'explicit' error. + logger.error('Unhandled error', err); + err = new HttpsError('internal', 'INTERNAL'); + } + + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; + + res.status(status).send(body); + } +}; diff --git a/src/v1/cloud-functions.ts b/src/v1/cloud-functions.ts index ef59c0422..ef7b8debe 100644 --- a/src/v1/cloud-functions.ts +++ b/src/v1/cloud-functions.ts @@ -30,6 +30,13 @@ import { Schedule, } from './function-configuration'; export { Request, Response }; +import { + convertIfPresent, + copyIfPresent, + Duration, + durationFromSeconds, + serviceAccountFromShorthand, +} from '../common/encoding'; /** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); @@ -266,7 +273,7 @@ export interface TriggerAnnotated { labels?: { [key: string]: string }; regions?: string[]; schedule?: Schedule; - timeout?: string; + timeout?: Duration; vpcConnector?: string; vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; @@ -480,25 +487,41 @@ function _detectAuthType(event: Event) { /** @hidden */ export function optionsToTrigger(options: DeploymentOptions) { const trigger: any = {}; - if (options.regions) { - trigger.regions = options.regions; - } - if (options.failurePolicy !== undefined) { - switch (options.failurePolicy) { - case false: - trigger.failurePolicy = undefined; - break; - case true: - trigger.failurePolicy = DEFAULT_FAILURE_POLICY; - break; - default: - trigger.failurePolicy = options.failurePolicy; + copyIfPresent( + trigger, + options, + 'regions', + 'schedule', + 'minInstances', + 'maxInstances', + 'ingressSettings', + 'vpcConnectorEgressSettings', + 'vpcConnector', + 'labels' + ); + convertIfPresent( + trigger, + options, + 'failurePolicy', + 'failurePolicy', + (policy) => { + if (policy === false) { + return undefined; + } else if (policy === true) { + return DEFAULT_FAILURE_POLICY; + } else { + return policy; + } } - } - if (options.timeoutSeconds) { - trigger.timeout = options.timeoutSeconds.toString() + 's'; - } - if (options.memory) { + ); + convertIfPresent( + trigger, + options, + 'timeout', + 'timeoutSeconds', + durationFromSeconds + ); + convertIfPresent(trigger, options, 'availableMemoryMb', 'memory', (mem) => { const memoryLookup = { '128MB': 128, '256MB': 256, @@ -508,54 +531,15 @@ export function optionsToTrigger(options: DeploymentOptions) { '4GB': 4096, '8GB': 8192, }; - trigger.availableMemoryMb = _.get(memoryLookup, options.memory); - } - if (options.schedule) { - trigger.schedule = options.schedule; - } - - if (options.minInstances) { - trigger.minInstances = options.minInstances; - } - - if (options.maxInstances) { - trigger.maxInstances = options.maxInstances; - } - - if (options.ingressSettings) { - trigger.ingressSettings = options.ingressSettings; - } - - if (options.vpcConnector) { - trigger.vpcConnector = options.vpcConnector; - } - - if (options.vpcConnectorEgressSettings) { - trigger.vpcConnectorEgressSettings = options.vpcConnectorEgressSettings; - } - - if (options.serviceAccount) { - if (options.serviceAccount === 'default') { - // Do nothing, since this is equivalent to not setting serviceAccount. - } else if (options.serviceAccount.endsWith('@')) { - if (!process.env.GCLOUD_PROJECT) { - throw new Error( - `Unable to determine email for service account '${options.serviceAccount}' because process.env.GCLOUD_PROJECT is not set.` - ); - } - trigger.serviceAccountEmail = `${options.serviceAccount}${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`; - } else if (options.serviceAccount.includes('@')) { - trigger.serviceAccountEmail = options.serviceAccount; - } else { - throw new Error( - `Invalid option for serviceAccount: '${options.serviceAccount}'. Valid options are 'default', a service account email, or '{serviceAccountName}@'` - ); - } - } - - if (options.labels) { - trigger.labels = options.labels; - } + return memoryLookup[mem]; + }); + convertIfPresent( + trigger, + options, + 'serviceAccountEmail', + 'serviceAccount', + serviceAccountFromShorthand + ); return trigger; } diff --git a/src/v1/function-configuration.ts b/src/v1/function-configuration.ts index 6faa7aa42..d14db8736 100644 --- a/src/v1/function-configuration.ts +++ b/src/v1/function-configuration.ts @@ -97,6 +97,12 @@ export const DEFAULT_FAILURE_POLICY: FailurePolicy = { export const MAX_NUMBER_USER_LABELS = 58; export interface RuntimeOptions { + /** + * Which platform should host the backend. Valid options are "gcfv1" + * @hidden + */ + platform?: 'gcfv1'; + /** * Failure policy of the function, with boolean `true` being equivalent to * providing an empty retry object. @@ -112,19 +118,13 @@ export interface RuntimeOptions { timeoutSeconds?: number; /** - * Min number of actual instances allowed to be running in parallel - * Instances will be billed while idle. + * Min number of actual instances to be running at a given time. + * Instances will be billed for memory allocation and 10% of CPU allocation + * while idle. * @hidden */ minInstances?: number; - /** - * Which version of the internal contract between the CLI and the SDK are - * we using? For internal testing only. - * @hidden - */ - apiVersion?: 1 | 2; - /** * Max number of actual instances allowed to be running in parallel. */ diff --git a/src/v1/providers/https.ts b/src/v1/providers/https.ts index c6d5cc8a0..659c43586 100644 --- a/src/v1/providers/https.ts +++ b/src/v1/providers/https.ts @@ -20,20 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as cors from 'cors'; import * as express from 'express'; -import * as firebase from 'firebase-admin'; -import * as _ from 'lodash'; -import { error, info, warn } from '../../logger'; -import { apps } from '../apps'; +import * as common from '../../common/providers/https'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; -/** @hidden */ -export interface Request extends express.Request { - rawBody: Buffer; -} +export type Request = common.Request; +export type CallableContext = common.CallableContext; +export type FunctionsErrorCode = common.FunctionsErrorCode; +export type HttpsError = common.HttpsError; /** * Handle HTTP requests. @@ -65,579 +61,32 @@ export function _onRequestWithOptions( const cloudFunction: any = (req: Request, res: express.Response) => { return handler(req, res); }; - cloudFunction.__trigger = _.assign(optionsToTrigger(options), { + cloudFunction.__trigger = { + ...optionsToTrigger(options), httpsTrigger: {}, - }); + }; // TODO parse the options return cloudFunction; } -/** - * The set of Firebase Functions status codes. The codes are the same at the - * ones exposed by gRPC here: - * https://github.com/grpc/grpc/blob/master/doc/statuscodes.md - * - * Possible values: - * - 'cancelled': The operation was cancelled (typically by the caller). - * - 'unknown': Unknown error or an error from a different error domain. - * - 'invalid-argument': Client specified an invalid argument. Note that this - * differs from 'failed-precondition'. 'invalid-argument' indicates - * arguments that are problematic regardless of the state of the system - * (e.g. an invalid field name). - * - 'deadline-exceeded': Deadline expired before operation could complete. - * For operations that change the state of the system, this error may be - * returned even if the operation has completed successfully. For example, - * a successful response from a server could have been delayed long enough - * for the deadline to expire. - * - 'not-found': Some requested document was not found. - * - 'already-exists': Some document that we attempted to create already - * exists. - * - 'permission-denied': The caller does not have permission to execute the - * specified operation. - * - 'resource-exhausted': Some resource has been exhausted, perhaps a - * per-user quota, or perhaps the entire file system is out of space. - * - 'failed-precondition': Operation was rejected because the system is not - * in a state required for the operation's execution. - * - 'aborted': The operation was aborted, typically due to a concurrency - * issue like transaction aborts, etc. - * - 'out-of-range': Operation was attempted past the valid range. - * - 'unimplemented': Operation is not implemented or not supported/enabled. - * - 'internal': Internal errors. Means some invariants expected by - * underlying system has been broken. If you see one of these errors, - * something is very broken. - * - 'unavailable': The service is currently unavailable. This is most likely - * a transient condition and may be corrected by retrying with a backoff. - * - 'data-loss': Unrecoverable data loss or corruption. - * - 'unauthenticated': The request does not have valid authentication - * credentials for the operation. - */ -export type FunctionsErrorCode = - | 'ok' - | 'cancelled' - | 'unknown' - | 'invalid-argument' - | 'deadline-exceeded' - | 'not-found' - | 'already-exists' - | 'permission-denied' - | 'resource-exhausted' - | 'failed-precondition' - | 'aborted' - | 'out-of-range' - | 'unimplemented' - | 'internal' - | 'unavailable' - | 'data-loss' - | 'unauthenticated'; - -/** @hidden */ -export type CanonicalErrorCodeName = - | 'OK' - | 'CANCELLED' - | 'UNKNOWN' - | 'INVALID_ARGUMENT' - | 'DEADLINE_EXCEEDED' - | 'NOT_FOUND' - | 'ALREADY_EXISTS' - | 'PERMISSION_DENIED' - | 'UNAUTHENTICATED' - | 'RESOURCE_EXHAUSTED' - | 'FAILED_PRECONDITION' - | 'ABORTED' - | 'OUT_OF_RANGE' - | 'UNIMPLEMENTED' - | 'INTERNAL' - | 'UNAVAILABLE' - | 'DATA_LOSS'; - -/** @hidden */ -interface HttpErrorCode { - canonicalName: CanonicalErrorCodeName; - status: number; -} - -/** - * Standard error codes and HTTP statuses for different ways a request can fail, - * as defined by: - * https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto - * - * This map is used primarily to convert from a client error code string to - * to the HTTP format error code string and status, and make sure it's in the - * supported set. - */ -const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { - ok: { canonicalName: 'OK', status: 200 }, - cancelled: { canonicalName: 'CANCELLED', status: 499 }, - unknown: { canonicalName: 'UNKNOWN', status: 500 }, - 'invalid-argument': { canonicalName: 'INVALID_ARGUMENT', status: 400 }, - 'deadline-exceeded': { canonicalName: 'DEADLINE_EXCEEDED', status: 504 }, - 'not-found': { canonicalName: 'NOT_FOUND', status: 404 }, - 'already-exists': { canonicalName: 'ALREADY_EXISTS', status: 409 }, - 'permission-denied': { canonicalName: 'PERMISSION_DENIED', status: 403 }, - unauthenticated: { canonicalName: 'UNAUTHENTICATED', status: 401 }, - 'resource-exhausted': { canonicalName: 'RESOURCE_EXHAUSTED', status: 429 }, - 'failed-precondition': { canonicalName: 'FAILED_PRECONDITION', status: 400 }, - aborted: { canonicalName: 'ABORTED', status: 409 }, - 'out-of-range': { canonicalName: 'OUT_OF_RANGE', status: 400 }, - unimplemented: { canonicalName: 'UNIMPLEMENTED', status: 501 }, - internal: { canonicalName: 'INTERNAL', status: 500 }, - unavailable: { canonicalName: 'UNAVAILABLE', status: 503 }, - 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, -}; - -/** @hidden */ -interface HttpErrorWireFormat { - details?: unknown; - message: string; - status: CanonicalErrorCodeName; -} - -/** - * An explicit error that can be thrown from a handler to send an error to the - * client that called the function. - */ -export class HttpsError extends Error { - /** - * A standard error code that will be returned to the client. This also - * determines the HTTP status code of the response, as defined in code.proto. - */ - public readonly code: FunctionsErrorCode; - - /** - * Extra data to be converted to JSON and included in the error response. - */ - public readonly details: unknown; - - /** - * A wire format representation of a provided error code. - * - * @hidden - */ - public readonly httpErrorCode: HttpErrorCode; - - constructor(code: FunctionsErrorCode, message: string, details?: unknown) { - super(message); - - // A sanity check for non-TypeScript consumers. - if (code in errorCodeMap === false) { - throw new Error(`Unknown error code: ${code}.`); - } - - this.code = code; - this.details = details; - this.httpErrorCode = errorCodeMap[code]; - } - - /** @hidden */ - public toJSON(): HttpErrorWireFormat { - const { - details, - httpErrorCode: { canonicalName: status }, - message, - } = this; - - return { - ...(details === undefined ? {} : { details }), - message, - status, - }; - } -} - -/** - * The interface for metadata for the API as passed to the handler. - */ -export interface CallableContext { - /** - * The result of decoding and verifying a Firebase AppCheck token. - */ - app?: { - appId: string; - - // This is actually a firebase.appCheck.DecodedAppCheckToken, but - // that type may not be available in some supported SDK versions. - // Declare as an inline type, which DecodedAppCheckToken will be - // able to merge with. - // TODO: Replace with the real type once we bump the min-version of - // the admin SDK - token: { - /** - * The issuer identifier for the issuer of the response. - * - * This value is a URL with the format - * `https://firebaseappcheck.googleapis.com/`, where `` is the - * same project number specified in the [`aud`](#aud) property. - */ - iss: string; - - /** - * The Firebase App ID corresponding to the app the token belonged to. - * - * As a convenience, this value is copied over to the [`app_id`](#app_id) property. - */ - sub: string; - - /** - * The audience for which this token is intended. - * - * This value is a JSON array of two strings, the first is the project number of your - * Firebase project, and the second is the project ID of the same project. - */ - aud: string[]; - - /** - * The App Check token's expiration time, in seconds since the Unix epoch. That is, the - * time at which this App Check token expires and should no longer be considered valid. - */ - exp: number; - - /** - * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the - * time at which this App Check token was issued and should start to be considered - * valid. - */ - iat: number; - - /** - * The App ID corresponding to the App the App Check token belonged to. - * - * This value is not actually one of the JWT token claims. It is added as a - * convenience, and is set as the value of the [`sub`](#sub) property. - */ - app_id: string; - [key: string]: any; - }; - }; - - /** - * The result of decoding and verifying a Firebase Auth ID token. - */ - auth?: { - uid: string; - token: firebase.auth.DecodedIdToken; - }; - - /** - * An unverified token for a Firebase Instance ID. - */ - instanceIdToken?: string; - - /** - * The raw request handled by the callable. - */ - rawRequest: Request; -} - -// The allowed interface for an HTTP request to a Callable function. -/** @hidden*/ -interface HttpRequest extends Request { - body: { - data: any; - }; -} - -/** @hidden */ -// The format for an HTTP body response from a Callable function. -interface HttpResponseBody { - result?: any; - error?: HttpsError; -} - -/** @hidden */ -// Returns true if req is a properly formatted callable request. -function isValidRequest(req: Request): req is HttpRequest { - // The body must not be empty. - if (!req.body) { - warn('Request is missing body.'); - return false; - } - - // Make sure it's a POST. - if (req.method !== 'POST') { - warn('Request has invalid method.', req.method); - return false; - } - - // Check that the Content-Type is JSON. - let contentType = (req.header('Content-Type') || '').toLowerCase(); - // If it has a charset, just ignore it for now. - const semiColon = contentType.indexOf(';'); - if (semiColon >= 0) { - contentType = contentType.substr(0, semiColon).trim(); - } - if (contentType !== 'application/json') { - warn('Request has incorrect Content-Type.', contentType); - return false; - } - - // The body must have data. - if (_.isUndefined(req.body.data)) { - warn('Request body is missing data.', req.body); - return false; - } - - // TODO(klimt): Allow only whitelisted http headers. - - // Verify that the body does not have any extra fields. - const extras = _.omit(req.body, 'data'); - if (!_.isEmpty(extras)) { - warn('Request body has extra fields.', extras); - return false; - } - return true; -} - -/** @hidden */ -const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value'; -/** @hidden */ -const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value'; - -/** - * Encodes arbitrary data in our special format for JSON. - * This is exposed only for testing. - */ -/** @hidden */ -export function encode(data: any): any { - if (_.isNull(data) || _.isUndefined(data)) { - return null; - } - // Oddly, _.isFinite(new Number(x)) always returns false, so unwrap Numbers. - if (data instanceof Number) { - data = data.valueOf(); - } - if (_.isFinite(data)) { - // Any number in JS is safe to put directly in JSON and parse as a double - // without any loss of precision. - return data; - } - if (_.isBoolean(data)) { - return data; - } - if (_.isString(data)) { - return data; - } - if (_.isArray(data)) { - return _.map(data, encode); - } - if (_.isObject(data)) { - // It's not safe to use _.forEach, because the object might be 'array-like' - // if it has a key called 'length'. Note that this intentionally overrides - // any toJSON method that an object may have. - return _.mapValues(data, encode); - } - // If we got this far, the data is not encodable. - error('Data cannot be encoded in JSON.', data); - throw new Error('Data cannot be encoded in JSON: ' + data); -} - -/** - * Decodes our special format for JSON into native types. - * This is exposed only for testing. - */ -/** @hidden */ -export function decode(data: any): any { - if (data === null) { - return data; - } - if (data['@type']) { - switch (data['@type']) { - case LONG_TYPE: - // Fall through and handle this the same as unsigned. - case UNSIGNED_LONG_TYPE: { - // Technically, this could work return a valid number for malformed - // data if there was a number followed by garbage. But it's just not - // worth all the extra code to detect that case. - const value = parseFloat(data.value); - if (_.isNaN(value)) { - error('Data cannot be decoded from JSON.', data); - throw new Error('Data cannot be decoded from JSON: ' + data); - } - return value; - } - default: { - error('Data cannot be decoded from JSON.', data); - throw new Error('Data cannot be decoded from JSON: ' + data); - } - } - } - if (_.isArray(data)) { - return _.map(data, decode); - } - if (_.isObject(data)) { - // It's not safe to use _.forEach, because the object might be 'array-like' - // if it has a key called 'length'. - return _.mapValues(data, decode); - } - // Anything else is safe to return. - return data; -} - -/** - * Be careful when changing token status values. - * - * Users are encouraged to setup log-based metric based on these values, and - * changing their values may cause their metrics to break. - * - */ -/** @hidden */ -type TokenStatus = 'MISSING' | 'VALID' | 'INVALID'; - -/** @hidden */ -interface CallableTokenStatus { - app: TokenStatus; - auth: TokenStatus; -} - -/** - * Check and verify tokens included in the requests. Once verified, tokens - * are injected into the callable context. - * - * @param {Request} req - Request sent to the Callable function. - * @param {CallableContext} ctx - Context to be sent to callable function handler. - * @return {CallableTokenStatus} Status of the token verifications. - */ -/** @hidden */ -async function checkTokens( - req: Request, - ctx: CallableContext -): Promise { - const verifications: CallableTokenStatus = { - app: 'MISSING', - auth: 'MISSING', - }; - - const appCheck = req.header('X-Firebase-AppCheck'); - if (appCheck) { - verifications.app = 'INVALID'; - try { - if (!apps().admin.appCheck) { - throw new Error( - 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' - ); - } - const appCheckToken = await apps() - .admin.appCheck() - .verifyToken(appCheck); - ctx.app = { - appId: appCheckToken.appId, - token: appCheckToken.token, - }; - verifications.app = 'VALID'; - } catch (err) { - warn('Failed to validate AppCheck token.', err); - } - } - - const authorization = req.header('Authorization'); - if (authorization) { - verifications.auth = 'INVALID'; - const match = authorization.match(/^Bearer (.*)$/); - if (match) { - const idToken = match[1]; - try { - const authToken = await apps() - .admin.auth() - .verifyIdToken(idToken); - - verifications.auth = 'VALID'; - ctx.auth = { - uid: authToken.uid, - token: authToken, - }; - } catch (err) { - warn('Failed to validate auth token.', err); - } - } - } - - const logPayload = { - verifications, - 'logging.googleapis.com/labels': { - 'firebase-log-type': 'callable-request-verification', - }, - }; - - const errs = []; - if (verifications.app === 'INVALID') { - errs.push('AppCheck token was rejected.'); - } - if (verifications.auth === 'INVALID') { - errs.push('Auth token was rejected.'); - } - - if (errs.length == 0) { - info('Callable request verification passed', logPayload); - } else { - warn(`Callable request verification failed: ${errs.join(' ')}`, logPayload); - } - - return verifications; -} - -/** @hidden */ -const corsHandler = cors({ origin: true, methods: 'POST' }); - /** @hidden */ export function _onCallWithOptions( handler: (data: any, context: CallableContext) => any | Promise, options: DeploymentOptions ): HttpsFunction & Runnable { - const func = async (req: Request, res: express.Response) => { - try { - if (!isValidRequest(req)) { - error('Invalid request, unable to process.'); - throw new HttpsError('invalid-argument', 'Bad Request'); - } - - const context: CallableContext = { rawRequest: req }; - const tokenStatus = await checkTokens(req, context); - if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { - throw new HttpsError('unauthenticated', 'Unauthenticated'); - } - - const instanceId = req.header('Firebase-Instance-ID-Token'); - if (instanceId) { - // Validating the token requires an http request, so we don't do it. - // If the user wants to use it for something, it will be validated then. - // Currently, the only real use case for this token is for sending - // pushes with FCM. In that case, the FCM APIs will validate the token. - context.instanceIdToken = req.header('Firebase-Instance-ID-Token'); - } - - const data = decode(req.body.data); - let result: any = await handler(data, context); - - // Encode the result as JSON to preserve types like Dates. - result = encode(result); - - // If there was some result, encode it in the body. - const responseBody: HttpResponseBody = { result }; - res.status(200).send(responseBody); - } catch (err) { - if (!(err instanceof HttpsError)) { - // This doesn't count as an 'explicit' error. - error('Unhandled error', err); - err = new HttpsError('internal', 'INTERNAL'); - } - - const { status } = err.httpErrorCode; - const body = { error: err.toJSON() }; - - res.status(status).send(body); - } - }; - - // Wrap the function with a cors handler. - const corsFunc: any = (req: Request, res: express.Response) => { - return corsHandler(req, res, () => func(req, res)); - }; - - corsFunc.__trigger = _.assign(optionsToTrigger(options), { + const func: any = common.onCallHandler( + { origin: true, methods: 'POST' }, + handler + ); + + func.__trigger = { + labels: {}, + ...optionsToTrigger(options), httpsTrigger: {}, - labels: { 'deployment-callable': 'true' }, - }); + }; + func.__trigger.labels['deployment-callable'] = 'true'; - corsFunc.run = handler; + func.run = handler; - return corsFunc; + return func; } From 641cae80f2e340a5d7dc9935904b942b7f654ee2 Mon Sep 17 00:00:00 2001 From: joehan Date: Wed, 14 Jul 2021 11:50:23 -0700 Subject: [PATCH 320/705] Fix logging for objects that define `toJSON` (#916) * attempt to use toJSON before removeCircular * changelog * formats --- CHANGELOG.md | 1 + spec/logger.spec.ts | 17 +++++++++++++++++ src/logger/index.ts | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45844cd0f..6586297a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ - Adds support for setting user labels on functions via `runWith()`. - Adds support for FIREBASE_CONFIG env as the name of a JSON file +- Fixes an issue where objects that define `toJSON` could not be logged successfully (#907). - Formalize module exports. Loggers can now be accessed at 'firebase-functions/logger' and 'firebase-functions/logger/compat' - Fixes an issue where Remote Config coiuld not be emulated in Windows machines on the classic Command Prompt. diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts index e32765d10..c82497d31 100644 --- a/spec/logger.spec.ts +++ b/spec/logger.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import * as logger from '../src/logger'; const SUPPORTS_STRUCTURED_LOGS = @@ -109,6 +110,22 @@ describe(`logger (${ }); }); + it('should not break on objects that override toJSON', () => { + const obj: any = { a: new Date('August 26, 1994 12:24:00Z') }; + + const entry: logger.LogEntry = { + severity: 'ERROR', + message: 'testing toJSON', + obj, + }; + logger.write(entry); + expectStderr({ + severity: 'ERROR', + message: 'testing toJSON', + obj: { a: '1994-08-26T12:24:00.000Z' }, + }); + }); + it('should not alter parameters that are logged', () => { const circ: any = { b: 'foo' }; circ.array = [circ]; diff --git a/src/logger/index.ts b/src/logger/index.ts index 81d1a0899..13e77696d 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -35,6 +35,10 @@ function removeCircular(obj: any, refs: any[] = []): any { if (typeof obj !== 'object' || !obj) { return obj; } + // If the object defines its own toJSON, prefer that. + if (obj['toJSON']) { + return obj.toJSON(); + } if (refs.includes(obj)) { return '[Circular]'; } else { From a6f9851619da7116a3037edb09d483c34513357a Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 19 Jul 2021 13:16:49 -0700 Subject: [PATCH 321/705] Finish refactor of HTTPS code (#917) * Moves most of https pacakge into /common/providers/https. The actual encoding/decoding/error logic etc. of callable functions will stay the same between v1 and v2, so they should be in a /common file. The rest of /v1 is about trigger options, cors, etc. onCall's CORS options are part of the v1 namespace because v2 adds a "cors" option to HttpsOptions. In the v2 API, we will default to `"cors": true`, but a customer could say `"cors": "my.firebase.app"` and we will respsect it. I wish there was a way to make this diff not so noisy. Most of this is cut & paste. * Finish refactor of HTTPS code Builds upon #915 Creates the first bits of v2/ setGlobalOptions allows customers to set options that will be preserved across any function written in the v2 API. v2/https has webhook and callable function support. In addition to previous features, customers can now specifiy `cors` as a shorthand for using CORS middleware. We will probably eventually support scheduled functions in the HTTPS namespace but that will have to wait for another day. * Export logger * run formatter * Revert pacakge-lock.json --- package.json | 24 +++- src/index.ts | 22 ++++ src/v2/base.ts | 42 ++++++ src/v2/index.ts | 28 ++++ src/v2/options.ts | 270 ++++++++++++++++++++++++++++++++++++++ src/v2/providers/https.ts | 158 ++++++++++++++++++++++ tsconfig.release.json | 7 +- 7 files changed, 549 insertions(+), 2 deletions(-) create mode 100644 src/v2/base.ts create mode 100644 src/v2/index.ts create mode 100644 src/v2/options.ts create mode 100644 src/v2/providers/https.ts diff --git a/package.json b/package.json index 413a81c45..668947f78 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,29 @@ "./logger": "./lib/logger/index.js", "./logger/compat": "./lib/logger/compat.js", "./lib/logger": "./lib/logger/index.js", - "./lib/logger/compat": "./lib/logger/compat.js" + "./lib/logger/compat": "./lib/logger/compat.js", + "./v2": "./lib/v2/index.js", + "./v2/options": "./lib/v2/options.js", + "./v2/https": "./lib/v2/providers/https.js" + }, + "typesVersions": { + "*": { + "logger/*": [ + "lib/logger/*" + ], + "v1": [ + "lib/v1" + ], + "v2": [ + "lib/v2" + ], + "v2/options": [ + "lib/v2/options" + ], + "v2/https": [ + "lib/v2/providers/https" + ] + } }, "publishConfig": { "registry": "https://wombat-dressing-room.appspot.com" diff --git a/src/index.ts b/src/index.ts index 5b98253d9..fcac62f27 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1 +1,23 @@ +// 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. + export * from './v1'; diff --git a/src/v2/base.ts b/src/v2/base.ts new file mode 100644 index 000000000..c2d9a6fe4 --- /dev/null +++ b/src/v2/base.ts @@ -0,0 +1,42 @@ +// 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. + +/** @internal */ +export interface TriggerAnnotation { + availableMemoryMb?: number; + eventTrigger?: { + eventType: string; + resource: string; + service: string; + }; + failurePolicy?: { retry: boolean }; + httpsTrigger?: {}; + labels?: { [key: string]: string }; + regions?: string[]; + timeout?: string; + vpcConnector?: string; + vpcConnectorEgressSettings?: string; + serviceAccountEmail?: string; + ingressSettings?: string; + + // TODO: schedule +} diff --git a/src/v2/index.ts b/src/v2/index.ts new file mode 100644 index 000000000..a41333a3d --- /dev/null +++ b/src/v2/index.ts @@ -0,0 +1,28 @@ +// 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. + +import * as https from './providers/https'; +import * as logger from '../logger'; + +export { https, logger }; + +export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/options.ts b/src/v2/options.ts new file mode 100644 index 000000000..d2382a8e7 --- /dev/null +++ b/src/v2/options.ts @@ -0,0 +1,270 @@ +// 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. + +import { + durationFromSeconds, + serviceAccountFromShorthand, +} from '../common/encoding'; +import * as logger from '../logger'; +import { TriggerAnnotation } from './base'; +import { copyIfPresent, convertIfPresent } from '../common/encoding'; + +/** + * List of all regions supported by Cloud Functions v2 + */ +export const SUPPORTED_REGIONS = ['us-west1'] as const; + +/** + * A region known to be supported by CloudFunctions v2 + */ +export type SupportedRegion = typeof SUPPORTED_REGIONS[number]; + +/** + * Cloud Functions v2 min timeout value. + */ +export const MIN_TIMEOUT_SECONDS = 1; + +/** + * Cloud Functions v2 max timeout value for event handlers. + */ +export const MAX_EVENT_TIMEOUT_SECONDS = 540; + +/** + * Cloud Functions v2 max timeout for HTTPS functions. + */ +export const MAX_HTTPS_TIMEOUT_SECONDS = 36_000; + +/** + * Maximum number of requests to serve on a single instance. + */ +export const MAX_CONCURRENCY = 1_000; + +/** + * List of available memory options supported by Cloud Functions. + */ +export const SUPPORTED_MEMORY_OPTIONS = [ + '256MB', + '512MB', + '1GB', + '2GB', + '4GB', + '8GB', +] as const; + +const MemoryOptionToMB: Record = { + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, + '4GB': 4096, + '8GB': 8192, +}; + +/** + * A supported memory option. + */ +export type MemoryOption = typeof SUPPORTED_MEMORY_OPTIONS[number]; + +/** + * List of available options for VpcConnectorEgressSettings. + */ +export const SUPPORTED_VPC_EGRESS_SETTINGS = [ + 'PRIVATE_RANGES_ONLY', + 'ALL_TRAFFIC', +] as const; + +/** + * A valid VPC Egress setting. + */ +export type VpcEgressSetting = typeof SUPPORTED_VPC_EGRESS_SETTINGS[number]; + +/** + * List of available options for IngressSettings. + */ +export const SUPPORTED_INGRESS_SETTINGS = [ + 'ALLOW_ALL', + 'ALLOW_INTERNAL_ONLY', + 'ALLOW_INTERNAL_AND_GCLB', +] as const; + +export type IngressSetting = typeof SUPPORTED_INGRESS_SETTINGS[number]; + +/** + * GlobalOptions are options that can be set across an entire project. + * These options are common to HTTPS and Event handling functions. + */ +export interface GlobalOptions { + /** + * Region where functions should be deployed. + * HTTP functions can override and specify more than one region. + */ + region?: SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: MemoryOption | null; + + /** + * 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 + */ + timeoutSeconds?: number | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * Can only be applied to functions running on Cloud Functions v2. + * A value of null restores the default concurrency. + */ + concurrency?: number | null; + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; +} + +let globalOptions: GlobalOptions | undefined; + +/** + * Sets default options for all functions written using the v2 SDK. + * @param options Options to set as default + */ +export function setGlobalOptions(options: GlobalOptions) { + if (globalOptions) { + logger.warn('Calling setGlobalOptions twice leads to undefined behavior'); + } + globalOptions = options; +} + +/** + * Get the currently set default options. + * Used only for trigger generation. + * @internal + */ +export function getGlobalOptions(): GlobalOptions { + return globalOptions || {}; +} + +/** + * Options that can be set on an individual event-handling Cloud Function. + */ +export interface EventHandlerOptions extends GlobalOptions { + retry?: boolean; +} + +/** + * Apply GlobalOptions to trigger definitions. + * @internal + */ +export function optionsToTriggerAnnotations( + opts: GlobalOptions | EventHandlerOptions +): TriggerAnnotation { + const annotation: TriggerAnnotation = {}; + copyIfPresent( + annotation, + opts, + 'ingressSettings', + 'labels', + 'vpcConnector', + 'vpcConnectorEgressSettings' + ); + convertIfPresent( + annotation, + opts, + 'availableMemoryMb', + 'memory', + (mem: MemoryOption) => { + return MemoryOptionToMB[mem]; + } + ); + convertIfPresent(annotation, opts, 'regions', 'region', (region) => { + if (typeof 'region' === 'string') { + return [region]; + } + return region; + }); + convertIfPresent( + annotation, + opts, + 'serviceAccountEmail', + 'serviceAccount', + serviceAccountFromShorthand + ); + convertIfPresent( + annotation, + opts, + 'timeout', + 'timeoutSeconds', + durationFromSeconds + ); + convertIfPresent( + annotation, + (opts as any) as EventHandlerOptions, + 'failurePolicy', + 'retry', + (retry: boolean) => { + return retry ? { retry: true } : null; + } + ); + + return annotation; +} diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts new file mode 100644 index 000000000..7faa9c6c1 --- /dev/null +++ b/src/v2/providers/https.ts @@ -0,0 +1,158 @@ +// 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. + +import * as cors from 'cors'; +import * as express from 'express'; + +import * as common from '../../common/providers/https'; +import * as options from '../options'; + +type Request = common.Request; + +export type CallableContext = common.CallableContext; +export type FunctionsErrorCode = common.FunctionsErrorCode; +export type HttpsError = common.HttpsError; + +export interface HttpsOptions extends Omit { + region?: + | options.SupportedRegion + | string + | Array; + cors?: string | boolean; +} + +export type HttpsHandler = ( + request: Request, + response: express.Response +) => void | Promise; +export type CallableHandler = ( + data: any, + context: CallableContext +) => any | Promise; + +export type HttpsFunction = HttpsHandler & { __trigger: unknown }; + +export function onRequest( + opts: HttpsOptions, + handler: HttpsHandler +): HttpsFunction; +export function onRequest(handler: HttpsHandler): HttpsFunction; +export function onRequest( + optsOrHandler: HttpsOptions | HttpsHandler, + handler?: HttpsHandler +): HttpsFunction { + let opts: HttpsOptions; + if (arguments.length === 1) { + opts = {}; + handler = optsOrHandler as HttpsHandler; + } else { + opts = optsOrHandler as HttpsOptions; + } + + if ('cors' in opts) { + const userProvidedHandler = handler; + handler = (req: Request, res: express.Response) => { + cors({ origin: opts.cors })(req, res, () => { + 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 as options.GlobalOptions + ); + return { + // TODO(inlined): Remove "apiVersion" once the latest version of the CLI + // has migrated to "platform". + apiVersion: 2, + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + httpsTrigger: { + allowInsecure: false, + }, + }; + }, + }); + return handler as HttpsFunction; +} + +export function onCall( + opts: HttpsOptions, + handler: CallableHandler +): HttpsFunction; +export function onCall(handler: CallableHandler): HttpsFunction; +export function onCall( + optsOrHandler: HttpsOptions | CallableHandler, + handler?: CallableHandler +): HttpsFunction { + let opts: HttpsOptions; + if (arguments.length == 1) { + opts = {}; + handler = optsOrHandler as CallableHandler; + } else { + opts = optsOrHandler as HttpsOptions; + } + + const origin = 'cors' in opts ? opts.cors : true; + const func = common.onCallHandler({ origin, methods: 'POST' }, handler); + + 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 as options.GlobalOptions + ); + return { + // TODO(inlined): Remove "apiVersion" once the latest version of the CLI + // has migrated to "platform". + apiVersion: 2, + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + 'deployment-callable': 'true', + }, + httpsTrigger: { + allowInsecure: false, + }, + }; + }, + }); + return func as HttpsFunction; +} diff --git a/tsconfig.release.json b/tsconfig.release.json index b8f2632fd..a53421f8f 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -10,5 +10,10 @@ "target": "es2018", "typeRoots": ["./node_modules/@types"] }, - "files": ["./src/index.ts", "./src/logger/index.ts", "./src/logger/compat.ts"] + "files": [ + "./src/index.ts", + "./src/logger/index.ts", + "./src/logger/compat.ts", + "./src/v2/index.ts" + ] } From b6e22eac9539561d1bbb4a142b076349e0e7edf0 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Mon, 19 Jul 2021 17:08:38 -0700 Subject: [PATCH 322/705] Adds new regions to support list. (#918) --- src/v1/function-configuration.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/v1/function-configuration.ts b/src/v1/function-configuration.ts index d14db8736..b1ed51623 100644 --- a/src/v1/function-configuration.ts +++ b/src/v1/function-configuration.ts @@ -13,11 +13,13 @@ export const SUPPORTED_REGIONS = [ 'europe-west2', 'europe-west3', 'europe-west6', + 'asia-east1', 'asia-east2', 'asia-northeast1', 'asia-northeast2', 'asia-northeast3', 'asia-south1', + 'asia-southeast1', 'asia-southeast2', 'northamerica-northeast1', 'southamerica-east1', From 36098042f09375d51adba1923c7cc6e358117f1f Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Thu, 29 Jul 2021 14:13:50 -0700 Subject: [PATCH 323/705] Adds multiple api version support to docgen. (#924) --- docgen/content-sources/{ => v1}/HOME.md | 0 docgen/content-sources/{ => v1}/toc.yaml | 0 docgen/content-sources/v2/HOME.md | 8 +++++++ docgen/content-sources/v2/toc.yaml | 27 ++++++++++++++++++++++ docgen/generate-docs.js | 29 +++++++++++++++++++----- 5 files changed, 58 insertions(+), 6 deletions(-) rename docgen/content-sources/{ => v1}/HOME.md (100%) rename docgen/content-sources/{ => v1}/toc.yaml (100%) create mode 100644 docgen/content-sources/v2/HOME.md create mode 100644 docgen/content-sources/v2/toc.yaml diff --git a/docgen/content-sources/HOME.md b/docgen/content-sources/v1/HOME.md similarity index 100% rename from docgen/content-sources/HOME.md rename to docgen/content-sources/v1/HOME.md diff --git a/docgen/content-sources/toc.yaml b/docgen/content-sources/v1/toc.yaml similarity index 100% rename from docgen/content-sources/toc.yaml rename to docgen/content-sources/v1/toc.yaml diff --git a/docgen/content-sources/v2/HOME.md b/docgen/content-sources/v2/HOME.md new file mode 100644 index 000000000..d70db12a3 --- /dev/null +++ b/docgen/content-sources/v2/HOME.md @@ -0,0 +1,8 @@ +# Firebase Functions v2 SDK Reference + +The `firebase-functions` package provides an SDK for defining Cloud Functions for Firebase. + +To get started using Cloud Functions, see +[Get started: write, test, and deploy your first functions](/docs/functions/get-started). + +For source code, see the [Cloud Functions for Firebase GitHub repo](https://github.com/firebase/firebase-functions). diff --git a/docgen/content-sources/v2/toc.yaml b/docgen/content-sources/v2/toc.yaml new file mode 100644 index 000000000..04b95a495 --- /dev/null +++ b/docgen/content-sources/v2/toc.yaml @@ -0,0 +1,27 @@ +toc: + - title: globals.html + path: /docs/reference/functions/globals.html + - title: index.html + path: /docs/reference/functions/index.html + - title: logger_common_.html + path: /docs/reference/functions/logger_common_.html + - title: logger_compat_.html + path: /docs/reference/functions/logger_compat_.html + - title: logger_index_.html + path: /docs/reference/functions/logger_index_.html + - title: logger_index_.logentry.html + path: /docs/reference/functions/logger_index_.logentry.html + - title: v2_base_.html + path: /docs/reference/functions/v2_base_.html + - title: v2_index_.html + path: /docs/reference/functions/v2_index_.html + - title: v2_options_.eventhandleroptions.html + path: /docs/reference/functions/v2_options_.eventhandleroptions.html + - title: v2_options_.globaloptions.html + path: /docs/reference/functions/v2_options_.globaloptions.html + - title: v2_options_.html + path: /docs/reference/functions/v2_options_.html + - title: v2_providers_https_.html + path: /docs/reference/functions/v2_providers_https_.html + - title: v2_providers_https_.httpsoptions.html + path: /docs/reference/functions/v2_providers_https_.httpsoptions.html diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index 2f8b9abb0..5e66392cf 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -24,23 +24,38 @@ const yaml = require('js-yaml'); const repoPath = path.resolve(`${__dirname}/..`); // Command-line options. -const { source: sourceFile } = yargs - .option('source', { - default: `${repoPath}/src/{v1,logger}`, +const { api: apiVersion } = yargs + .option('api', { + default: 'v1', describe: 'Typescript source file(s)', type: 'string', }) .version(false) .help().argv; +let sourceFile; +switch (apiVersion) { + case 'v1': + sourceFile = `${repoPath}/src/{v1,logger}`; + break; + case 'v2': + sourceFile = `${repoPath}/src/{v2,logger}`; + break; + default: + throw new Error( + `Unrecognized version ${apiVersion}, must be one of v1 or v2` + ); +} + const docPath = path.resolve(`${__dirname}/html`); -const contentPath = path.resolve(`${__dirname}/content-sources`); +const contentPath = path.resolve(`${__dirname}/content-sources/${apiVersion}`); const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`); const devsitePath = `/docs/reference/functions/`; const { JSDOM } = require('jsdom'); const typeMap = require('./type-aliases.json'); +const { existsSync } = require('fs'); /** * Strips path prefix and returns only filename. @@ -72,8 +87,10 @@ function runTypedoc() { * @param {string} subdir Subdir to move files out of. */ async function moveFilesToRoot(subdir) { - await exec(`mv ${docPath}/${subdir}/* ${docPath}`); - await exec(`rmdir ${docPath}/${subdir}`); + if (existsSync(`${docPath}/${subdir}`)) { + await exec(`mv ${docPath}/${subdir}/* ${docPath}`); + await exec(`rmdir ${docPath}/${subdir}`); + } } /** From 0083fc73bde8b83626286d52518982dc9d9386f5 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 29 Jul 2021 17:14:30 -0700 Subject: [PATCH 324/705] Add another fallback for snpashot not including a read time (#923) * Add another fallback for snpashot not including a read time * run formtter/linter --- src/logger/index.ts | 2 +- src/v1/providers/firestore.ts | 10 +++++++++- src/v2/index.ts | 2 +- src/v2/options.ts | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/logger/index.ts b/src/logger/index.ts index 13e77696d..deb7c1762 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -36,7 +36,7 @@ function removeCircular(obj: any, refs: any[] = []): any { return obj; } // If the object defines its own toJSON, prefer that. - if (obj['toJSON']) { + if (obj.toJSON) { return obj.toJSON(); } if (refs.includes(obj)) { diff --git a/src/v1/providers/firestore.ts b/src/v1/providers/firestore.ts index 58a6de925..5554f6e3b 100644 --- a/src/v1/providers/firestore.ts +++ b/src/v1/providers/firestore.ts @@ -22,7 +22,9 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; + import { posix } from 'path'; +import * as logger from '../../logger'; import { apps } from '../apps'; import { Change, @@ -155,9 +157,15 @@ export function snapshotConstructor(event: Event): DocumentSnapshot { event.context.resource.name, 'value' ); - const timeString = + let timeString = _.get(event, 'data.value.readTime') ?? _.get(event, 'data.value.updateTime'); + + if (!timeString) { + logger.warn('Snapshot has no readTime. Using now()'); + timeString = new Date().toISOString(); + } + const readTime = dateToTimestampProto(timeString); return firestoreInstance.snapshot_(valueProto, readTime, 'json'); } diff --git a/src/v2/index.ts b/src/v2/index.ts index a41333a3d..c850c54dd 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as https from './providers/https'; import * as logger from '../logger'; +import * as https from './providers/https'; export { https, logger }; diff --git a/src/v2/options.ts b/src/v2/options.ts index d2382a8e7..e3c16ff84 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -24,9 +24,9 @@ import { durationFromSeconds, serviceAccountFromShorthand, } from '../common/encoding'; +import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; import { TriggerAnnotation } from './base'; -import { copyIfPresent, convertIfPresent } from '../common/encoding'; /** * List of all regions supported by Cloud Functions v2 From 3d70007a4a67a932da1b5167f501db1ebb1e49b4 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 2 Aug 2021 10:09:51 -0700 Subject: [PATCH 325/705] Add Pub/Sub support + HTTPS testing (#925) Add Pub/Sub support + HTTPS testing While adding Pub/Sub support I noticed that there were now v2/ tests. Added those tests + fixes that they uncovered. Also fixed issue where 'firebase-functions/logger' wasn't working as an import in my test project. --- package.json | 17 +- spec/v1/providers/https.spec.ts | 2 - spec/v2/providers/helpers.ts | 35 ++++ spec/v2/providers/https.spec.ts | 335 +++++++++++++++++++++++++++++++ spec/v2/providers/pubsub.spec.ts | 114 +++++++++++ src/v1/providers/pubsub.ts | 4 +- src/v2/{base.ts => core.ts} | 53 +++++ src/v2/index.ts | 5 +- src/v2/options.ts | 7 +- src/v2/providers/https.ts | 38 ++-- src/v2/providers/pubsub.ts | 168 ++++++++++++++++ 11 files changed, 754 insertions(+), 24 deletions(-) create mode 100644 spec/v2/providers/helpers.ts create mode 100644 spec/v2/providers/https.spec.ts create mode 100644 spec/v2/providers/pubsub.spec.ts rename src/v2/{base.ts => core.ts} (51%) create mode 100644 src/v2/providers/pubsub.ts diff --git a/package.json b/package.json index 668947f78..50e55574d 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,18 @@ "./lib/logger": "./lib/logger/index.js", "./lib/logger/compat": "./lib/logger/compat.js", "./v2": "./lib/v2/index.js", + "./v2/core": "./lib/v2/core.js", "./v2/options": "./lib/v2/options.js", - "./v2/https": "./lib/v2/providers/https.js" + "./v2/https": "./lib/v2/providers/https.js", + "./v2/pubsub": "./lib/v2/providers/pubsub.js" }, "typesVersions": { "*": { - "logger/*": [ - "lib/logger/*" + "logger": [ + "lib/logger" + ], + "logger/compat": [ + "lib/logger/compat" ], "v1": [ "lib/v1" @@ -45,11 +50,17 @@ "v2": [ "lib/v2" ], + "v2/base": [ + "lib/v2/base" + ], "v2/options": [ "lib/v2/options" ], "v2/https": [ "lib/v2/providers/https" + ], + "v2/pubsub": [ + "lib/v2/providers/pubsub" ] } }, diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index f41ae00fe..4e5d2846f 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -30,8 +30,6 @@ import { MockRequest, } from '../../fixtures/mockrequest'; -// TODO(inlined) dedup this between v1, common, etc. - /** * RunHandlerResult contains the data from an express.Response. */ diff --git a/spec/v2/providers/helpers.ts b/spec/v2/providers/helpers.ts new file mode 100644 index 000000000..a654a4944 --- /dev/null +++ b/spec/v2/providers/helpers.ts @@ -0,0 +1,35 @@ +import * as options from '../../../src/v2/options'; + +export const FULL_OPTIONS: options.GlobalOptions = { + region: 'us-west1', + memory: '512MB', + timeoutSeconds: 60, + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpcConnector: 'aConnector', + vpcConnectorEgressSettings: 'ALL_TRAFFIC', + serviceAccount: 'root@', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, +}; + +export const FULL_TRIGGER = { + apiVersion: 2, + platform: 'gcfv2', + regions: ['us-west1'], + availableMemoryMb: 512, + timeout: '60s', + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpcConnector: 'aConnector', + vpcConnectorEgressSettings: 'ALL_TRAFFIC', + serviceAccountEmail: 'root@aProject.iam.gserviceaccount.com', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, +}; diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts new file mode 100644 index 000000000..7103372a0 --- /dev/null +++ b/spec/v2/providers/https.spec.ts @@ -0,0 +1,335 @@ +import { expect } from 'chai'; +import * as express from 'express'; + +import * as options from '../../../src/v2/options'; +import * as https from '../../../src/v2/providers/https'; +import { + expectedResponseHeaders, + MockRequest, +} from '../../fixtures/mockrequest'; +import { FULL_OPTIONS, FULL_TRIGGER } from './helpers'; + +/** + * RunHandlerResult contains the data from an express.Response. + */ +interface RunHandlerResult { + status: number; + headers: { [name: string]: string }; + body: any; +} + +function runHandler( + handler: express.Handler, + request: https.Request +): Promise { + return new Promise((resolve, reject) => { + // MockResponse mocks an express.Response. + // This class lives here so it can reference resolve and reject. + class MockResponse { + private statusCode = 0; + private headers: { [name: string]: string } = {}; + + public status(code: number) { + this.statusCode = code; + return this; + } + + // Headers are only set by the cors handler. + public setHeader(name: string, value: string) { + this.headers[name] = value; + } + + public getHeader(name: string): string { + return this.headers[name]; + } + + public send(body: any) { + resolve({ + status: this.statusCode, + headers: this.headers, + body, + }); + } + + public end() { + this.send(undefined); + } + } + + const response = new MockResponse(); + handler(request, response as any, () => undefined); + }); +} + +describe('onRequest', () => { + beforeEach(() => { + options.setGlobalOptions({}); + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a minimal trigger with appropriate values', () => { + const result = https.onRequest((req, res) => { + res.send(200); + }); + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + httpsTrigger: { + allowInsecure: false, + }, + labels: {}, + }); + }); + + it('should create a complex trigger with appropriate values', () => { + const result = https.onRequest( + { + ...FULL_OPTIONS, + region: ['us-west1', 'us-central1'], + }, + (req, res) => { + res.send(200); + } + ); + expect(result.__trigger).to.deep.equal({ + ...FULL_TRIGGER, + httpsTrigger: { + allowInsecure: false, + }, + regions: ['us-west1', 'us-central1'], + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = https.onRequest( + { + region: ['us-west1', 'us-central1'], + minInstances: 3, + }, + (req, res) => { + res.send(200); + } + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + httpsTrigger: { + allowInsecure: false, + }, + concurrency: 20, + minInstances: 3, + regions: ['us-west1', 'us-central1'], + labels: {}, + }); + }); + + it('should be an express handler', async () => { + const func = https.onRequest((req, res) => { + res.send('Works'); + }); + + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; + + const resp = await runHandler(func, req as any); + expect(resp.body).to.equal('Works'); + }); + + it('should enforce CORS options', async () => { + const func = https.onRequest({ cors: 'example.com' }, (req, res) => { + throw new Error('Should not reach here for OPTIONS preflight'); + }); + + const req = new MockRequest( + { + data: {}, + }, + { + 'Access-Control-Request-Method': 'POST', + 'Access-Control-Request-Headers': 'origin', + Origin: 'example.com', + } + ); + req.method = 'OPTIONS'; + + const resp = await runHandler(func, req as any); + expect(resp.status).to.equal(204); + expect(resp.body).to.be.undefined; + expect(resp.headers).to.deep.equal({ + 'Access-Control-Allow-Methods': 'GET,HEAD,PUT,PATCH,POST,DELETE', + 'Access-Control-Allow-Origin': 'example.com', + 'Content-Length': '0', + Vary: 'Origin, Access-Control-Request-Headers', + }); + }); +}); + +describe('onCall', () => { + beforeEach(() => { + options.setGlobalOptions({}); + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a minimal trigger with appropriate values', () => { + const result = https.onCall((data, context) => 42); + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + httpsTrigger: { + allowInsecure: false, + }, + labels: { + 'deployment-callable': 'true', + }, + }); + }); + + it('should create a complex trigger with appropriate values', () => { + const result = https.onCall(FULL_OPTIONS, (data, context) => 42); + expect(result.__trigger).to.deep.equal({ + ...FULL_TRIGGER, + httpsTrigger: { + allowInsecure: false, + }, + labels: { + ...FULL_TRIGGER.labels, + 'deployment-callable': 'true', + }, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = https.onCall( + { + region: ['us-west1', 'us-central1'], + minInstances: 3, + }, + (data, context) => 42 + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + httpsTrigger: { + allowInsecure: false, + }, + concurrency: 20, + minInstances: 3, + regions: ['us-west1', 'us-central1'], + labels: { + 'deployment-callable': 'true', + }, + }); + }); + + it('has a .run method', () => { + const cf = https.onCall((d, c) => { + return { data: d, context: c }; + }); + + const data = 'data'; + const context: any = { + instanceIdToken: 'token', + auth: { + uid: 'abc', + token: 'token', + }, + }; + expect(cf.run(data, context)).to.deep.equal({ data, context }); + }); + + it('should be an express handler', async () => { + const func = https.onCall((data, context) => 42); + + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; + + const resp = await runHandler(func, req as any); + expect(resp.body).to.deep.equal({ result: 42 }); + }); + + it('should enforce CORS options', async () => { + const func = https.onCall({ cors: 'example.com' }, (req, res) => { + throw new Error('Should not reach here for OPTIONS preflight'); + }); + + const req = new MockRequest( + { + data: {}, + }, + { + 'Access-Control-Request-Method': 'POST', + 'Access-Control-Request-Headers': 'origin', + Origin: 'example.com', + } + ); + req.method = 'OPTIONS'; + + const resp = await runHandler(func, req as any); + expect(resp.status).to.equal(204); + expect(resp.body).to.be.undefined; + expect(resp.headers).to.deep.equal({ + 'Access-Control-Allow-Methods': 'POST', + 'Access-Control-Allow-Origin': 'example.com', + 'Content-Length': '0', + Vary: 'Origin, Access-Control-Request-Headers', + }); + }); + + it('adds CORS headers', async () => { + const func = https.onCall((data, context) => 42); + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; + + const response = await runHandler(func, req as any); + + expect(response.status).to.equal(200); + expect(response.body).to.be.deep.equal({ result: 42 }); + expect(response.headers).to.deep.equal(expectedResponseHeaders); + }); +}); diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts new file mode 100644 index 000000000..f1669de7f --- /dev/null +++ b/spec/v2/providers/pubsub.spec.ts @@ -0,0 +1,114 @@ +import { expect } from 'chai'; + +import { CloudEvent } from '../../../src/v2/core'; +import * as options from '../../../src/v2/options'; +import * as pubsub from '../../../src/v2/providers/pubsub'; +import { FULL_OPTIONS, FULL_TRIGGER } from './helpers'; + +const EVENT_TRIGGER = { + eventType: 'google.cloud.pubsub.topic.v1.messagePublished', + resource: 'projects/aProject/topics/topic', +}; + +describe('onMessagePublished', () => { + beforeEach(() => { + options.setGlobalOptions({}); + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a minimal trigger with appropriate values', () => { + const result = pubsub.onMessagePublished('topic', () => 42); + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + eventTrigger: EVENT_TRIGGER, + labels: {}, + }); + }); + + it('should create a complex trigger with appropriate values', () => { + const result = pubsub.onMessagePublished( + { ...FULL_OPTIONS, topic: 'topic' }, + () => 42 + ); + expect(result.__trigger).to.deep.equal({ + ...FULL_TRIGGER, + eventTrigger: EVENT_TRIGGER, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = pubsub.onMessagePublished( + { + topic: 'topic', + region: 'us-west1', + minInstances: 3, + }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + concurrency: 20, + minInstances: 3, + regions: ['us-west1'], + labels: {}, + eventTrigger: EVENT_TRIGGER, + }); + }); + + it('should have a .run method', () => { + const func = pubsub.onMessagePublished('topic', (event) => event); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + + it('should parse pubsub messages', () => { + let json: unknown; + const messageJSON = { + messageId: 'uuid', + data: Buffer.from(JSON.stringify({ hello: 'world' })).toString('base64'), + attributes: { key: 'value' }, + orderingKey: 'orderingKey', + publishTime: new Date(Date.now()).toISOString(), + }; + const publishData: pubsub.MessagePublishedData = { + message: messageJSON as any, + subscription: 'projects/aProject/subscriptions/aSubscription', + }; + const event: CloudEvent> = { + specversion: '1.0', + source: '//pubsub.googleapis.com/projects/aProject/topics/topic', + id: 'uuid', + type: EVENT_TRIGGER.eventType, + time: messageJSON.publishTime, + data: publishData, + }; + + const func = pubsub.onMessagePublished('topic', (event) => { + json = event.data.message.json; + return event; + }); + + const eventAgain = func(event); + + // Deep equal uses JSON equality, so we'll still match even though + // Message is a class and we passed an interface. + expect(eventAgain).to.deep.equal(event); + + expect(json).to.deep.equal({ hello: 'world' }); + }); +}); diff --git a/src/v1/providers/pubsub.ts b/src/v1/providers/pubsub.ts index 264ef9480..9cd88bd86 100644 --- a/src/v1/providers/pubsub.ts +++ b/src/v1/providers/pubsub.ts @@ -206,7 +206,9 @@ export class Message { */ get json(): any { if (typeof this._json === 'undefined') { - this._json = JSON.parse(new Buffer(this.data, 'base64').toString('utf8')); + this._json = JSON.parse( + Buffer.from(this.data, 'base64').toString('utf8') + ); } return this._json; diff --git a/src/v2/base.ts b/src/v2/core.ts similarity index 51% rename from src/v2/base.ts rename to src/v2/core.ts index c2d9a6fe4..d2503739e 100644 --- a/src/v2/base.ts +++ b/src/v2/core.ts @@ -22,6 +22,9 @@ /** @internal */ export interface TriggerAnnotation { + concurrency?: number; + minInstances?: number; + maxInstances?: number; availableMemoryMb?: number; eventTrigger?: { eventType: string; @@ -40,3 +43,53 @@ export interface TriggerAnnotation { // TODO: schedule } + +/** + * A CloudEvent is a cross-platform format for encoding a serverless event. + * More information can be found in https://github.com/cloudevents/spec + */ +export interface CloudEvent { + /** Version of the CloudEvents spec for this event. */ + readonly specversion: '1.0'; + + /** A globally unique ID for this event. */ + id: string; + + /** The resource which published this event. */ + source: string; + + /** The resource, provided by source, that this event relates to */ + subject?: string; + + /** The type of event that this represents. */ + type: string; + + /** When this event occurred. */ + 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; +} + +/** A handler for CloudEvents. */ +export interface CloudFunction { + (raw: CloudEvent): any | Promise; + + __trigger: unknown; + + run(event: CloudEvent): any | Promise; +} diff --git a/src/v2/index.ts b/src/v2/index.ts index c850c54dd..cce3ac1eb 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -22,7 +22,10 @@ import * as logger from '../logger'; import * as https from './providers/https'; +import * as pubsub from './providers/pubsub'; -export { https, logger }; +export { https, pubsub, logger }; export { setGlobalOptions, GlobalOptions } from './options'; + +export { CloudFunction, CloudEvent } from './core'; diff --git a/src/v2/options.ts b/src/v2/options.ts index e3c16ff84..f0f005366 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -26,7 +26,7 @@ import { } from '../common/encoding'; import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; -import { TriggerAnnotation } from './base'; +import { TriggerAnnotation } from './core'; /** * List of all regions supported by Cloud Functions v2 @@ -222,6 +222,9 @@ export function optionsToTriggerAnnotations( copyIfPresent( annotation, opts, + 'concurrency', + 'minInstances', + 'maxInstances', 'ingressSettings', 'labels', 'vpcConnector', @@ -237,7 +240,7 @@ export function optionsToTriggerAnnotations( } ); convertIfPresent(annotation, opts, 'regions', 'region', (region) => { - if (typeof 'region' === 'string') { + if (typeof region === 'string') { return [region]; } return region; diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 7faa9c6c1..edfc4674a 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -26,7 +26,7 @@ import * as express from 'express'; import * as common from '../../common/providers/https'; import * as options from '../options'; -type Request = common.Request; +export type Request = common.Request; export type CallableContext = common.CallableContext; export type FunctionsErrorCode = common.FunctionsErrorCode; @@ -44,12 +44,16 @@ export type HttpsHandler = ( request: Request, response: express.Response ) => void | Promise; -export type CallableHandler = ( - data: any, +export type CallableHandler = ( + data: T, context: CallableContext -) => any | Promise; +) => Ret; export type HttpsFunction = HttpsHandler & { __trigger: unknown }; +export interface CallableFunction extends HttpsHandler { + __trigger: unknown; + run(data: T, context: CallableContext): Ret; +} export function onRequest( opts: HttpsOptions, @@ -106,25 +110,27 @@ export function onRequest( return handler as HttpsFunction; } -export function onCall( +export function onCall>( opts: HttpsOptions, - handler: CallableHandler -): HttpsFunction; -export function onCall(handler: CallableHandler): HttpsFunction; -export function onCall( - optsOrHandler: HttpsOptions | CallableHandler, - handler?: CallableHandler -): HttpsFunction { + handler: CallableHandler +): CallableFunction; +export function onCall>( + handler: CallableHandler +): CallableFunction; +export function onCall>( + optsOrHandler: HttpsOptions | CallableHandler, + handler?: CallableHandler +): CallableFunction { let opts: HttpsOptions; if (arguments.length == 1) { opts = {}; - handler = optsOrHandler as CallableHandler; + handler = optsOrHandler as CallableHandler; } else { opts = optsOrHandler as HttpsOptions; } const origin = 'cors' in opts ? opts.cors : true; - const func = common.onCallHandler({ origin, methods: 'POST' }, handler); + const func: any = common.onCallHandler({ origin, methods: 'POST' }, handler); Object.defineProperty(func, '__trigger', { get: () => { @@ -154,5 +160,7 @@ export function onCall( }; }, }); - return func as HttpsFunction; + + func.run = handler; + return func; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts new file mode 100644 index 000000000..43ad15d57 --- /dev/null +++ b/src/v2/providers/pubsub.ts @@ -0,0 +1,168 @@ +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; + +/** + * Interface representing a Google Cloud Pub/Sub message. + * + * @param data Payload of a Pub/Sub message. + */ +export class Message { + /** + * Autogenerated ID that uniquely identifies this message. + */ + readonly messageId: string; + + /** + * Time the message was published + */ + readonly publishTime: string; + + /** + * The data payload of this message object as a base64-encoded string. + */ + readonly data: string; + + /** + * User-defined attributes published with the message, if any. + */ + readonly attributes: { [key: string]: string }; + + /** + * User-defined key used to ensure ordering amongst messages with the same key. + */ + readonly orderingKey: string; + + /** @hidden */ + private _json: T; + + constructor(data: any) { + this.messageId = data.messageId; + this.data = data.data; + this.attributes = data.attributes || {}; + this.orderingKey = data.orderingKey || ''; + this.publishTime = data.publishTime || new Date().toISOString(); + this._json = data.json; + } + + /** + * The JSON data payload of this message object, if any. + */ + get json(): T { + if (typeof this._json === 'undefined') { + try { + 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}` + ); + } + } + + return this._json; + } + + /** + * Returns a JSON-serializable representation of this object. + * + * @return A JSON-serializable representation of this object. + */ + toJSON(): any { + const json: Record = { + messageId: this.messageId, + data: this.data, + publishTime: this.publishTime, + }; + if (Object.keys(this.attributes).length) { + json.attributes = this.attributes; + } + if (this.orderingKey) { + json.orderingKey = this.orderingKey; + } + return json; + } +} + +/** The interface published in a Pub/Sub publish subscription. */ +export interface MessagePublishedData { + readonly message: Message; + readonly subscription: string; +} + +/** PubSubOptions extend EventHandlerOptions but must include a topic. */ +export interface PubSubOptions extends options.EventHandlerOptions { + topic: string; +} + +/** Handle a message being published to a Pub/Sub topic. */ +export function onMessagePublished( + topic: string, + handler: (event: CloudEvent>) => any | Promise +): CloudFunction>; + +/** Handle a message being published to a Pub/Sub topic. */ +export function onMessagePublished( + options: PubSubOptions, + handler: (event: CloudEvent>) => any | Promise +): CloudFunction>; + +export function onMessagePublished( + topicOrOptions: string | PubSubOptions, + handler: (event: CloudEvent>) => any | Promise +): CloudFunction> { + let topic: string; + let opts: options.EventHandlerOptions; + if (typeof topicOrOptions === 'string') { + topic = topicOrOptions; + opts = {}; + } else { + topic = topicOrOptions.topic; + opts = { ...topicOrOptions }; + delete (opts as any).topic; + } + + const func = (raw: CloudEvent) => { + const messagePublishedData = raw.data as { + message: unknown; + subscription: string; + }; + messagePublishedData.message = new Message(messagePublishedData.message); + return handler(raw as CloudEvent>); + }; + + func.run = handler; + + // TypeScript doesn't recongize defineProperty as adding a property and complains + // that __trigger doesn't exist. We can either cast to any and lose all type safety + // or we can just assign a meaningless value before calling defineProperty. + func.__trigger = 'silence the transpiler'; + + Object.defineProperty(func, '__trigger', { + get: () => { + const baseOpts = options.optionsToTriggerAnnotations( + options.getGlobalOptions() + ); + const specificOpts = options.optionsToTriggerAnnotations(opts); + + return { + // TODO(inlined): Remove "apiVersion" once the CLI has migrated to + // "platform" + apiVersion: 2, + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType: 'google.cloud.pubsub.topic.v1.messagePublished', + resource: `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`, + }, + }; + }, + }); + + return func; +} From 63a0cc4c59e3ba4f08e45027f7dd5235fa63138a Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Mon, 2 Aug 2021 13:38:31 -0400 Subject: [PATCH 326/705] Set Access Control for HTTP Functions (v1) (#921) * add invoker option to RunWith * fixing lint issue * adding invoker checking logic * adding tests * find invoker in the trigger options during cli deployment * fix lint/format * add checks for public/private in invoker arrray --- spec/v1/function-builder.spec.ts | 40 ++++++++++++++++++++++++++++++++ src/v1/cloud-functions.ts | 5 +++- src/v1/function-builder.ts | 37 +++++++++++++++++++++++++++++ src/v1/function-configuration.ts | 10 ++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) diff --git a/spec/v1/function-builder.spec.ts b/spec/v1/function-builder.spec.ts index bfb9e99fc..86a441c67 100644 --- a/spec/v1/function-builder.spec.ts +++ b/spec/v1/function-builder.spec.ts @@ -439,4 +439,44 @@ describe('FunctionBuilder', () => { }) ).to.throw(); }); + + it('should throw an error if invoker is an empty string', () => { + expect(() => + functions.runWith({ + invoker: '', + }) + ).to.throw(); + }); + + it('should throw an error if invoker is an empty array', () => { + expect(() => + functions.runWith({ + invoker: [''], + }) + ).to.throw(); + }); + + it('should throw an error if invoker has an empty string', () => { + expect(() => + functions.runWith({ + invoker: ['service-account1', '', 'service-account2'], + }) + ).to.throw(); + }); + + it('should throw an error if public identifier is in the invoker array', () => { + expect(() => + functions.runWith({ + invoker: ['service-account1', 'public', 'service-account2'], + }) + ).to.throw(); + }); + + it('', () => { + expect(() => + functions.runWith({ + invoker: ['service-account1', 'private', 'service-account2'], + }) + ).to.throw(); + }); }); diff --git a/src/v1/cloud-functions.ts b/src/v1/cloud-functions.ts index ef7b8debe..fc8f1406a 100644 --- a/src/v1/cloud-functions.ts +++ b/src/v1/cloud-functions.ts @@ -27,6 +27,7 @@ import { DEFAULT_FAILURE_POLICY, DeploymentOptions, FailurePolicy, + Invoker, Schedule, } from './function-configuration'; export { Request, Response }; @@ -278,6 +279,7 @@ export interface TriggerAnnotated { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; + invoker?: Invoker | Invoker[]; }; } @@ -497,7 +499,8 @@ export function optionsToTrigger(options: DeploymentOptions) { 'ingressSettings', 'vpcConnectorEgressSettings', 'vpcConnector', - 'labels' + 'labels', + 'invoker' ); convertIfPresent( trigger, diff --git a/src/v1/function-builder.ts b/src/v1/function-builder.ts index b421668d4..ada3b724c 100644 --- a/src/v1/function-builder.ts +++ b/src/v1/function-builder.ts @@ -192,6 +192,43 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { ); } } + + if ( + typeof runtimeOptions.invoker === 'string' && + runtimeOptions.invoker.length === 0 + ) { + throw new Error( + 'Invalid service account for function invoker, must be a non-empty string' + ); + } + if ( + runtimeOptions.invoker !== undefined && + Array.isArray(runtimeOptions.invoker) + ) { + if (runtimeOptions.invoker.length === 0) { + throw new Error( + 'Invalid invoker array, must contain at least 1 service account entry' + ); + } + for (const serviceAccount of runtimeOptions.invoker) { + if (serviceAccount.length === 0) { + throw new Error( + 'Invalid invoker array, a service account must be a non-empty string' + ); + } + if (serviceAccount === 'public') { + throw new Error( + "Invalid invoker array, a service account cannot be set to the 'public' identifier" + ); + } + if (serviceAccount === 'private') { + throw new Error( + "Invalid invoker array, a service account cannot be set to the 'private' identifier" + ); + } + } + } + return true; } diff --git a/src/v1/function-configuration.ts b/src/v1/function-configuration.ts index b1ed51623..f7acef18e 100644 --- a/src/v1/function-configuration.ts +++ b/src/v1/function-configuration.ts @@ -98,6 +98,11 @@ export const DEFAULT_FAILURE_POLICY: FailurePolicy = { export const MAX_NUMBER_USER_LABELS = 58; +/** + * Invoker access control type for https functions. + */ +export type Invoker = 'public' | 'private' | string; + export interface RuntimeOptions { /** * Which platform should host the backend. Valid options are "gcfv1" @@ -156,6 +161,11 @@ export interface RuntimeOptions { * User labels to set on the function. */ labels?: Record; + + /** + * Invoker to set access control on https functions. + */ + invoker?: Invoker | Invoker[]; } export interface DeploymentOptions extends RuntimeOptions { From 6d16d52bb53512c759432685ae27cdb33beca575 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Wed, 4 Aug 2021 08:44:41 -0700 Subject: [PATCH 327/705] Adds "params" package for environment variable helpers and type coercion (#928) --- package.json | 4 + spec/v2/params.spec.ts | 276 +++++++++++++++++++++++++++++++++++++++++ src/v2/index.ts | 3 +- src/v2/options.ts | 17 ++- src/v2/params/index.ts | 125 +++++++++++++++++++ src/v2/params/types.ts | 150 ++++++++++++++++++++++ 6 files changed, 573 insertions(+), 2 deletions(-) create mode 100644 spec/v2/params.spec.ts create mode 100644 src/v2/params/index.ts create mode 100644 src/v2/params/types.ts diff --git a/package.json b/package.json index 50e55574d..2f73ad585 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "./v2/core": "./lib/v2/core.js", "./v2/options": "./lib/v2/options.js", "./v2/https": "./lib/v2/providers/https.js", + "./v2/params": "./lib/v2/params/index.js", "./v2/pubsub": "./lib/v2/providers/pubsub.js" }, "typesVersions": { @@ -59,6 +60,9 @@ "v2/https": [ "lib/v2/providers/https" ], + "v2/params": [ + "lib/v2/params" + ], "v2/pubsub": [ "lib/v2/providers/pubsub" ] diff --git a/spec/v2/params.spec.ts b/spec/v2/params.spec.ts new file mode 100644 index 000000000..d5d4d35f2 --- /dev/null +++ b/spec/v2/params.spec.ts @@ -0,0 +1,276 @@ +import { expect } from 'chai'; +import { + declaredParams, + defineBoolean, + defineFloat, + defineInt, + defineJSON, + defineList, + defineString, +} from '../../src/v2/params'; +import { ListParam, Param, ParamOptions } from '../../src/v2/params/types'; + +const TEST_PARAM = 'TEST_PARAM'; + +describe('params', () => { + beforeEach(() => { + delete process.env[TEST_PARAM]; + }); + + const VALUE_TESTS: { + method: (name: string, options: ParamOptions) => Param; + tests: { + title: string; + env?: string; + options?: ParamOptions; + expect?: any; + throws?: boolean; + }[]; + }[] = [ + { + method: defineString, + tests: [ + { + title: "should return a '' zero value when no value and no undefined", + expect: '', + }, + { + title: 'should return the default when no value and one is provided', + env: undefined, + options: { default: 'test_val' }, + expect: 'test_val', + }, + { + title: 'should return the value over the default', + env: 'expected_val', + options: { default: 'default_val' }, + expect: 'expected_val', + }, + ], + }, + { + method: defineInt, + tests: [ + { + title: 'should return 0 zero value', + expect: 0, + }, + { + title: 'should coerce a matching string into an int', + env: '25', + expect: 25, + }, + { + title: 'should return a matching default value', + options: { default: 10 }, + expect: 10, + }, + { + title: 'should throw when invalid value is passed', + env: 'not_a_number', + throws: true, + }, + ], + }, + { + method: defineFloat, + tests: [ + { + title: 'should return 0 zero value', + expect: 0, + }, + { + title: 'should coerce a matching string into a float', + env: '3.14', + expect: 3.14, + }, + { + title: 'should return a matching default value', + options: { default: 10.1 }, + expect: 10.1, + }, + { + title: 'should throw when invalid value is passed', + env: 'not_a_number', + throws: true, + }, + ], + }, + { + method: defineBoolean, + tests: [ + { + title: 'should return false zero value', + expect: false, + }, + { + title: 'should coerce "true" into true', + env: 'true', + expect: true, + }, + { + title: 'should coerce "TrUe" into true', + env: 'TrUe', + expect: true, + }, + { + title: 'should coerce "yes" into true', + env: 'yes', + expect: true, + }, + { + title: 'should coerce "1" into true', + env: '1', + expect: true, + }, + { + title: 'should coerce "false" into false', + env: 'false', + options: { default: true }, + expect: false, + }, + { + title: 'should coerce "FaLsE" into false', + env: 'FaLsE', + options: { default: true }, + expect: false, + }, + { + title: 'should coerce "no" into false', + env: 'no', + options: { default: true }, + expect: false, + }, + { + title: 'should coerce "0" into false', + env: '0', + options: { default: true }, + expect: false, + }, + { + title: 'should return a matching default value', + options: { default: true }, + expect: true, + }, + { + title: 'should error with non-true/false value', + env: 'foo', + throws: true, + }, + ], + }, + { + method: defineList, + tests: [ + { + title: 'should return [] zero value', + expect: [], + }, + { + title: 'should coerce comma-separated values into a string list', + env: 'first,second,third', + expect: ['first', 'second', 'third'], + }, + { + title: + 'should coerce a comma-and-space-separated values into a string list', + env: 'first, second, third', + expect: ['first', 'second', 'third'], + }, + { + title: 'should return a matching default value', + options: { default: ['a', 'b', 'c'] }, + expect: ['a', 'b', 'c'], + }, + ], + }, + { + method: defineJSON, + tests: [ + { + title: 'should return {} zero value', + expect: {}, + }, + { + title: 'should coerce objects from JSON', + env: '{"test":123}', + expect: { test: 123 }, + }, + { + title: 'should coerce arrays from JSON', + env: '["test",123]', + expect: ['test', 123], + }, + { + title: 'should return a matching default value', + options: { default: { test: 123 } }, + expect: { test: 123 }, + }, + { + title: 'should throw with invalid JSON', + env: '{"invalid":json', + throws: true, + }, + ], + }, + ]; + + for (const group of VALUE_TESTS) { + describe(`${group.method.name}().value`, () => { + for (const test of group.tests) { + it(test.title, () => { + if (typeof test.env !== 'undefined') { + process.env[TEST_PARAM] = test.env; + } + + if (test.throws) { + expect( + () => group.method(TEST_PARAM, test.options).value + ).to.throw(); + } else { + expect(group.method(TEST_PARAM, test.options).value).to.deep.eq( + test.expect + ); + } + }); + } + }); + } + + describe('Param', () => { + describe('#toSpec()', () => { + it('should cast non-string defaults to strings', () => { + expect(new Param(TEST_PARAM, { default: 123 }).toSpec().default).to.eq( + '123' + ); + }); + + it('should passthrough supplied options', () => { + expect( + new Param(TEST_PARAM, { description: 'hello expect' }).toSpec() + .description + ).to.eq('hello expect'); + }); + + it('ListParam should properly stringify its default', () => { + const spec = new ListParam(TEST_PARAM, { + default: ['a', 'b', 'c'], + }).toSpec(); + expect(spec.default).to.eq('a,b,c'); + }); + }); + }); + + it('should add a param to the declared params', () => { + const param = defineString(TEST_PARAM); + expect(declaredParams.find((p) => p === param)).to.eq(param); + }); + + it('should replace a samed-name param in the declared params', () => { + const oldParam = defineString(TEST_PARAM); + expect(declaredParams.find((p) => p === oldParam)).to.eq(oldParam); + const param = defineString(TEST_PARAM); + expect(declaredParams.find((p) => p === oldParam)).to.be.undefined; + expect(declaredParams.find((p) => p === param)).to.eq(param); + }); +}); diff --git a/src/v2/index.ts b/src/v2/index.ts index cce3ac1eb..9a6b327d6 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -23,8 +23,9 @@ import * as logger from '../logger'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; +import * as params from './params'; -export { https, pubsub, logger }; +export { https, pubsub, logger, params }; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/options.ts b/src/v2/options.ts index f0f005366..fd93bef86 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -24,8 +24,10 @@ import { durationFromSeconds, serviceAccountFromShorthand, } from '../common/encoding'; -import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; +import { copyIfPresent, convertIfPresent } from '../common/encoding'; +import { ParamSpec } from './params/types'; +import { declaredParams } from './params'; import { TriggerAnnotation } from './core'; /** @@ -271,3 +273,16 @@ export function optionsToTriggerAnnotations( return annotation; } + +/** + * @hidden + */ +export function __getSpec(): { + globalOptions: GlobalOptions; + params: ParamSpec[]; +} { + return { + globalOptions: getGlobalOptions(), + params: declaredParams.map((p) => p.toSpec()), + }; +} diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts new file mode 100644 index 000000000..48361b8fc --- /dev/null +++ b/src/v2/params/index.ts @@ -0,0 +1,125 @@ +import { + BooleanParam, + FloatParam, + IntParam, + JSONParam, + ListParam, + Param, + ParamOptions, + StringParam, +} from './types'; + +export { ParamOptions }; + +export const declaredParams: Param[] = []; + +/** + * Use a helper to manage the list such that params are uniquely + * registered once only but order is preserved. + * @internal + */ +function registerParam(param: Param) { + for (let i = 0; i < declaredParams.length; i++) { + if (declaredParams[i].name === param.name) { + declaredParams.splice(i, 1); + } + } + declaredParams.push(param); +} + +/** + * Declare a string param. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `string` return type for `.value`. + */ +export function defineString( + name: string, + options: ParamOptions = {} +): StringParam { + const param = new StringParam(name, options); + registerParam(param); + return param; +} + +/** + * Declare a boolean param. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `boolean` return type for `.value`. + */ +export function defineBoolean( + name: string, + options: ParamOptions = {} +): BooleanParam { + const param = new BooleanParam(name, options); + registerParam(param); + return param; +} + +/** + * Declare an integer param. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `number` return type for `.value`. + */ +export function defineInt( + name: string, + options: ParamOptions = {} +): IntParam { + const param = new IntParam(name, options); + registerParam(param); + return param; +} + +/** + * Declare a float param. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `number` return type for `.value`. + */ +export function defineFloat( + name: string, + options: ParamOptions = {} +): FloatParam { + const param = new FloatParam(name, options); + registerParam(param); + return param; +} + +/** + * Declare a list param (array of strings). + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `string[]` return type for `.value`. + */ +export function defineList( + name: string, + options: ParamOptions = {} +): ListParam { + const param = new ListParam(name, options); + registerParam(param); + return param; +} + +/** + * Declare a JSON param. The associated environment variable will be treated + * as a JSON string when loading its value. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a specifiable return type for `.value`. + */ +export function defineJSON( + name: string, + options: ParamOptions = {} +): JSONParam { + const param = new JSONParam(name, options); + registerParam(param); + return param; +} diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts new file mode 100644 index 000000000..ffa0fa5de --- /dev/null +++ b/src/v2/params/types.ts @@ -0,0 +1,150 @@ +type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; + +export interface ParamSpec { + default?: T; + label?: string; + description?: string; + valueType?: ParamValueType; +} + +export type ParamOptions = Omit, 'valueType'>; + +export class Param { + static valueType: ParamValueType = 'string'; + + constructor(readonly name: string, readonly options: ParamOptions = {}) {} + + get rawValue(): string | undefined { + return process.env[this.name]; + } + + get value(): any { + return this.rawValue || this.options.default || ''; + } + + toString() { + return `{{params.${this.name}}}`; + } + + toJSON() { + return this.toString(); + } + + toSpec(): ParamSpec { + const out: ParamSpec = { + ...this.options, + valueType: (this.constructor as typeof Param).valueType, + }; + if (this.options.default && typeof this.options.default !== 'string') { + out.default = (this.options.default as + | { toString?: () => string } + | undefined)?.toString?.(); + } + + return out as ParamSpec; + } +} + +export class StringParam extends Param { + // identical to the abstract class, just explicitly a string +} + +export class IntParam extends Param { + static valueType: ParamValueType = 'int'; + + get value(): number { + const intVal = parseInt( + this.rawValue || this.options.default?.toString() || '0', + 10 + ); + if (Number.isNaN(intVal)) { + throw new Error( + `unable to load param "${this.name}", value ${JSON.stringify( + this.rawValue + )} could not be parsed as integer` + ); + } + return intVal; + } +} + +export class FloatParam extends Param { + static valueType: ParamValueType = 'float'; + + get value(): number { + const floatVal = parseFloat( + this.rawValue || this.options.default?.toString() || '0' + ); + if (Number.isNaN(floatVal)) { + throw new Error( + `unable to load param "${this.name}", value ${JSON.stringify( + this.rawValue + )} could not be parsed as float` + ); + } + return floatVal; + } +} + +export class BooleanParam extends Param { + static valueType: ParamValueType = 'boolean'; + + get value(): boolean { + const lowerVal = ( + this.rawValue || + this.options.default?.toString() || + 'false' + ).toLowerCase(); + if ( + !['true', 'y', 'yes', '1', 'false', 'n', 'no', '0'].includes(lowerVal) + ) { + throw new Error( + `unable to load param "${this.name}", value ${JSON.stringify( + this.rawValue + )} could not be parsed as boolean` + ); + } + return ['true', 'y', 'yes', '1'].includes(lowerVal); + } +} + +export class ListParam extends Param { + static valueType: ParamValueType = 'list'; + + get value(): string[] { + return typeof this.rawValue === 'string' + ? this.rawValue.split(/, ?/) + : this.options.default || []; + } + + toSpec(): ParamSpec { + const out: ParamSpec = { + valueType: 'list', + ...this.options, + }; + if (this.options.default && this.options.default.length > 0) { + out.default = this.options.default.join(','); + } + + return out as ParamSpec; + } +} + +export class JSONParam extends Param { + static valueType: ParamValueType = 'json'; + + get value(): T { + if (this.rawValue) { + try { + return JSON.parse(this.rawValue!) as T; + } catch (e) { + throw new Error( + `unable to load param "${this.name}", value ${this.rawValue} could not be parsed as JSON: ${e.message}` + ); + } + } else if (this.options?.hasOwnProperty('default')) { + return this.options.default; + } + return {} as T; + } +} From 39766f06fe6fe110e74a23a8982a26566efad7aa Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 4 Aug 2021 14:07:48 -0700 Subject: [PATCH 328/705] v2 Callable now takes a single parameter (#929) * v2 Callable now takes a single parameter * Fix https tests --- spec/common/providers/https.spec.ts | 89 +++++++++- spec/v2/providers/https.spec.ts | 22 +-- src/common/providers/https.ts | 266 +++++++++++++++++----------- src/v2/providers/https.ts | 35 ++-- 4 files changed, 275 insertions(+), 137 deletions(-) diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 66c8e661c..d751fca38 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -38,6 +38,8 @@ interface CallTest { // The function to execute with the request. callableFunction: (data: any, context: https.CallableContext) => any; + callableFunction2: (request: https.CallableRequest) => any; + // The expected shape of the http response returned to the callable SDK. expectedHttpResponse: RunHandlerResult; } @@ -92,16 +94,27 @@ function runHandler( // Runs a CallTest test. async function runTest(test: CallTest): Promise { const opts = { origin: true, methods: 'POST' }; - const callableFunction = https.onCallHandler(opts, (data, context) => { + const callableFunctionV1 = https.onCallHandler(opts, (data, context) => { expect(data).to.deep.equal(test.expectedData); return test.callableFunction(data, context); }); - const response = await runHandler(callableFunction, test.httpRequest); + const responseV1 = await runHandler(callableFunctionV1, test.httpRequest); + + expect(responseV1.body).to.deep.equal(test.expectedHttpResponse.body); + expect(responseV1.headers).to.deep.equal(test.expectedHttpResponse.headers); + expect(responseV1.status).to.equal(test.expectedHttpResponse.status); + + const callableFunctionV2 = https.onCallHandler(opts, (request) => { + expect(request.data).to.deep.equal(test.expectedData); + return test.callableFunction2(request); + }); + + const responseV2 = await runHandler(callableFunctionV2, test.httpRequest); - expect(response.body).to.deep.equal(test.expectedHttpResponse.body); - expect(response.headers).to.deep.equal(test.expectedHttpResponse.headers); - expect(response.status).to.equal(test.expectedHttpResponse.status); + expect(responseV2.body).to.deep.equal(test.expectedHttpResponse.body); + expect(responseV2.headers).to.deep.equal(test.expectedHttpResponse.headers); + expect(responseV2.status).to.equal(test.expectedHttpResponse.status); } describe('onCallHandler', () => { @@ -138,6 +151,7 @@ describe('onCallHandler', () => { httpRequest: mockRequest({ foo: 'bar' }), expectedData: { foo: 'bar' }, callableFunction: (data, context) => ({ baz: 'qux' }), + callableFunction2: (request) => ({ baz: 'qux' }), expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -151,6 +165,7 @@ describe('onCallHandler', () => { httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => null, + callableFunction2: (request) => null, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -166,6 +181,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -183,6 +201,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, @@ -200,6 +221,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -215,6 +239,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, @@ -234,6 +261,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 400, headers: expectedResponseHeaders, @@ -251,6 +281,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { throw new Error(`ceci n'est pas une error`); }, + callableFunction2: (request) => { + throw new Error(`cece n'est pas une error`); + }, expectedHttpResponse: { status: 500, headers: expectedResponseHeaders, @@ -266,6 +299,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); }, + callableFunction2: (request) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, expectedHttpResponse: { status: 500, headers: expectedResponseHeaders, @@ -281,6 +317,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { throw new https.HttpsError('not-found', 'i am error'); }, + callableFunction2: (request) => { + throw new https.HttpsError('not-found', 'i am error'); + }, expectedHttpResponse: { status: 404, headers: expectedResponseHeaders, @@ -308,6 +347,16 @@ describe('onCallHandler', () => { expect(context.instanceIdToken).to.be.undefined; return null; }, + callableFunction2: (request) => { + expect(request.auth).to.not.be.undefined; + expect(request.auth).to.not.be.null; + expect(request.auth.uid).to.equal(mocks.user_id); + expect(request.auth.token.uid).to.equal(mocks.user_id); + expect(request.auth.token.sub).to.equal(mocks.user_id); + expect(request.auth.token.aud).to.equal(projectId); + expect(request.instanceIdToken).to.be.undefined; + return null; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -326,6 +375,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 401, headers: expectedResponseHeaders, @@ -360,6 +412,19 @@ describe('onCallHandler', () => { expect(context.instanceIdToken).to.be.undefined; return null; }, + callableFunction2: (request) => { + expect(request.app).to.not.be.undefined; + expect(request.app).to.not.be.null; + expect(request.app.appId).to.equal(appId); + expect(request.app.token.app_id).to.be.equal(appId); + expect(request.app.token.sub).to.be.equal(appId); + expect(request.app.token.aud).to.be.deep.equal([ + `projects/${projectId}`, + ]); + expect(request.auth).to.be.undefined; + expect(request.instanceIdToken).to.be.undefined; + return null; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -378,6 +443,9 @@ describe('onCallHandler', () => { callableFunction: (data, context) => { return; }, + callableFunction2: (request) => { + return; + }, expectedHttpResponse: { status: 401, headers: expectedResponseHeaders, @@ -402,6 +470,11 @@ describe('onCallHandler', () => { expect(context.instanceIdToken).to.equal('iid-token'); return null; }, + callableFunction2: (request) => { + expect(request.auth).to.be.undefined; + expect(request.instanceIdToken).to.equal('iid-token'); + return null; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -420,6 +493,11 @@ describe('onCallHandler', () => { expect(context.rawRequest).to.equal(mockReq); return null; }, + callableFunction2: (request) => { + expect(request.rawRequest).to.not.be.undefined; + expect(request.rawRequest).to.equal(mockReq); + return null; + }, expectedHttpResponse: { status: 200, headers: expectedResponseHeaders, @@ -477,7 +555,6 @@ describe('encoding/decoding', () => { it('encodes double', () => { expect(https.encode(1.2)).to.equal(1.2); }); - it('decodes double', () => { expect(https.decode(1.2)).to.equal(1.2); }); diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 7103372a0..6bc4030e8 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -194,7 +194,7 @@ describe('onCall', () => { }); it('should return a minimal trigger with appropriate values', () => { - const result = https.onCall((data, context) => 42); + const result = https.onCall((request) => 42); expect(result.__trigger).to.deep.equal({ apiVersion: 2, platform: 'gcfv2', @@ -208,7 +208,7 @@ describe('onCall', () => { }); it('should create a complex trigger with appropriate values', () => { - const result = https.onCall(FULL_OPTIONS, (data, context) => 42); + const result = https.onCall(FULL_OPTIONS, (request) => 42); expect(result.__trigger).to.deep.equal({ ...FULL_TRIGGER, httpsTrigger: { @@ -233,7 +233,7 @@ describe('onCall', () => { region: ['us-west1', 'us-central1'], minInstances: 3, }, - (data, context) => 42 + (request) => 42 ); expect(result.__trigger).to.deep.equal({ @@ -252,23 +252,23 @@ describe('onCall', () => { }); it('has a .run method', () => { - const cf = https.onCall((d, c) => { - return { data: d, context: c }; + const cf = https.onCall((request) => { + return request; }); - const data = 'data'; - const context: any = { + const request: any = { + data: 'data', instanceIdToken: 'token', auth: { uid: 'abc', token: 'token', }, }; - expect(cf.run(data, context)).to.deep.equal({ data, context }); + expect(cf.run(request)).to.deep.equal(request); }); it('should be an express handler', async () => { - const func = https.onCall((data, context) => 42); + const func = https.onCall((request) => 42); const req = new MockRequest( { @@ -286,7 +286,7 @@ describe('onCall', () => { }); it('should enforce CORS options', async () => { - const func = https.onCall({ cors: 'example.com' }, (req, res) => { + const func = https.onCall({ cors: 'example.com' }, (request) => { throw new Error('Should not reach here for OPTIONS preflight'); }); @@ -314,7 +314,7 @@ describe('onCall', () => { }); it('adds CORS headers', async () => { - const func = https.onCall((data, context) => 42); + const func = https.onCall((request) => 42); const req = new MockRequest( { data: {}, diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 1b3d93a8b..e2f73f7a5 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -35,6 +35,78 @@ export interface Request extends express.Request { rawBody: Buffer; } +/** + * The interface for AppCheck tokens verified in Callable functions + */ +export interface AppCheckData { + appId: string; + + // This is actually a firebase.appCheck.DecodedAppCheckToken, but + // that type may not be available in some supported SDK versions. + // Declare as an inline type, which DecodedAppCheckToken will be + // able to merge with. + // TODO: Replace with the real type once we bump the min-version of + // the admin SDK + token: { + /** + * The issuer identifier for the issuer of the response. + * + * This value is a URL with the format + * `https://firebaseappcheck.googleapis.com/`, where `` is the + * same project number specified in the [`aud`](#aud) property. + */ + iss: string; + + /** + * The Firebase App ID corresponding to the app the token belonged to. + * + * As a convenience, this value is copied over to the [`app_id`](#app_id) property. + */ + sub: string; + + /** + * The audience for which this token is intended. + * + * This value is a JSON array of two strings, the first is the project number of your + * Firebase project, and the second is the project ID of the same project. + */ + aud: string[]; + + /** + * The App Check token's expiration time, in seconds since the Unix epoch. That is, the + * time at which this App Check token expires and should no longer be considered valid. + */ + exp: number; + + /** + * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the + * time at which this App Check token was issued and should start to be considered + * valid. + */ + iat: number; + + /** + * The App ID corresponding to the App the App Check token belonged to. + * + * This value is not actually one of the JWT token claims. It is added as a + * convenience, and is set as the value of the [`sub`](#sub) property. + */ + app_id: string; + [key: string]: any; + }; +} + +/** + * The interface for Auth tokens verified in Callable functions + */ +export interface AuthData { + uid: string; + token: firebase.auth.DecodedIdToken; +} + +// This type is the direct v1 callable interface and is also an interface +// that the v2 API can conform to. This allows us to pass the v2 CallableRequest +// directly to the same helper methods. /** * The interface for metadata for the API as passed to the handler. */ @@ -42,71 +114,45 @@ export interface CallableContext { /** * The result of decoding and verifying a Firebase AppCheck token. */ - app?: { - appId: string; - - // This is actually a firebase.appCheck.DecodedAppCheckToken, but - // that type may not be available in some supported SDK versions. - // Declare as an inline type, which DecodedAppCheckToken will be - // able to merge with. - // TODO: Replace with the real type once we bump the min-version of - // the admin SDK - token: { - /** - * The issuer identifier for the issuer of the response. - * - * This value is a URL with the format - * `https://firebaseappcheck.googleapis.com/`, where `` is the - * same project number specified in the [`aud`](#aud) property. - */ - iss: string; - - /** - * The Firebase App ID corresponding to the app the token belonged to. - * - * As a convenience, this value is copied over to the [`app_id`](#app_id) property. - */ - sub: string; - - /** - * The audience for which this token is intended. - * - * This value is a JSON array of two strings, the first is the project number of your - * Firebase project, and the second is the project ID of the same project. - */ - aud: string[]; - - /** - * The App Check token's expiration time, in seconds since the Unix epoch. That is, the - * time at which this App Check token expires and should no longer be considered valid. - */ - exp: number; - - /** - * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the - * time at which this App Check token was issued and should start to be considered - * valid. - */ - iat: number; - - /** - * The App ID corresponding to the App the App Check token belonged to. - * - * This value is not actually one of the JWT token claims. It is added as a - * convenience, and is set as the value of the [`sub`](#sub) property. - */ - app_id: string; - [key: string]: any; - }; - }; + app?: AppCheckData; /** * The result of decoding and verifying a Firebase Auth ID token. */ - auth?: { - uid: string; - token: firebase.auth.DecodedIdToken; - }; + auth?: AuthData; + + /** + * An unverified token for a Firebase Instance ID. + */ + instanceIdToken?: string; + + /** + * The raw request handled by the callable. + */ + rawRequest: Request; +} + +// This could be a simple extension of CallableContext, but we're +// avoiding that to avoid muddying the docs and making a v2 type depend +// on a v1 type. +/** + * The request used to call a callable function. + */ +export interface CallableRequest { + /** + * The parameters used by a client when calling this function. + */ + data: T; + + /** + * The result of decoding and verifying a Firebase AppCheck token. + */ + app?: AppCheckData; + + /** + * The result of decoding and verifying a Firebase Auth ID token. + */ + auth?: AuthData; /** * An unverified token for a Firebase Instance ID. @@ -543,10 +589,13 @@ async function checkTokens( return verifications; } +type v1Handler = (data: any, context: CallableContext) => any | Promise; +type v2Handler = (request: CallableRequest) => Res; + /** @hidden */ -export function onCallHandler( +export function onCallHandler( options: cors.CorsOptions, - handler: (data: any, context: CallableContext) => any | Promise + handler: v1Handler | v2Handler ): (req: Request, res: express.Response) => Promise { const wrapped = wrapOnCallHandler(handler); return async (req: Request, res: express.Response) => { @@ -557,49 +606,62 @@ export function onCallHandler( } /** @internal */ -const wrapOnCallHandler = ( - handler: (data: any, context: CallableContext) => any | Promise -) => async (req: Request, res: express.Response) => { - try { - if (!isValidRequest(req)) { - logger.error('Invalid request, unable to process.'); - throw new HttpsError('invalid-argument', 'Bad Request'); - } +function wrapOnCallHandler( + handler: v1Handler | v2Handler +): (req: Request, res: express.Response) => Promise { + return async (req: Request, res: express.Response): Promise => { + try { + if (!isValidRequest(req)) { + logger.error('Invalid request, unable to process.'); + throw new HttpsError('invalid-argument', 'Bad Request'); + } - const context: CallableContext = { rawRequest: req }; - const tokenStatus = await checkTokens(req, context); - if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { - throw new HttpsError('unauthenticated', 'Unauthenticated'); - } + const context: CallableContext = { rawRequest: req }; + const tokenStatus = await checkTokens(req, context); + if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { + throw new HttpsError('unauthenticated', 'Unauthenticated'); + } - const instanceId = req.header('Firebase-Instance-ID-Token'); - if (instanceId) { - // Validating the token requires an http request, so we don't do it. - // If the user wants to use it for something, it will be validated then. - // Currently, the only real use case for this token is for sending - // pushes with FCM. In that case, the FCM APIs will validate the token. - context.instanceIdToken = req.header('Firebase-Instance-ID-Token'); - } + const instanceId = req.header('Firebase-Instance-ID-Token'); + if (instanceId) { + // Validating the token requires an http request, so we don't do it. + // If the user wants to use it for something, it will be validated then. + // Currently, the only real use case for this token is for sending + // pushes with FCM. In that case, the FCM APIs will validate the token. + context.instanceIdToken = req.header('Firebase-Instance-ID-Token'); + } - const data = decode(req.body.data); - let result: any = await handler(data, context); + const data: Req = decode(req.body.data); + let result: Res; + if (handler.length === 2) { + result = await handler(data, context); + } else { + const arg: CallableRequest = { + ...context, + data, + }; + // For some reason the type system isn't picking up that the handler + // is a one argument function. + result = await (handler as any)(arg); + } - // Encode the result as JSON to preserve types like Dates. - result = encode(result); + // Encode the result as JSON to preserve types like Dates. + result = encode(result); - // If there was some result, encode it in the body. - const responseBody: HttpResponseBody = { result }; - res.status(200).send(responseBody); - } catch (err) { - if (!(err instanceof HttpsError)) { - // This doesn't count as an 'explicit' error. - logger.error('Unhandled error', err); - err = new HttpsError('internal', 'INTERNAL'); - } + // If there was some result, encode it in the body. + const responseBody: HttpResponseBody = { result }; + res.status(200).send(responseBody); + } catch (err) { + if (!(err instanceof HttpsError)) { + // This doesn't count as an 'explicit' error. + logger.error('Unhandled error', err); + err = new HttpsError('internal', 'INTERNAL'); + } - const { status } = err.httpErrorCode; - const body = { error: err.toJSON() }; + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; - res.status(status).send(body); - } -}; + res.status(status).send(body); + } + }; +} diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index edfc4674a..b31a1207c 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -28,7 +28,7 @@ import * as options from '../options'; export type Request = common.Request; -export type CallableContext = common.CallableContext; +export type CallableRequest = common.CallableRequest; export type FunctionsErrorCode = common.FunctionsErrorCode; export type HttpsError = common.HttpsError; @@ -44,15 +44,14 @@ export type HttpsHandler = ( request: Request, response: express.Response ) => void | Promise; -export type CallableHandler = ( - data: T, - context: CallableContext -) => Ret; +export type CallableHandler = ( + request: CallableRequest +) => Return; export type HttpsFunction = HttpsHandler & { __trigger: unknown }; -export interface CallableFunction extends HttpsHandler { +export interface CallableFunction extends HttpsHandler { __trigger: unknown; - run(data: T, context: CallableContext): Ret; + run(data: CallableRequest): Return; } export function onRequest( @@ -110,21 +109,21 @@ export function onRequest( return handler as HttpsFunction; } -export function onCall>( +export function onCall>( opts: HttpsOptions, - handler: CallableHandler -): CallableFunction; -export function onCall>( - handler: CallableHandler -): CallableFunction; -export function onCall>( - optsOrHandler: HttpsOptions | CallableHandler, - handler?: CallableHandler -): CallableFunction { + handler: CallableHandler +): CallableFunction; +export function onCall>( + handler: CallableHandler +): CallableFunction; +export function onCall>( + optsOrHandler: HttpsOptions | CallableHandler, + handler?: CallableHandler +): CallableFunction { let opts: HttpsOptions; if (arguments.length == 1) { opts = {}; - handler = optsOrHandler as CallableHandler; + handler = optsOrHandler as CallableHandler; } else { opts = optsOrHandler as HttpsOptions; } From 94f5396c50f0373f4fe9e99e6801a08e6a38cc62 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 4 Aug 2021 15:22:57 -0700 Subject: [PATCH 329/705] Improve typings in HTTPS and Pub/Sub functions. (#931) Improve typings in HTTPS and Pub/Sub functions. 1. Defaulted all generic arguments for functions and types to `any` 2. Inlined handler arguments in HTTPS functions to improve code complete --- spec/v2/params.spec.ts | 8 ++--- spec/v2/providers/https.spec.ts | 17 ++++++++++ spec/v2/providers/pubsub.spec.ts | 20 ++++++++++++ src/common/providers/https.ts | 2 +- src/v2/index.ts | 2 +- src/v2/options.ts | 6 ++-- src/v2/providers/https.ts | 54 +++++++++++++++++++------------- src/v2/providers/pubsub.ts | 8 ++--- 8 files changed, 82 insertions(+), 35 deletions(-) diff --git a/spec/v2/params.spec.ts b/spec/v2/params.spec.ts index d5d4d35f2..9885276cd 100644 --- a/spec/v2/params.spec.ts +++ b/spec/v2/params.spec.ts @@ -17,16 +17,16 @@ describe('params', () => { delete process.env[TEST_PARAM]; }); - const VALUE_TESTS: { + const VALUE_TESTS: Array<{ method: (name: string, options: ParamOptions) => Param; - tests: { + tests: Array<{ title: string; env?: string; options?: ParamOptions; expect?: any; throws?: boolean; - }[]; - }[] = [ + }>; + }> = [ { method: defineString, tests: [ diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 6bc4030e8..62f4757cb 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -332,4 +332,21 @@ describe('onCall', () => { expect(response.body).to.be.deep.equal({ result: 42 }); expect(response.headers).to.deep.equal(expectedResponseHeaders); }); + + // These tests pass if the code transpiles + it('allows desirable syntax', () => { + https.onCall( + (request: https.CallableRequest) => `hello, ${request.data}!` + ); + https.onCall( + (request: https.CallableRequest) => `hello, ${request.data}!` + ); + https.onCall( + (request: https.CallableRequest) => `hello, ${request.data}!` + ); + https.onCall( + (request: https.CallableRequest) => `Hello, ${request.data}` + ); + https.onCall((request: https.CallableRequest) => `Hello, ${request.data}`); + }); }); diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index f1669de7f..4fc338614 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -111,4 +111,24 @@ describe('onMessagePublished', () => { expect(json).to.deep.equal({ hello: 'world' }); }); + + // These tests pass if the transpiler works + it('allows desirable syntax', () => { + pubsub.onMessagePublished( + 'topic', + (event: CloudEvent>) => {} + ); + pubsub.onMessagePublished( + 'topic', + (event: CloudEvent) => {} + ); + pubsub.onMessagePublished( + 'topic', + (event: CloudEvent>) => {} + ); + pubsub.onMessagePublished( + 'topic', + (event: CloudEvent) => {} + ); + }); }); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index e2f73f7a5..372e4fdbf 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -138,7 +138,7 @@ export interface CallableContext { /** * The request used to call a callable function. */ -export interface CallableRequest { +export interface CallableRequest { /** * The parameters used by a client when calling this function. */ diff --git a/src/v2/index.ts b/src/v2/index.ts index 9a6b327d6..679df995a 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -21,9 +21,9 @@ // SOFTWARE. import * as logger from '../logger'; +import * as params from './params'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; -import * as params from './params'; export { https, pubsub, logger, params }; diff --git a/src/v2/options.ts b/src/v2/options.ts index fd93bef86..372e49566 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -24,11 +24,11 @@ import { durationFromSeconds, serviceAccountFromShorthand, } from '../common/encoding'; +import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; -import { copyIfPresent, convertIfPresent } from '../common/encoding'; -import { ParamSpec } from './params/types'; -import { declaredParams } from './params'; import { TriggerAnnotation } from './core'; +import { declaredParams } from './params'; +import { ParamSpec } from './params/types'; /** * List of all regions supported by Cloud Functions v2 diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index b31a1207c..0e70c4176 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -28,7 +28,7 @@ import * as options from '../options'; export type Request = common.Request; -export type CallableRequest = common.CallableRequest; +export type CallableRequest = common.CallableRequest; export type FunctionsErrorCode = common.FunctionsErrorCode; export type HttpsError = common.HttpsError; @@ -40,33 +40,43 @@ export interface HttpsOptions extends Omit { cors?: string | boolean; } -export type HttpsHandler = ( - request: Request, - response: express.Response -) => void | Promise; -export type CallableHandler = ( - request: CallableRequest -) => Return; - -export type HttpsFunction = HttpsHandler & { __trigger: unknown }; -export interface CallableFunction extends HttpsHandler { - __trigger: unknown; +export type HttpsFunction = (( + req: Request, + res: express.Response +) => void | Promise) & { __trigger: unknown }; +export interface CallableFunction extends HttpsFunction { run(data: CallableRequest): Return; } export function onRequest( opts: HttpsOptions, - handler: HttpsHandler + handler: ( + request: Request, + response: express.Response + ) => void | Promise +): HttpsFunction; +export function onRequest( + handler: ( + request: Request, + response: express.Response + ) => void | Promise ): HttpsFunction; -export function onRequest(handler: HttpsHandler): HttpsFunction; export function onRequest( - optsOrHandler: HttpsOptions | HttpsHandler, - handler?: HttpsHandler + optsOrHandler: + | HttpsOptions + | ((request: Request, response: express.Response) => void | Promise), + handler?: ( + request: Request, + response: express.Response + ) => void | Promise ): HttpsFunction { let opts: HttpsOptions; if (arguments.length === 1) { opts = {}; - handler = optsOrHandler as HttpsHandler; + handler = optsOrHandler as ( + request: Request, + response: express.Response + ) => void | Promise; } else { opts = optsOrHandler as HttpsOptions; } @@ -111,19 +121,19 @@ export function onRequest( export function onCall>( opts: HttpsOptions, - handler: CallableHandler + handler: (request: CallableRequest) => Return ): CallableFunction; export function onCall>( - handler: CallableHandler + handler: (request: CallableRequest) => Return ): CallableFunction; export function onCall>( - optsOrHandler: HttpsOptions | CallableHandler, - handler?: CallableHandler + optsOrHandler: HttpsOptions | ((request: CallableRequest) => Return), + handler?: (request: CallableRequest) => Return ): CallableFunction { let opts: HttpsOptions; if (arguments.length == 1) { opts = {}; - handler = optsOrHandler as CallableHandler; + handler = optsOrHandler as (request: CallableRequest) => Return; } else { opts = optsOrHandler as HttpsOptions; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 43ad15d57..cca25b294 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -85,7 +85,7 @@ export class Message { } /** The interface published in a Pub/Sub publish subscription. */ -export interface MessagePublishedData { +export interface MessagePublishedData { readonly message: Message; readonly subscription: string; } @@ -96,18 +96,18 @@ export interface PubSubOptions extends options.EventHandlerOptions { } /** Handle a message being published to a Pub/Sub topic. */ -export function onMessagePublished( +export function onMessagePublished( topic: string, handler: (event: CloudEvent>) => any | Promise ): CloudFunction>; /** Handle a message being published to a Pub/Sub topic. */ -export function onMessagePublished( +export function onMessagePublished( options: PubSubOptions, handler: (event: CloudEvent>) => any | Promise ): CloudFunction>; -export function onMessagePublished( +export function onMessagePublished( topicOrOptions: string | PubSubOptions, handler: (event: CloudEvent>) => any | Promise ): CloudFunction> { From 4493e352d79761358344e99d56fbdec6729e329c Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Mon, 9 Aug 2021 11:04:06 -0700 Subject: [PATCH 330/705] Fixing Typedoc breaking changes. (#934) --- docgen/content-sources/v2/toc.yaml | 42 +- docgen/typedoc.js | 7 +- package-lock.json | 6148 +-------------------------- package.json | 4 +- spec/v1/providers/firestore.spec.ts | 2 +- 5 files changed, 146 insertions(+), 6057 deletions(-) diff --git a/docgen/content-sources/v2/toc.yaml b/docgen/content-sources/v2/toc.yaml index 04b95a495..18b5215fb 100644 --- a/docgen/content-sources/v2/toc.yaml +++ b/docgen/content-sources/v2/toc.yaml @@ -1,27 +1,23 @@ toc: - title: globals.html - path: /docs/reference/functions/globals.html + path: /docs/reference/functions/modules.html - title: index.html path: /docs/reference/functions/index.html - - title: logger_common_.html - path: /docs/reference/functions/logger_common_.html - - title: logger_compat_.html - path: /docs/reference/functions/logger_compat_.html - - title: logger_index_.html - path: /docs/reference/functions/logger_index_.html - - title: logger_index_.logentry.html - path: /docs/reference/functions/logger_index_.logentry.html - - title: v2_base_.html - path: /docs/reference/functions/v2_base_.html - - title: v2_index_.html - path: /docs/reference/functions/v2_index_.html - - title: v2_options_.eventhandleroptions.html - path: /docs/reference/functions/v2_options_.eventhandleroptions.html - - title: v2_options_.globaloptions.html - path: /docs/reference/functions/v2_options_.globaloptions.html - - title: v2_options_.html - path: /docs/reference/functions/v2_options_.html - - title: v2_providers_https_.html - path: /docs/reference/functions/v2_providers_https_.html - - title: v2_providers_https_.httpsoptions.html - path: /docs/reference/functions/v2_providers_https_.httpsoptions.html + - title: logger_common.html + path: /docs/reference/functions/logger_common.html + - title: logger.LogEntry.html + path: /docs/reference/functions/logger.LogEntry.html + - title: v2_core.html + path: /docs/reference/functions/v2_core.html + - title: v2.html + path: /docs/reference/functions/v2.html + - title: v2_options.eventhandleroptions.html + path: /docs/reference/functions/v2_options.eventhandleroptions.html + - title: v2_options.globaloptions.html + path: /docs/reference/functions/v2_options.globaloptions.html + - title: v2_options.html + path: /docs/reference/functions/v2_options.html + - title: v2_providers_https.html + path: /docs/reference/functions/v2_providers_https.html + - title: v2_providers_https.httpsoptions.html + path: /docs/reference/functions/v2_providers_https.httpsoptions.html diff --git a/docgen/typedoc.js b/docgen/typedoc.js index 58156ff59..332e19b0f 100644 --- a/docgen/typedoc.js +++ b/docgen/typedoc.js @@ -16,12 +16,11 @@ */ const options = { - // includeDeclarations: true, + tsconfig: '../tsconfig.release.json', excludeExternals: true, - ignoreCompilerErrors: true, + exclude: ['../spec/**/*.ts', '../integration_test/**/*.ts'], name: 'Firebase Functions SDK', - mode: 'modules', - hideGenerator: true + hideGenerator: true, }; module.exports = options; diff --git a/package-lock.json b/package-lock.json index 688f61a8e..1143d95e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5885 +1,8 @@ { "name": "firebase-functions", "version": "3.14.1", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "version": "3.14.1", - "license": "MIT", - "dependencies": { - "@types/express": "4.17.3", - "cors": "^2.8.5", - "express": "^4.17.1", - "lodash": "^4.17.14" - }, - "devDependencies": { - "@types/chai": "^4.1.7", - "@types/chai-as-promised": "^7.1.0", - "@types/cors": "^2.8.5", - "@types/jsonwebtoken": "^8.3.2", - "@types/lodash": "^4.14.135", - "@types/mocha": "^5.2.7", - "@types/mock-require": "^2.0.0", - "@types/nock": "^10.0.3", - "@types/node": "^8.10.50", - "@types/sinon": "^7.0.13", - "chai": "^4.2.0", - "chai-as-promised": "^7.1.1", - "child-process-promise": "^2.2.1", - "firebase-admin": "^9.8.0", - "js-yaml": "^3.13.1", - "jsdom": "^16.2.1", - "jsonwebtoken": "^8.5.1", - "jwk-to-pem": "^2.0.5", - "mocha": "^6.1.4", - "mock-require": "^3.0.3", - "mz": "^2.7.0", - "nock": "^10.0.6", - "prettier": "^1.18.2", - "sinon": "^7.3.2", - "ts-node": "^8.3.0", - "tslint": "^5.18.0", - "tslint-config-prettier": "^1.18.0", - "tslint-no-unused-expression-chai": "^0.1.4", - "tslint-plugin-prettier": "^2.0.1", - "typedoc": "^0.19.1", - "typescript": "^3.8.3", - "yargs": "^15.3.1" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - }, - "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "node_modules/@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "node_modules/@firebase/app-types": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.2.tgz", - "integrity": "sha512-2VXvq/K+n8XMdM4L2xy5bYp2ZXMawJXluUIDzUBvMthVR+lhxK4pfFiqr1mmDbv9ydXvEAuFsD+6DpcZuJcSSw==", - "dev": true - }, - "node_modules/@firebase/auth-interop-types": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", - "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true, - "peerDependencies": { - "@firebase/app-types": "0.x", - "@firebase/util": "1.x" - } - }, - "node_modules/@firebase/component": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.0.tgz", - "integrity": "sha512-v18csWtXb0ri+3m7wuGLY/UDgcb89vuMlZGQ//+7jEPLIQeLbylvZhol1uzW9WzoOpxMxOS2W5qyVGX36wZvEA==", - "dev": true, - "dependencies": { - "@firebase/util": "1.1.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/component/node_modules/tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", - "dev": true - }, - "node_modules/@firebase/database": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.0.tgz", - "integrity": "sha512-GsHvuES83Edtboij2h3txKg+yV/TD4b5Owc01SgXEQtvj1lulkHt4Ufmd9OZz1WreWQJMIqKpbVowIDHjlkZJQ==", - "dev": true, - "dependencies": { - "@firebase/auth-interop-types": "0.1.6", - "@firebase/component": "0.5.0", - "@firebase/database-types": "0.7.2", - "@firebase/logger": "0.2.6", - "@firebase/util": "1.1.0", - "faye-websocket": "0.11.3", - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/database-types": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.2.tgz", - "integrity": "sha512-cdAd/dgwvC0r3oLEDUR+ULs1vBsEvy0b27nlzKhU6LQgm9fCDzgaH9nFGv8x+S9dly4B0egAXkONkVoWcOAisg==", - "dev": true, - "dependencies": { - "@firebase/app-types": "0.6.2" - } - }, - "node_modules/@firebase/database/node_modules/tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", - "dev": true - }, - "node_modules/@firebase/logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz", - "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==", - "dev": true - }, - "node_modules/@firebase/util": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.1.0.tgz", - "integrity": "sha512-lfuSASuPKNdfebuFR8rjFamMQUPH9iiZHcKS755Rkm/5gRT0qC7BMhCh3ZkHf7NVbplzIc/GhmX2jM+igDRCag==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/util/node_modules/tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", - "dev": true - }, - "node_modules/@google-cloud/common": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", - "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", - "dev": true, - "optional": true, - "dependencies": { - "@google-cloud/projectify": "^2.0.0", - "@google-cloud/promisify": "^2.0.0", - "arrify": "^2.0.1", - "duplexify": "^4.1.1", - "ent": "^2.2.0", - "extend": "^3.0.2", - "google-auth-library": "^7.0.2", - "retry-request": "^4.1.1", - "teeny-request": "^7.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/firestore": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", - "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", - "dev": true, - "optional": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "functional-red-black-tree": "^1.0.1", - "google-gax": "^2.9.2", - "protobufjs": "^6.8.6" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@google-cloud/paginator": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", - "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", - "dev": true, - "optional": true, - "dependencies": { - "arrify": "^2.0.0", - "extend": "^3.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/projectify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", - "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/promisify": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", - "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/storage": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", - "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", - "dev": true, - "optional": true, - "dependencies": { - "@google-cloud/common": "^3.6.0", - "@google-cloud/paginator": "^3.0.0", - "@google-cloud/promisify": "^2.0.0", - "arrify": "^2.0.0", - "async-retry": "^1.3.1", - "compressible": "^2.0.12", - "date-and-time": "^1.0.0", - "duplexify": "^4.0.0", - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "gcs-resumable-upload": "^3.1.4", - "get-stream": "^6.0.0", - "hash-stream-validation": "^0.2.2", - "mime": "^2.2.0", - "mime-types": "^2.0.8", - "onetime": "^5.1.0", - "p-limit": "^3.0.1", - "pumpify": "^2.0.0", - "snakeize": "^0.1.0", - "stream-events": "^1.0.1", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/storage/node_modules/mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", - "dev": true, - "optional": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/@google-cloud/storage/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "optional": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@grpc/grpc-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", - "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", - "dev": true, - "optional": true, - "dependencies": { - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, - "node_modules/@grpc/grpc-js/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", - "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", - "dev": true, - "optional": true, - "dependencies": { - "@types/long": "^4.0.1", - "lodash.camelcase": "^4.3.0", - "long": "^4.0.0", - "protobufjs": "^6.10.0", - "yargs": "^16.1.1" - }, - "bin": { - "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@grpc/proto-loader/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@grpc/proto-loader/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "optional": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/@grpc/proto-loader/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@grpc/proto-loader/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "optional": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@grpc/proto-loader/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "optional": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@panva/asn1.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", - "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "dev": true, - "optional": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", - "dev": true, - "optional": true - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", - "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/formatio": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^3.1.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.3.0", - "array-from": "^2.1.1", - "lodash": "^4.17.15" - } - }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@types/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", - "dependencies": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "node_modules/@types/chai": { - "version": "4.2.12", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", - "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", - "dev": true - }, - "node_modules/@types/chai-as-promised": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", - "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", - "dev": true, - "dependencies": { - "@types/chai": "*" - } - }, - "node_modules/@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, - "node_modules/@types/connect": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", - "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", - "dev": true, - "dependencies": { - "@types/express": "*" - } - }, - "node_modules/@types/express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", - "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, - "node_modules/@types/express-jwt": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", - "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", - "dev": true, - "dependencies": { - "@types/express": "*", - "@types/express-unless": "*" - } - }, - "node_modules/@types/express-serve-static-core": { - "version": "4.17.12", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", - "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", - "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "node_modules/@types/express-unless": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", - "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", - "dev": true, - "dependencies": { - "@types/express": "*" - } - }, - "node_modules/@types/jsonwebtoken": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", - "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/lodash": { - "version": "4.14.161", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", - "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", - "dev": true - }, - "node_modules/@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", - "dev": true, - "optional": true - }, - "node_modules/@types/mime": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" - }, - "node_modules/@types/mocha": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", - "dev": true - }, - "node_modules/@types/mock-require": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", - "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/nock": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", - "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/node": { - "version": "8.10.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", - "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" - }, - "node_modules/@types/qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" - }, - "node_modules/@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha1-fuMwunyq+5gJC+zoal7kQRWQTCw=" - }, - "node_modules/@types/serve-static": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", - "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", - "dependencies": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" - } - }, - "node_modules/@types/sinon": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", - "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", - "dev": true - }, - "node_modules/abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", - "dev": true - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dev": true, - "optional": true, - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dependencies": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - } - }, - "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "optional": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", - "dev": true - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "node_modules/array-from": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", - "dev": true - }, - "node_modules/arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dev": true, - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/async-retry": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", - "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", - "dev": true, - "optional": true, - "dependencies": { - "retry": "0.12.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", - "dev": true - }, - "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/bignumber.js": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", - "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", - "dev": true, - "optional": true, - "engines": { - "node": "*" - } - }, - "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dependencies": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", - "dev": true - }, - "node_modules/buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", - "dev": true - }, - "node_modules/buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", - "dev": true - }, - "node_modules/builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "node_modules/chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chai-as-promised": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", - "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", - "dev": true, - "dependencies": { - "check-error": "^1.0.2" - }, - "peerDependencies": { - "chai": ">= 2.1.2 < 5" - } - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/child-process-promise": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", - "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", - "dev": true, - "dependencies": { - "cross-spawn": "^4.0.2", - "node-version": "^1.0.0", - "promise-polyfill": "^6.0.1" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", - "dev": true - }, - "node_modules/compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "optional": true, - "dependencies": { - "mime-db": ">= 1.43.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/compressible/node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "node_modules/configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "optional": true, - "dependencies": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "dependencies": { - "cssom": "~0.3.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/date-and-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", - "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", - "dev": true, - "optional": true - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decimal.js": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", - "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", - "dev": true - }, - "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", - "dev": true, - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "node_modules/dicer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", - "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", - "dev": true, - "dependencies": { - "streamsearch": "0.1.2" - }, - "engines": { - "node": ">=4.5.0" - } - }, - "node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", - "dev": true, - "dependencies": { - "webidl-conversions": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/domexception/node_modules/webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "optional": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/duplexify": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", - "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", - "dev": true, - "optional": true, - "dependencies": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.0" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dev": true, - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/elliptic/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "optional": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true, - "optional": true - }, - "node_modules/es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", - "dev": true, - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/eslint-plugin-prettier": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", - "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", - "dev": true, - "dependencies": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" - }, - "engines": { - "node": ">=4.0.0" - }, - "peerDependencies": { - "prettier": ">= 0.11.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "dependencies": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/fast-text-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", - "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", - "dev": true, - "optional": true - }, - "node_modules/faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true, - "dependencies": { - "websocket-driver": ">=0.5.1" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/firebase-admin": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.8.0.tgz", - "integrity": "sha512-v8B1qU8McZZT2hlLZ018TKz2FoKlfFkZq9mOIyzN7wJUOlAywqQX0JyqNpVGyPeU+B+77ojlvmkGTNXt2OFkgw==", - "dev": true, - "dependencies": { - "@firebase/database": "^0.10.0", - "@firebase/database-types": "^0.7.2", - "@types/node": ">=12.12.47", - "dicer": "^0.3.0", - "jsonwebtoken": "^8.5.1", - "jwks-rsa": "^2.0.2", - "node-forge": "^0.10.0" - }, - "engines": { - "node": ">=10.10.0" - }, - "optionalDependencies": { - "@google-cloud/firestore": "^4.5.0", - "@google-cloud/storage": "^5.3.0" - } - }, - "node_modules/firebase-admin/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true - }, - "node_modules/flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "deprecated": "Fixed a prototype pollution security issue in 4.1.0, please upgrade to ^4.1.1 or ^5.0.1.", - "dev": true, - "dependencies": { - "is-buffer": "~2.0.3" - }, - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat/node_modules/is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true, - "optional": true - }, - "node_modules/gaxios": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", - "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", - "dev": true, - "optional": true, - "dependencies": { - "abort-controller": "^3.0.0", - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.3.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gcp-metadata": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", - "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", - "dev": true, - "optional": true, - "dependencies": { - "gaxios": "^4.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gcs-resumable-upload": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", - "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", - "dev": true, - "optional": true, - "dependencies": { - "abort-controller": "^3.0.0", - "configstore": "^5.0.0", - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "google-auth-library": "^7.0.0", - "pumpify": "^2.0.0", - "stream-events": "^1.0.4" - }, - "bin": { - "gcs-upload": "build/src/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/google-auth-library": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", - "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", - "dev": true, - "optional": true, - "dependencies": { - "arrify": "^2.0.0", - "base64-js": "^1.3.0", - "ecdsa-sig-formatter": "^1.0.11", - "fast-text-encoding": "^1.0.0", - "gaxios": "^4.0.0", - "gcp-metadata": "^4.2.0", - "gtoken": "^5.0.4", - "jws": "^4.0.0", - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-auth-library/node_modules/jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/google-auth-library/node_modules/jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "dependencies": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/google-auth-library/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-auth-library/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "optional": true - }, - "node_modules/google-gax": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", - "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", - "dev": true, - "optional": true, - "dependencies": { - "@grpc/grpc-js": "~1.3.0", - "@grpc/proto-loader": "^0.6.1", - "@types/long": "^4.0.0", - "abort-controller": "^3.0.0", - "duplexify": "^4.0.0", - "fast-text-encoding": "^1.0.3", - "google-auth-library": "^7.0.2", - "is-stream-ended": "^0.1.4", - "node-fetch": "^2.6.1", - "object-hash": "^2.1.1", - "protobufjs": "^6.10.2", - "retry-request": "^4.0.0" - }, - "bin": { - "compileProtos": "build/tools/compileProtos.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-p12-pem": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", - "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", - "dev": true, - "optional": true, - "dependencies": { - "node-forge": "^0.10.0" - }, - "bin": { - "gp12-pem": "build/src/bin/gp12-pem.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true - }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, - "node_modules/gtoken": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", - "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", - "dev": true, - "optional": true, - "dependencies": { - "gaxios": "^4.0.0", - "google-p12-pem": "^3.0.3", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gtoken/node_modules/jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/gtoken/node_modules/jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "dependencies": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hash-stream-validation": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", - "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", - "dev": true, - "optional": true - }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/highlight.js": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", - "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", - "dev": true, - "dependencies": { - "whatwg-encoding": "^1.0.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", - "dev": true - }, - "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "optional": true, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http-proxy-agent/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/http-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "optional": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-callable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", - "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", - "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-stream-ended": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", - "dev": true, - "optional": true - }, - "node_modules/is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "node_modules/jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "node_modules/jose": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", - "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", - "dev": true, - "dependencies": { - "@panva/asn1.js": "^1.0.0" - }, - "engines": { - "node": ">=10.13.0 < 13 || >=13.7.0" - }, - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/js-yaml/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "node_modules/jsdom": { - "version": "16.4.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", - "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", - "dev": true, - "dependencies": { - "abab": "^2.0.3", - "acorn": "^7.1.1", - "acorn-globals": "^6.0.0", - "cssom": "^0.4.4", - "cssstyle": "^2.2.0", - "data-urls": "^2.0.0", - "decimal.js": "^10.2.0", - "domexception": "^2.0.1", - "escodegen": "^1.14.1", - "html-encoding-sniffer": "^2.0.1", - "is-potential-custom-element-name": "^1.0.0", - "nwsapi": "^2.2.0", - "parse5": "5.1.1", - "request": "^2.88.2", - "request-promise-native": "^1.0.8", - "saxes": "^5.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.1.0", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0", - "ws": "^7.2.3", - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jsdom/node_modules/escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=4.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/jsdom/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jsdom/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", - "dev": true, - "optional": true, - "dependencies": { - "bignumber.js": "^9.0.0" - } - }, - "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "node_modules/jsonfile": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", - "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", - "dev": true, - "dependencies": { - "universalify": "^1.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "dev": true, - "dependencies": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=4", - "npm": ">=1.4.28" - } - }, - "node_modules/jsonwebtoken/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "node_modules/just-extend": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", - "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", - "dev": true - }, - "node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dev": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jwk-to-pem": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", - "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", - "dev": true, - "dependencies": { - "asn1.js": "^5.3.0", - "elliptic": "^6.5.4", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jwks-rsa": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", - "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", - "dev": true, - "dependencies": { - "@types/express-jwt": "0.0.42", - "debug": "^4.1.0", - "jose": "^2.0.5", - "limiter": "^1.1.5", - "lru-memoizer": "^2.1.2" - }, - "engines": { - "node": ">=10 < 13 || >=14" - } - }, - "node_modules/jwks-rsa/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/jwks-rsa/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, - "dependencies": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/limiter": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", - "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", - "dev": true - }, - "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true, - "optional": true - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "node_modules/lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", - "dev": true - }, - "node_modules/lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", - "dev": true - }, - "node_modules/lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", - "dev": true - }, - "node_modules/lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", - "dev": true - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "node_modules/lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, - "node_modules/lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", - "dev": true - }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, - "node_modules/log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "dependencies": { - "chalk": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/lolex": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", - "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", - "dev": true - }, - "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true, - "optional": true - }, - "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/lru-memoizer": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", - "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", - "dev": true, - "dependencies": { - "lodash.clonedeep": "^4.5.0", - "lru-cache": "~4.0.0" - } - }, - "node_modules/lru-memoizer/node_modules/lru-cache": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", - "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.1", - "yallist": "^2.0.0" - } - }, - "node_modules/lunr": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "dev": true - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "optional": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "optional": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "node_modules/marked": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", - "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==", - "dev": true, - "bin": { - "marked": "bin/marked" - }, - "engines": { - "node": ">= 8.16.2" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "dependencies": { - "mime-db": "1.40.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mkdirp/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/mocha": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", - "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", - "dev": true, - "dependencies": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "2.2.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.4", - "ms": "2.1.1", - "node-environment-flags": "1.0.5", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/mocha/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/mocha/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mocha/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/mocha/node_modules/js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/mocha/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/mocha/node_modules/mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "node_modules/mocha/node_modules/object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/mocha/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/mocha/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/mock-require": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", - "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", - "dev": true, - "dependencies": { - "get-caller-file": "^1.0.2", - "normalize-path": "^2.1.1" - }, - "engines": { - "node": ">=4.3.0" - } - }, - "node_modules/mock-require/node_modules/get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/nise": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", - "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", - "dev": true, - "dependencies": { - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "lolex": "^5.0.1", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/nise/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/nise/node_modules/lolex": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, - "node_modules/nise/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/nock": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", - "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", - "dev": true, - "dependencies": { - "chai": "^4.1.2", - "debug": "^4.1.0", - "deep-equal": "^1.0.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.5", - "mkdirp": "^0.5.0", - "propagate": "^1.0.0", - "qs": "^6.5.1", - "semver": "^5.5.0" - }, - "engines": { - "node": ">= 6.0" - } - }, - "node_modules/nock/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/nock/node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/nock/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", - "dev": true, - "dependencies": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - } - }, - "node_modules/node-environment-flags/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true, - "optional": true, - "engines": { - "node": "4.x || >=6.0.0" - } - }, - "node_modules/node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/node-version": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", - "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-hash": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", - "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.assign/node_modules/es-abstract": { - "version": "1.18.0-next.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", - "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", - "dev": true, - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "optional": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", - "dev": true - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "node_modules/pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-polyfill": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", - "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", - "dev": true - }, - "node_modules/propagate": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", - "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", - "dev": true, - "engines": [ - "node >= 0.8.1" - ] - }, - "node_modules/protobufjs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", - "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" - } - }, - "node_modules/protobufjs/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true, - "optional": true - }, - "node_modules/proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "dependencies": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "optional": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/pumpify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", - "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", - "dev": true, - "optional": true, - "dependencies": { - "duplexify": "^4.1.1", - "inherits": "^2.0.3", - "pump": "^3.0.0" - } - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "optional": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "dependencies": { - "resolve": "^1.1.6" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.19" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "engines": { - "node": ">=0.12.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-native/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/request/node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/request/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true, - "optional": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/retry-request": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", - "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", - "dev": true, - "optional": true, - "dependencies": { - "debug": "^4.1.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/retry-request/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/retry-request/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" - }, - "node_modules/saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - }, - "node_modules/serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" - }, - "node_modules/shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", - "dev": true, - "dependencies": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true, - "optional": true - }, - "node_modules/sinon": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", - "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.4.0", - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/samsam": "^3.3.3", - "diff": "^3.5.0", - "lolex": "^4.2.0", - "nise": "^1.5.2", - "supports-color": "^5.5.0" - } - }, - "node_modules/sinon/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/snakeize": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", - "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", - "dev": true, - "optional": true - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stream-events": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", - "dev": true, - "optional": true, - "dependencies": { - "stubs": "^3.0.0" - } - }, - "node_modules/stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "dev": true, - "optional": true - }, - "node_modules/streamsearch": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", - "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true - }, - "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stubs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", - "dev": true, - "optional": true - }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "node_modules/teeny-request": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", - "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", - "dev": true, - "optional": true, - "dependencies": { - "http-proxy-agent": "^4.0.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.1", - "stream-events": "^1.0.5", - "uuid": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0" - } - }, - "node_modules/thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", - "dev": true, - "dependencies": { - "thenify": ">= 3.1.0 < 4" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "dependencies": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tr46": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", - "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", - "dev": true, - "dependencies": { - "arg": "^4.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "source-map-support": "^0.5.17", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "engines": { - "node": ">=6.0.0" - }, - "peerDependencies": { - "typescript": ">=2.7" - } - }, - "node_modules/ts-node/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", - "dev": true - }, - "node_modules/tslint": { - "version": "5.20.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", - "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^4.0.1", - "glob": "^7.1.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.29.0" - }, - "bin": { - "tslint": "bin/tslint" - }, - "engines": { - "node": ">=4.8.0" - }, - "peerDependencies": { - "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" - } - }, - "node_modules/tslint-config-prettier": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", - "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", - "dev": true, - "bin": { - "tslint-config-prettier-check": "bin/check.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/tslint-no-unused-expression-chai": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", - "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", - "dev": true, - "dependencies": { - "tsutils": "^3.0.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "tslint": ">=5.1.0" - } - }, - "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", - "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tslint-plugin-prettier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", - "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", - "dev": true, - "dependencies": { - "eslint-plugin-prettier": "^2.2.0", - "lines-and-columns": "^1.1.6", - "tslib": "^1.7.1" - }, - "engines": { - "node": ">= 4" - }, - "peerDependencies": { - "prettier": "^1.9.0 || ^2.0.0", - "tslint": "^5.0.0 || ^6.0.0" - } - }, - "node_modules/tslint/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/tslint/node_modules/resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "dependencies": { - "path-parse": "^1.0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "peerDependencies": { - "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" - } - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "optional": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/typedoc": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.19.1.tgz", - "integrity": "sha512-EqZpRJQUnkwHA1yBhaDExEXUZIiWKddkrDXhRcfUzpnu6pizxNmVTw5IZ3mu682Noa4zQCniE0YNjaAwHQodrA==", - "dev": true, - "dependencies": { - "fs-extra": "^9.0.1", - "handlebars": "^4.7.6", - "highlight.js": "^10.0.0", - "lodash": "^4.17.20", - "lunr": "^2.3.9", - "marked": "^1.1.1", - "minimatch": "^3.0.0", - "progress": "^2.0.3", - "semver": "^7.3.2", - "shelljs": "^0.8.4", - "typedoc-default-themes": "^0.11.1" - }, - "bin": { - "typedoc": "bin/typedoc" - }, - "engines": { - "node": ">= 10.0.0" - }, - "peerDependencies": { - "typescript": "3.9.x || 4.0.x" - } - }, - "node_modules/typedoc-default-themes": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.3.tgz", - "integrity": "sha512-SwyN188QGNA2iFS5mdWYTGzohKqJ1PWAXVmGolKnVc2NnpX234FEPF2nUvEg+O9jjwAu7ZSVZ5UrZri0raJOjQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/typedoc/node_modules/handlebars": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/typedoc/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/typedoc/node_modules/semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/typescript": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", - "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", - "dev": true, - "optional": true, - "dependencies": { - "commander": "~2.17.1", - "source-map": "~0.6.1" - }, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/uglify-js/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "optional": true, - "dependencies": { - "crypto-random-string": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true, - "optional": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "optional": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "dev": true, - "dependencies": { - "browser-process-hrtime": "^1.0.0" - } - }, - "node_modules/w3c-xmlserializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", - "dev": true, - "dependencies": { - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true, - "engines": { - "node": ">=10.4" - } - }, - "node_modules/websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, - "dependencies": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "dev": true, - "dependencies": { - "iconv-lite": "0.4.24" - } - }, - "node_modules/whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", - "dev": true - }, - "node_modules/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", - "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^2.0.2", - "webidl-conversions": "^6.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "optional": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "dev": true, - "dependencies": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/yargs-unparser/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "dependencies": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/yargs/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "node_modules/yargs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/yargs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/yargs/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - }, "dependencies": { "@babel/code-frame": { "version": "7.10.4", @@ -5917,8 +40,7 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true, - "requires": {} + "dev": true }, "@firebase/component": { "version": "0.5.0", @@ -6737,12 +859,6 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -7605,18 +1721,6 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, - "fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^1.0.0" - } - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -7814,7 +1918,8 @@ "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true + "dev": true, + "optional": true }, "growl": { "version": "1.10.5", @@ -7859,6 +1964,19 @@ } } }, + "handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -7913,12 +2031,6 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "highlight.js": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz", - "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -8059,12 +2171,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, - "interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true - }, "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -8304,14 +2410,13 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "jsonfile": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", - "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "dev": true, "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^1.0.0" + "minimist": "^1.2.5" } }, "jsonwebtoken": { @@ -8604,9 +2709,9 @@ "dev": true }, "marked": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", - "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", + "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", "dev": true }, "media-typer": { @@ -8670,6 +2775,12 @@ "brace-expansion": "^1.1.7" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -9138,6 +3249,32 @@ "mimic-fn": "^2.1.0" } }, + "onigasm": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", + "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", + "dev": true, + "requires": { + "lru-cache": "^5.1.1" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } + } + }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", @@ -9366,15 +3503,6 @@ "util-deprecate": "^1.0.1" } }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "^1.1.6" - } - }, "regexp.prototype.flags": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", @@ -9487,12 +3615,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, "retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", @@ -9603,15 +3725,15 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "shiki": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.6.tgz", + "integrity": "sha512-h2y5Uq9QEWsEmi97n+BOdPOVxkOUdVunl+jVIzU9EqJ6/QbIX+U6F7TsrWZQ2xqwPgvvQaC9r7/zeegi1b48dQ==", "dev": true, "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" + "json5": "^2.2.0", + "onigasm": "^2.2.5", + "vscode-textmate": "5.2.0" } }, "signal-exit": { @@ -9741,25 +3863,6 @@ "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", "dev": true }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "optional": true - } - } - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -9790,6 +3893,25 @@ "es-abstract": "^1.17.5" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "optional": true + } + } + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -10036,82 +4158,55 @@ } }, "typedoc": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.19.1.tgz", - "integrity": "sha512-EqZpRJQUnkwHA1yBhaDExEXUZIiWKddkrDXhRcfUzpnu6pizxNmVTw5IZ3mu682Noa4zQCniE0YNjaAwHQodrA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.5.tgz", + "integrity": "sha512-uRDRmYheE5Iju9Zz0X50pTASTpBorIHFt02F5Y8Dt4eBt55h3mwk1CBSY2+EfwBxY16N4Xm7f8KXhnfFZ0AmBw==", "dev": true, "requires": { - "fs-extra": "^9.0.1", - "handlebars": "^4.7.6", - "highlight.js": "^10.0.0", - "lodash": "^4.17.20", + "glob": "^7.1.7", + "handlebars": "^4.7.7", "lunr": "^2.3.9", - "marked": "^1.1.1", + "marked": "^2.1.1", "minimatch": "^3.0.0", "progress": "^2.0.3", - "semver": "^7.3.2", - "shelljs": "^0.8.4", - "typedoc-default-themes": "^0.11.1" + "shiki": "^0.9.3", + "typedoc-default-themes": "^0.12.10" }, "dependencies": { - "handlebars": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "dev": true, "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true } } }, "typedoc-default-themes": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.3.tgz", - "integrity": "sha512-SwyN188QGNA2iFS5mdWYTGzohKqJ1PWAXVmGolKnVc2NnpX234FEPF2nUvEg+O9jjwAu7ZSVZ5UrZri0raJOjQ==", + "version": "0.12.10", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", + "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", "dev": true }, "typescript": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", - "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", "dev": true }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz", + "integrity": "sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g==", "dev": true, - "optional": true, - "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", - "dev": true, - "optional": true - } - } + "optional": true }, "unique-string": { "version": "2.0.0", @@ -10123,12 +4218,6 @@ "crypto-random-string": "^2.0.0" } }, - "universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", - "dev": true - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -10178,6 +4267,12 @@ "extsprintf": "^1.2.0" } }, + "vscode-textmate": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", + "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", + "dev": true + }, "w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", @@ -10334,11 +4429,10 @@ } }, "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", - "dev": true, - "requires": {} + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", + "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", + "dev": true }, "xdg-basedir": { "version": "4.0.0", diff --git a/package.json b/package.json index 2f73ad585..e255e1d96 100644 --- a/package.json +++ b/package.json @@ -119,8 +119,8 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "^0.19.1", - "typescript": "^3.8.3", + "typedoc": "^0.21.5", + "typescript": "^4.3.5", "yargs": "^15.3.1" }, "peerDependencies": { diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts index 07014aeb0..26a8948fc 100644 --- a/spec/v1/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -559,7 +559,7 @@ describe('Firestore Functions', () => { }) ); expect(snapshot.data()).to.deep.equal({ - binaryVal: new Buffer('foobar'), + binaryVal: Buffer.from('foobar'), }); }); }); From b3c232fc0fffcdbd0bdb496063ba86be3e8e992a Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 9 Aug 2021 19:43:51 -0700 Subject: [PATCH 331/705] Print a useful error explaining why Runtime Config doesn't work (#930) * Print a useful error explaining why Runtime Config doesn't work * PR feedback --- spec/v1/config.spec.ts | 17 +++++++++++++++++ src/v1/config.ts | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/spec/v1/config.spec.ts b/spec/v1/config.spec.ts index d1deea4fd..7b750032d 100644 --- a/spec/v1/config.spec.ts +++ b/spec/v1/config.spec.ts @@ -47,6 +47,23 @@ describe('config()', () => { (config as any).firebaseConfigCache = null; delete process.env.FIREBASE_CONFIG; delete process.env.CLOUD_RUNTIME_CONFIG; + delete process.env.K_CONFIGURATION; + }); + + it('will never load in GCFv2', () => { + const json = JSON.stringify({ + foo: 'bar', + firebase: {}, + }); + readFileSync + .withArgs('/srv/.runtimeconfig.json') + .returns(Buffer.from(json)); + + process.env.K_CONFIGURATION = 'my-service'; + expect(() => config.config()).to.throw( + Error, + /transition to using environment variables/ + ); }); it('loads config values from .runtimeconfig.json', () => { diff --git a/src/v1/config.ts b/src/v1/config.ts index f0793957d..01ca3a4cc 100644 --- a/src/v1/config.ts +++ b/src/v1/config.ts @@ -26,6 +26,14 @@ import * as path from 'path'; import * as firebase from 'firebase-admin'; export function config(): config.Config { + // K_CONFIGURATION is only set in GCFv2 + if (process.env.K_CONFIGURATION) { + throw new Error( + 'functions.config() is no longer available in Cloud Functions for ' + + 'Firebase v2. Please see the latest documentation for information ' + + 'on how to transition to using environment variables' + ); + } if (typeof config.singleton === 'undefined') { init(); } From de94b7822ff7d734ad5058640f8af5240f5d3a54 Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Tue, 10 Aug 2021 18:13:32 -0700 Subject: [PATCH 332/705] [apidocs] Improve file detection and updates toc.yaml (#936) --- docgen/content-sources/v2/toc.yaml | 59 +++++++++++++++++++----------- docgen/generate-docs.js | 10 +++-- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/docgen/content-sources/v2/toc.yaml b/docgen/content-sources/v2/toc.yaml index 18b5215fb..42fb44fcc 100644 --- a/docgen/content-sources/v2/toc.yaml +++ b/docgen/content-sources/v2/toc.yaml @@ -1,23 +1,38 @@ toc: - - title: globals.html - path: /docs/reference/functions/modules.html - - title: index.html - path: /docs/reference/functions/index.html - - title: logger_common.html - path: /docs/reference/functions/logger_common.html - - title: logger.LogEntry.html - path: /docs/reference/functions/logger.LogEntry.html - - title: v2_core.html - path: /docs/reference/functions/v2_core.html - - title: v2.html - path: /docs/reference/functions/v2.html - - title: v2_options.eventhandleroptions.html - path: /docs/reference/functions/v2_options.eventhandleroptions.html - - title: v2_options.globaloptions.html - path: /docs/reference/functions/v2_options.globaloptions.html - - title: v2_options.html - path: /docs/reference/functions/v2_options.html - - title: v2_providers_https.html - path: /docs/reference/functions/v2_providers_https.html - - title: v2_providers_https.httpsoptions.html - path: /docs/reference/functions/v2_providers_https.httpsoptions.html + - title: functions + path: /docs/functions/alpha/v2.html + - title: functions.core + path: /docs/functions/alpha/v2_core.html + section: + - title: functions.CloudEvent + path: /docs/functions/alpha/v2_core.cloudevent.html + - title: functions.CloudFunction + path: /docs/functions/alpha/v2_core.cloudfunction.html + - title: functions.https + path: /docs/functions/alpha/v2_providers_https.html + section: + - title: functions.https.options + path: /docs/functions/alpha/v2_providers_https.httpsoptions.html + - title: 'functions.logger' + path: /docs/functions/alpha/logger.html + section: + - title: 'LogEntry' + path: /docs/functions/alpha/logger.LogEntry.html + - title: functions.options + path: /docs/functions/alpha/v2_options.html + section: + - title: functions.options.GlobalOptions + path: /docs/functions/alpha/v2_options.globaloptions.html + - title: functions.options.EventHandlerOptions + path: /docs/functions/alpha/v2_options.eventhandleroptions.html + - title: functions.params + path: /docs/functions/alpha/v2_params.html + - title: 'functions.pubsub' + path: /docs/functions/v2_providers_pubsub.html + section: + - title: 'Message' + path: /docs/functions/alpha/v2_providers_pubsub.Message.html + - title: 'TopicBuilder' + path: /docs/functions/alpha/v2_providers_pubsub.MessagePublishedData.html + - title: 'PubSubOptions' + path: /docs/functions/alpha/v2_providers_pubsub.PubSubOptions.html diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index 5e66392cf..ab7b128a7 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -33,13 +33,15 @@ const { api: apiVersion } = yargs .version(false) .help().argv; -let sourceFile; +let sourceFile, devsitePath; switch (apiVersion) { case 'v1': sourceFile = `${repoPath}/src/{v1,logger}`; + devsitePath = '/docs/reference/functions/'; break; case 'v2': sourceFile = `${repoPath}/src/{v2,logger}`; + devsitePath = '/docs/functions/alpha/'; break; default: throw new Error( @@ -50,7 +52,6 @@ switch (apiVersion) { const docPath = path.resolve(`${__dirname}/html`); const contentPath = path.resolve(`${__dirname}/content-sources/${apiVersion}`); const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`); -const devsitePath = `/docs/reference/functions/`; const { JSDOM } = require('jsdom'); @@ -198,7 +199,10 @@ async function checkForMissingFilesAndFixFilenameCase(tocText) { const filenames = tocText .split('\n') .filter((line) => line.includes('path:')) - .map((line) => line.split(devsitePath)[1].replace(/#.*$/, '')); + .map((line) => { + parts = line.split('/'); + return parts[parts.length - 1].replace(/#.*$/, ''); + }); // Logs warning to console if a file from TOC is not found. const fileCheckPromises = filenames.map(async (filename) => { // Warns if file does not exist, fixes filename case if it does. From e9f5e4326d223cd5c4ac19b230f3e79d74adcba0 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 11 Aug 2021 10:30:26 -0700 Subject: [PATCH 333/705] Add missing changelog entries. (#938) --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6586297a2..3e9515d16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ +- Adds options to set access control on HTTP triggered functions. +- Adds new regions to support list (asia-east1, asia-southeast1). - Adds support for setting user labels on functions via `runWith()`. - Adds support for FIREBASE_CONFIG env as the name of a JSON file - Fixes an issue where objects that define `toJSON` could not be logged successfully (#907). - Formalize module exports. Loggers can now be accessed at 'firebase-functions/logger' and 'firebase-functions/logger/compat' -- Fixes an issue where Remote Config coiuld not be emulated in Windows machines on the classic Command Prompt. +- Fixes an issue where Remote Config could not be emulated in Windows machines on the classic Command Prompt. From 94414f4f149f2065e68e5c3bd3059978f5d1e047 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 11 Aug 2021 14:00:55 -0400 Subject: [PATCH 334/705] Set Access Control for HTTP Functions (v2) (#935) * adding invoker to v2 http functions * fix format * change invoker to always turn into an array, add error handling * fix trigger annotated in v2 and change v1 to only put invoker array in trigger annotated * changing invoker type for better type completion --- spec/common/encoding.spec.ts | 36 ++++++++++++++++++++++++++++++++ spec/v2/providers/https.spec.ts | 5 +++++ src/common/encoding.ts | 17 +++++++++++++++ src/v1/cloud-functions.ts | 8 +++---- src/v1/function-configuration.ts | 7 +------ src/v2/core.ts | 1 + src/v2/options.ts | 7 +++++++ 7 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 spec/common/encoding.spec.ts diff --git a/spec/common/encoding.spec.ts b/spec/common/encoding.spec.ts new file mode 100644 index 000000000..9b251e1da --- /dev/null +++ b/spec/common/encoding.spec.ts @@ -0,0 +1,36 @@ +import { expect } from 'chai'; +import { convertInvoker } from '../../src/common/encoding'; + +describe('convertInvoker', () => { + it('should raise an error on mixing public and service accounts', () => { + expect(() => convertInvoker(['public', 'service-account@'])).to.throw; + }); + + it('should raise an error on mixing private and service accounts', () => { + expect(() => convertInvoker(['private', 'service-account@'])).to.throw; + }); + + it('should return the correct public invoker', () => { + const invoker = convertInvoker('public'); + + expect(invoker).to.deep.equal(['public']); + }); + + it('should return the correct private invoker', () => { + const invoker = convertInvoker('private'); + + expect(invoker).to.deep.equal(['private']); + }); + + it('should return the correct scalar invoker', () => { + const invoker = convertInvoker('service-account@'); + + expect(invoker).to.deep.equal(['service-account@']); + }); + + it('should return the correct array invoker', () => { + const invoker = convertInvoker(['service-account1@', 'service-account2@']); + + expect(invoker).to.deep.equal(['service-account1@', 'service-account2@']); + }); +}); diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 62f4757cb..7e2795abd 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -90,6 +90,7 @@ describe('onRequest', () => { { ...FULL_OPTIONS, region: ['us-west1', 'us-central1'], + invoker: ['service-account1@', 'service-account2@'], }, (req, res) => { res.send(200); @@ -101,6 +102,7 @@ describe('onRequest', () => { allowInsecure: false, }, regions: ['us-west1', 'us-central1'], + invoker: ['service-account1@', 'service-account2@'], }); }); @@ -109,12 +111,14 @@ describe('onRequest', () => { concurrency: 20, region: 'europe-west1', minInstances: 1, + invoker: 'public', }); const result = https.onRequest( { region: ['us-west1', 'us-central1'], minInstances: 3, + invoker: 'private', }, (req, res) => { res.send(200); @@ -131,6 +135,7 @@ describe('onRequest', () => { minInstances: 3, regions: ['us-west1', 'us-central1'], labels: {}, + invoker: ['private'], }); }); diff --git a/src/common/encoding.ts b/src/common/encoding.ts index 4fe2e2729..7ef770a6f 100644 --- a/src/common/encoding.ts +++ b/src/common/encoding.ts @@ -64,3 +64,20 @@ export function serviceAccountFromShorthand( ); } } + +export function convertInvoker(invoker: string | string[]): string[] { + if (typeof invoker === 'string') { + invoker = [invoker]; + } + + if ( + invoker.length > 1 && + invoker.find((inv) => inv === 'public' || inv === 'private') + ) { + throw new Error( + "Invalid option for invoker. Cannot have 'public' or 'private' in an array of service accounts" + ); + } + + return invoker; +} diff --git a/src/v1/cloud-functions.ts b/src/v1/cloud-functions.ts index fc8f1406a..b06d63836 100644 --- a/src/v1/cloud-functions.ts +++ b/src/v1/cloud-functions.ts @@ -27,7 +27,6 @@ import { DEFAULT_FAILURE_POLICY, DeploymentOptions, FailurePolicy, - Invoker, Schedule, } from './function-configuration'; export { Request, Response }; @@ -37,6 +36,7 @@ import { Duration, durationFromSeconds, serviceAccountFromShorthand, + convertInvoker, } from '../common/encoding'; /** @hidden */ @@ -279,7 +279,7 @@ export interface TriggerAnnotated { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; - invoker?: Invoker | Invoker[]; + invoker?: string[]; }; } @@ -499,8 +499,7 @@ export function optionsToTrigger(options: DeploymentOptions) { 'ingressSettings', 'vpcConnectorEgressSettings', 'vpcConnector', - 'labels', - 'invoker' + 'labels' ); convertIfPresent( trigger, @@ -543,6 +542,7 @@ export function optionsToTrigger(options: DeploymentOptions) { 'serviceAccount', serviceAccountFromShorthand ); + convertIfPresent(trigger, options, 'invoker', 'invoker', convertInvoker); return trigger; } diff --git a/src/v1/function-configuration.ts b/src/v1/function-configuration.ts index f7acef18e..c4ba01f9c 100644 --- a/src/v1/function-configuration.ts +++ b/src/v1/function-configuration.ts @@ -98,11 +98,6 @@ export const DEFAULT_FAILURE_POLICY: FailurePolicy = { export const MAX_NUMBER_USER_LABELS = 58; -/** - * Invoker access control type for https functions. - */ -export type Invoker = 'public' | 'private' | string; - export interface RuntimeOptions { /** * Which platform should host the backend. Valid options are "gcfv1" @@ -165,7 +160,7 @@ export interface RuntimeOptions { /** * Invoker to set access control on https functions. */ - invoker?: Invoker | Invoker[]; + invoker?: 'public' | 'private' | string | string[]; } export interface DeploymentOptions extends RuntimeOptions { diff --git a/src/v2/core.ts b/src/v2/core.ts index d2503739e..0772de6f7 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -40,6 +40,7 @@ export interface TriggerAnnotation { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; + invoker?: string[]; // TODO: schedule } diff --git a/src/v2/options.ts b/src/v2/options.ts index 372e49566..41480cfeb 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -23,6 +23,7 @@ import { durationFromSeconds, serviceAccountFromShorthand, + convertInvoker, } from '../common/encoding'; import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; @@ -182,6 +183,11 @@ export interface GlobalOptions { * User labels to set on the function. */ labels?: Record; + + /** + * Invoker to set access control on https functions. + */ + invoker?: 'public' | 'private' | string | string[]; } let globalOptions: GlobalOptions | undefined; @@ -270,6 +276,7 @@ export function optionsToTriggerAnnotations( return retry ? { retry: true } : null; } ); + convertIfPresent(annotation, opts, 'invoker', 'invoker', convertInvoker); return annotation; } From 31d52b7a33f3637ede3a0afda2c2c6c1ab727a84 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 11 Aug 2021 14:27:39 -0700 Subject: [PATCH 335/705] Use npm ci on publish scripts. (#940) I kept seeing error on the npm version command claiming that the directory was dirty. I believe this is because version of the npm used in our builder image is >7 which uses lockfileversion 2 instead of 1 checked into the repo. Using npm ci instead, but we should also think about updating the package-lock.json to lockfileversion 2. --- package.json | 2 +- scripts/publish.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e255e1d96..4cc83df2c 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "scripts": { "apidocs": "node docgen/generate-docs.js", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", - "build:release": "npm install --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", + "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", "build:watch": "npm run build -- -w", "format": "prettier --check '**/*.{json,md,ts,yml,yaml}'", diff --git a/scripts/publish.sh b/scripts/publish.sh index 9246562ae..ea5acde68 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -74,9 +74,9 @@ if [ ! -s CHANGELOG.md ]; then fi echo "Made sure there is a changelog." -echo "Running npm install..." -npm install -echo "Ran npm install." +echo "Running npm ci..." +npm ci +echo "Ran npm ci." echo "Running tests..." npm test From 1b7a73bb9191c904bb19f6fc22082a27f7556f1f Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 Aug 2021 22:09:51 +0000 Subject: [PATCH 336/705] 3.15.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1143d95e0..e4c3b8ba6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.14.1", + "version": "3.15.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4cc83df2c..732631a38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.14.1", + "version": "3.15.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From e2ccc53ede6227701651df33cf2b292fb1706140 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 Aug 2021 22:09:55 +0000 Subject: [PATCH 337/705] [firebase-release] Removed change log and reset repo after 3.15.0 release --- CHANGELOG.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e9515d16..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +0,0 @@ -- Adds options to set access control on HTTP triggered functions. -- Adds new regions to support list (asia-east1, asia-southeast1). -- Adds support for setting user labels on functions via `runWith()`. -- Adds support for FIREBASE_CONFIG env as the name of a JSON file -- Fixes an issue where objects that define `toJSON` could not be logged successfully (#907). -- Formalize module exports. Loggers can now be accessed at 'firebase-functions/logger' and 'firebase-functions/logger/compat' -- Fixes an issue where Remote Config could not be emulated in Windows machines on the classic Command Prompt. From 2e214ed54f6614d09f837d1bf6490ea58f9631cd Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 11 Aug 2021 16:42:39 -0700 Subject: [PATCH 338/705] Bug bash fixes (#933) * HTTP functions always return a promise even when apply CORS. Previously HTTPS functions had to be patched in the emulator to ensure that the promise is always handled. This change should circumvent that need and make v2 patching unnecessary. * Export undocumented dependency of the emulator * Make @types/cors a proper dep * Add dummy files to silence imports eslinter Co-authored-by: Michael Bleigh --- logger/compat.js | 26 ++++++++++++++++++++++++++ logger/index.js | 26 ++++++++++++++++++++++++++ package.json | 3 ++- spec/common/providers/https.spec.ts | 11 +++++++++++ spec/v1/providers/https.spec.ts | 12 +++++++++++- spec/v2/providers/https.spec.ts | 11 +++++++++++ src/common/providers/https.ts | 9 ++++++--- src/v2/providers/https.ts | 9 ++++++--- v1/index.js | 26 ++++++++++++++++++++++++++ v2/core.js | 26 ++++++++++++++++++++++++++ v2/https.js | 26 ++++++++++++++++++++++++++ v2/index.js | 26 ++++++++++++++++++++++++++ v2/options.js | 26 ++++++++++++++++++++++++++ v2/params.js | 26 ++++++++++++++++++++++++++ v2/pubsub.js | 26 ++++++++++++++++++++++++++ 15 files changed, 281 insertions(+), 8 deletions(-) create mode 100644 logger/compat.js create mode 100644 logger/index.js create mode 100644 v1/index.js create mode 100644 v2/core.js create mode 100644 v2/https.js create mode 100644 v2/index.js create mode 100644 v2/options.js create mode 100644 v2/params.js create mode 100644 v2/pubsub.js diff --git a/logger/compat.js b/logger/compat.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/logger/compat.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/logger/index.js b/logger/index.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/logger/index.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/package.json b/package.json index 732631a38..ce0927da6 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "types": "lib/index.d.ts", "exports": { ".": "./lib/index.js", + "./lib/providers/https": "./lib/v1/providers/https.js", "./v1": "./lib/v1/index.js", "./logger": "./lib/logger/index.js", "./logger/compat": "./lib/logger/compat.js", @@ -84,6 +85,7 @@ "test": "mocha" }, "dependencies": { + "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", @@ -92,7 +94,6 @@ "devDependencies": { "@types/chai": "^4.1.7", "@types/chai-as-promised": "^7.1.0", - "@types/cors": "^2.8.5", "@types/jsonwebtoken": "^8.3.2", "@types/lodash": "^4.14.135", "@types/mocha": "^5.2.7", diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index d751fca38..91b2ecad7 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -58,6 +58,7 @@ function runHandler( class MockResponse { private statusCode = 0; private headers: { [name: string]: string } = {}; + private callback: Function; public status(code: number) { this.statusCode = code; @@ -79,11 +80,21 @@ function runHandler( headers: this.headers, body, }); + if (this.callback) { + this.callback(); + } } public end() { this.send(undefined); } + + public on(event: string, callback: Function) { + if (event !== 'finish') { + throw new Error('MockResponse only implements the finish event'); + } + this.callback = callback; + } } const response = new MockResponse(); diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 4e5d2846f..55ecf9cb8 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -49,6 +49,7 @@ function runHandler( class MockResponse { private statusCode = 0; private headers: { [name: string]: string } = {}; + private callback: Function; public status(code: number) { this.statusCode = code; @@ -70,13 +71,22 @@ function runHandler( headers: this.headers, body, }); + if (this.callback) { + this.callback(); + } } public end() { this.send(undefined); } - } + public on(event: string, callback: Function) { + if (event !== 'finish') { + throw new Error('MockResponse only implements the finish event'); + } + this.callback = callback; + } + } const response = new MockResponse(); handler(request, response as any, () => undefined); }); diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 7e2795abd..704c958c1 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -28,6 +28,7 @@ function runHandler( class MockResponse { private statusCode = 0; private headers: { [name: string]: string } = {}; + private callback: Function; public status(code: number) { this.statusCode = code; @@ -49,11 +50,21 @@ function runHandler( headers: this.headers, body, }); + if (this.callback) { + this.callback(); + } } public end() { this.send(undefined); } + + public on(event: string, callback: Function) { + if (event !== 'finish') { + throw new Error('MockResponse only implements the finish event'); + } + this.callback = callback; + } } const response = new MockResponse(); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 372e4fdbf..8b426756f 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -598,9 +598,12 @@ export function onCallHandler( handler: v1Handler | v2Handler ): (req: Request, res: express.Response) => Promise { const wrapped = wrapOnCallHandler(handler); - return async (req: Request, res: express.Response) => { - cors(options)(req, res, () => { - return wrapped(req, res); + return (req: Request, res: express.Response) => { + return new Promise((resolve) => { + res.on('finish', resolve); + cors(options)(req, res, () => { + resolve(wrapped(req, res)); + }); }); }; } diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 0e70c4176..a3d96ccb6 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -83,9 +83,12 @@ export function onRequest( if ('cors' in opts) { const userProvidedHandler = handler; - handler = (req: Request, res: express.Response) => { - cors({ origin: opts.cors })(req, res, () => { - userProvidedHandler(req, res); + handler = (req: Request, res: express.Response): void | Promise => { + return new Promise((resolve) => { + res.on('finish', resolve); + cors({ origin: opts.cors })(req, res, () => { + resolve(userProvidedHandler(req, res)); + }); }); }; } diff --git a/v1/index.js b/v1/index.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/index.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/core.js b/v2/core.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/core.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/https.js b/v2/https.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/https.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/index.js b/v2/index.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/index.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/options.js b/v2/options.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/options.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/params.js b/v2/params.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/params.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/pubsub.js b/v2/pubsub.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/pubsub.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 670dc92ed91f8c1962463ee14871e2a569f42952 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 11 Aug 2021 16:57:00 -0700 Subject: [PATCH 339/705] Changelog (#941) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..c28d4538e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix bug that broke the functions emulator From 360d426ab04e023abffe76d55d75b988b805070d Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 Aug 2021 23:59:42 +0000 Subject: [PATCH 340/705] 3.15.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e4c3b8ba6..d0baf9d4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.0", + "version": "3.15.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ce0927da6..57ce24316 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.0", + "version": "3.15.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From e6eb1ead8940f0177538b59bec6ec3aa5d32ad2c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 Aug 2021 23:59:51 +0000 Subject: [PATCH 341/705] [firebase-release] Removed change log and reset repo after 3.15.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c28d4538e..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fix bug that broke the functions emulator From 7f4db139bc3f448e4cd3332d2fa195b11c394a59 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Thu, 12 Aug 2021 10:48:21 -0700 Subject: [PATCH 342/705] Changes for first staged draft of EAP reference (#939) * Adding required tags to page template. * Adding formatting and fixing typo discovered in internal review. * More fixes/additions discovered in internal review. * Fixing format of toc.yaml file. * Adding EAP TOC and index top matter. * Refine TOC, fix paths in template, attempt to hide params. * Doing all possible to make this YAML valid. VSCode extensions believe that it is. --- docgen/content-sources/v2/HOME.md | 8 +++---- docgen/content-sources/v2/toc.yaml | 38 ++++++++++++++++-------------- docgen/theme/layouts/default.hbs | 4 ++-- src/v2/params/index.ts | 1 + src/v2/params/types.ts | 1 + 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/docgen/content-sources/v2/HOME.md b/docgen/content-sources/v2/HOME.md index d70db12a3..dc6fe541f 100644 --- a/docgen/content-sources/v2/HOME.md +++ b/docgen/content-sources/v2/HOME.md @@ -1,8 +1,8 @@ # Firebase Functions v2 SDK Reference -The `firebase-functions` package provides an SDK for defining Cloud Functions for Firebase. +This package provides an SDK for defining Cloud Functions for Firebase v2. -To get started using Cloud Functions, see -[Get started: write, test, and deploy your first functions](/docs/functions/get-started). +To get started using Cloud Functions v2, see +the early access guide you were provided when you joined the EAP program. -For source code, see the [Cloud Functions for Firebase GitHub repo](https://github.com/firebase/firebase-functions). +**Important:** This API reference is confidential. Do not share or discuss until authorized to do so. diff --git a/docgen/content-sources/v2/toc.yaml b/docgen/content-sources/v2/toc.yaml index 42fb44fcc..917a7a402 100644 --- a/docgen/content-sources/v2/toc.yaml +++ b/docgen/content-sources/v2/toc.yaml @@ -1,34 +1,36 @@ toc: - - title: functions - path: /docs/functions/alpha/v2.html - - title: functions.core + - title: 'functions' + path: /docs/functions/alpha/index.html + - title: 'functions.core' path: /docs/functions/alpha/v2_core.html section: - - title: functions.CloudEvent - path: /docs/functions/alpha/v2_core.cloudevent.html - - title: functions.CloudFunction - path: /docs/functions/alpha/v2_core.cloudfunction.html - - title: functions.https + - title: 'Functions v2' + path: /docs/functions/alpha/v2.html + - title: 'functions.CloudEvent' + path: /docs/functions/alpha/v2_core.CloudEvent.html + - title: 'functions.CloudFunction' + path: /docs/functions/alpha/v2_core.CloudFunction.html + - title: 'functions.https' path: /docs/functions/alpha/v2_providers_https.html section: - - title: functions.https.options - path: /docs/functions/alpha/v2_providers_https.httpsoptions.html + - title: 'functions.https.CallableFunction' + path: /docs/functions/alpha/v2_providers_https.CallableFunction.html + - title: 'functions.https.options' + path: /docs/functions/alpha/v2_providers_https.HttpsOptions.html - title: 'functions.logger' path: /docs/functions/alpha/logger.html section: - title: 'LogEntry' path: /docs/functions/alpha/logger.LogEntry.html - - title: functions.options + - title: 'functions.options' path: /docs/functions/alpha/v2_options.html section: - - title: functions.options.GlobalOptions - path: /docs/functions/alpha/v2_options.globaloptions.html - - title: functions.options.EventHandlerOptions - path: /docs/functions/alpha/v2_options.eventhandleroptions.html - - title: functions.params - path: /docs/functions/alpha/v2_params.html + - title: 'functions.options.GlobalOptions' + path: /docs/functions/alpha/v2_options.GlobalOptions.html + - title: 'functions.options.EventHandlerOptions' + path: /docs/functions/alpha/v2_options.EventHandlerOptions.html - title: 'functions.pubsub' - path: /docs/functions/v2_providers_pubsub.html + path: /docs/functions/alpha/v2_providers_pubsub.html section: - title: 'Message' path: /docs/functions/alpha/v2_providers_pubsub.Message.html diff --git a/docgen/theme/layouts/default.hbs b/docgen/theme/layouts/default.hbs index 17106e8d8..5e749dd87 100644 --- a/docgen/theme/layouts/default.hbs +++ b/docgen/theme/layouts/default.hbs @@ -5,8 +5,8 @@ - - + + {{#ifCond model.name '==' project.name}}{{project.name}}{{else}}{{model.name}} | {{project.name}}{{/ifCond}} diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index 48361b8fc..f4ea32b53 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -1,3 +1,4 @@ +/** @hidden */ import { BooleanParam, FloatParam, diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index ffa0fa5de..4bd80df4c 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -1,3 +1,4 @@ +/** @hidden */ type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; export interface ParamSpec { From fdcd3090b4b139f52c2baea63b33a46c1ca0c992 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 12 Aug 2021 10:55:16 -0700 Subject: [PATCH 343/705] Hyrum's law breaks my heart (#943) * Hyrum's law breaks my heart * Changelog --- CHANGELOG.md | 1 + spec/common/providers/https.spec.ts | 2 +- spec/v1/apps.spec.ts | 2 +- spec/v1/cloud-functions.spec.ts | 2 +- spec/v1/config.spec.ts | 2 +- spec/v1/function-builder.spec.ts | 2 +- spec/v1/providers/analytics.spec.input.ts | 2 +- spec/v1/providers/analytics.spec.ts | 6 +-- spec/v1/providers/auth.spec.ts | 6 +-- spec/v1/providers/database.spec.ts | 10 ++-- spec/v1/providers/firestore.spec.ts | 2 +- spec/v1/providers/https.spec.ts | 2 +- spec/v1/providers/pubsub.spec.ts | 2 +- spec/v1/providers/remoteConfig.spec.ts | 6 +-- spec/v1/providers/storage.spec.ts | 8 +-- spec/v1/providers/testLab.spec.ts | 2 +- spec/v1/setup.spec.ts | 2 +- spec/v1/utils.spec.ts | 2 +- src/{v1 => }/apps.ts | 0 src/{v1 => }/cloud-functions.ts | 6 +-- src/common/providers/https.ts | 2 +- src/{v1 => }/config.ts | 0 src/{v1 => }/encoder.ts | 0 src/{v1 => }/function-builder.ts | 0 src/{v1 => }/function-configuration.ts | 0 src/{v1 => }/handler-builder.ts | 0 src/index.ts | 43 +++++++++++++++- src/{v1 => }/providers/analytics.ts | 0 src/{v1 => }/providers/auth.ts | 0 src/{v1 => }/providers/database.ts | 2 +- src/{v1 => }/providers/firestore.ts | 2 +- src/{v1 => }/providers/https.ts | 2 +- src/{v1 => }/providers/pubsub.ts | 0 src/{v1 => }/providers/remoteConfig.ts | 0 src/{v1 => }/providers/storage.ts | 0 src/{v1 => }/providers/testLab.ts | 0 src/{v1 => }/setup.ts | 2 +- src/{v1 => }/utils.ts | 0 src/v1/index.ts | 62 ----------------------- src/v2/options.ts | 2 +- 40 files changed, 81 insertions(+), 103 deletions(-) rename src/{v1 => }/apps.ts (100%) rename src/{v1 => }/cloud-functions.ts (99%) rename src/{v1 => }/config.ts (100%) rename src/{v1 => }/encoder.ts (100%) rename src/{v1 => }/function-builder.ts (100%) rename src/{v1 => }/function-configuration.ts (100%) rename src/{v1 => }/handler-builder.ts (100%) rename src/{v1 => }/providers/analytics.ts (100%) rename src/{v1 => }/providers/auth.ts (100%) rename src/{v1 => }/providers/database.ts (99%) rename src/{v1 => }/providers/firestore.ts (99%) rename src/{v1 => }/providers/https.ts (98%) rename src/{v1 => }/providers/pubsub.ts (100%) rename src/{v1 => }/providers/remoteConfig.ts (100%) rename src/{v1 => }/providers/storage.ts (100%) rename src/{v1 => }/providers/testLab.ts (100%) rename src/{v1 => }/setup.ts (98%) rename src/{v1 => }/utils.ts (100%) delete mode 100644 src/v1/index.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..08bf07b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix an error that broke `firebase emulators:start` on older CLIs diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 91b2ecad7..b8cc9546b 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import * as express from 'express'; import * as firebase from 'firebase-admin'; +import { apps as appsNamespace } from '../../../src/apps'; import * as https from '../../../src/common/providers/https'; -import { apps as appsNamespace } from '../../../src/v1/apps'; import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, diff --git a/spec/v1/apps.spec.ts b/spec/v1/apps.spec.ts index 33c263f4f..89a1b3f5b 100644 --- a/spec/v1/apps.spec.ts +++ b/spec/v1/apps.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { apps as appsNamespace } from '../../src/v1/apps'; +import { apps as appsNamespace } from '../../src/apps'; import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index 48ecb3072..05e80bd21 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -29,7 +29,7 @@ import { EventContext, makeCloudFunction, MakeCloudFunctionArgs, -} from '../../src/v1/cloud-functions'; +} from '../../src/cloud-functions'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { diff --git a/spec/v1/config.spec.ts b/spec/v1/config.spec.ts index 7b750032d..8341d6a34 100644 --- a/spec/v1/config.spec.ts +++ b/spec/v1/config.spec.ts @@ -25,7 +25,7 @@ import * as fs from 'fs'; import * as process from 'process'; import Sinon = require('sinon'); -import * as config from '../../src/v1/config'; +import * as config from '../../src/config'; describe('config()', () => { let readFileSync: Sinon.SinonStub; diff --git a/spec/v1/function-builder.spec.ts b/spec/v1/function-builder.spec.ts index 86a441c67..13d4daa06 100644 --- a/spec/v1/function-builder.spec.ts +++ b/spec/v1/function-builder.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; -import * as functions from '../../src/v1'; +import * as functions from '../../src'; describe('FunctionBuilder', () => { before(() => { diff --git a/spec/v1/providers/analytics.spec.input.ts b/spec/v1/providers/analytics.spec.input.ts index 74ad65a93..b4a6505f5 100644 --- a/spec/v1/providers/analytics.spec.input.ts +++ b/spec/v1/providers/analytics.spec.input.ts @@ -21,7 +21,7 @@ // SOFTWARE. /* tslint:disable:max-line-length */ -import { AnalyticsEvent } from '../../../src/v1/providers/analytics'; +import { AnalyticsEvent } from '../../../src/providers/analytics'; // A payload, as it might arrive over the wire. Every possible field is filled out at least once. export const fullPayload = JSON.parse(`{ diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts index a6e6b0af6..d92244439 100644 --- a/spec/v1/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -22,9 +22,9 @@ import { expect } from 'chai'; -import * as functions from '../../../src/v1'; -import { Event, EventContext } from '../../../src/v1/cloud-functions'; -import * as analytics from '../../../src/v1/providers/analytics'; +import * as functions from '../../../src'; +import { Event, EventContext } from '../../../src/cloud-functions'; +import * as analytics from '../../../src/providers/analytics'; import * as analytics_spec_input from './analytics.spec.input'; describe('Analytics Functions', () => { diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index df0db01f7..e22052573 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -23,13 +23,13 @@ import { expect } from 'chai'; import * as firebase from 'firebase-admin'; -import * as functions from '../../../src/index'; import { CloudFunction, Event, EventContext, -} from '../../../src/v1/cloud-functions'; -import * as auth from '../../../src/v1/providers/auth'; +} from '../../../src/cloud-functions'; +import * as functions from '../../../src/index'; +import * as auth from '../../../src/providers/auth'; describe('Auth Functions', () => { const event: Event = { diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index 27d5854c6..d49c27854 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -21,11 +21,11 @@ // SOFTWARE. import { expect } from 'chai'; -import { apps as appsNamespace } from '../../../src/v1/apps'; -import * as config from '../../../src/v1/config'; -import * as functions from '../../../src/v1/index'; -import * as database from '../../../src/v1/providers/database'; -import { applyChange } from '../../../src/v1/utils'; +import { apps as appsNamespace } from '../../../src/apps'; +import * as config from '../../../src/config'; +import * as functions from '../../../src/index'; +import * as database from '../../../src/providers/database'; +import { applyChange } from '../../../src/utils'; describe('Database Functions', () => { describe('DatabaseBuilder', () => { diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts index 26a8948fc..25cffaf6c 100644 --- a/spec/v1/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -25,7 +25,7 @@ import * as admin from 'firebase-admin'; import * as _ from 'lodash'; import * as functions from '../../../src/index'; -import * as firestore from '../../../src/v1/providers/firestore'; +import * as firestore from '../../../src/providers/firestore'; describe('Firestore Functions', () => { function constructValue(fields: any) { diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 55ecf9cb8..52b64df69 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -24,7 +24,7 @@ import { expect } from 'chai'; import * as express from 'express'; import * as _ from 'lodash'; import * as functions from '../../../src/index'; -import * as https from '../../../src/v1/providers/https'; +import * as https from '../../../src/providers/https'; import { expectedResponseHeaders, MockRequest, diff --git a/spec/v1/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts index 3d0569057..1ab8c7ba4 100644 --- a/spec/v1/providers/pubsub.spec.ts +++ b/spec/v1/providers/pubsub.spec.ts @@ -23,7 +23,7 @@ import { expect } from 'chai'; import { Event } from '../../../src/index'; import * as functions from '../../../src/index'; -import * as pubsub from '../../../src/v1/providers/pubsub'; +import * as pubsub from '../../../src/providers/pubsub'; describe('Pubsub Functions', () => { describe('pubsub.Message', () => { diff --git a/spec/v1/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts index 2ccfe41fd..f7221cf99 100644 --- a/spec/v1/providers/remoteConfig.spec.ts +++ b/spec/v1/providers/remoteConfig.spec.ts @@ -22,14 +22,14 @@ import { expect } from 'chai'; import * as _ from 'lodash'; -import * as functions from '../../../src/index'; import { CloudFunction, Event, EventContext, TriggerAnnotated, -} from '../../../src/v1/cloud-functions'; -import * as remoteConfig from '../../../src/v1/providers/remoteConfig'; +} from '../../../src/cloud-functions'; +import * as functions from '../../../src/index'; +import * as remoteConfig from '../../../src/providers/remoteConfig'; describe('RemoteConfig Functions', () => { function constructVersion() { diff --git a/spec/v1/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts index aee2d72a9..02762630d 100644 --- a/spec/v1/providers/storage.spec.ts +++ b/spec/v1/providers/storage.spec.ts @@ -21,10 +21,10 @@ // SOFTWARE. import { expect } from 'chai'; -import { Event, EventContext } from '../../../src/v1'; -import * as functions from '../../../src/v1'; -import * as config from '../../../src/v1/config'; -import * as storage from '../../../src/v1/providers/storage'; +import { Event, EventContext } from '../../../src'; +import * as functions from '../../../src'; +import * as config from '../../../src/config'; +import * as storage from '../../../src/providers/storage'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { diff --git a/spec/v1/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts index 5584bfbf7..3dbe8c0f5 100644 --- a/spec/v1/providers/testLab.spec.ts +++ b/spec/v1/providers/testLab.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; -import * as testLab from '../../../src/v1/providers/testLab'; +import * as testLab from '../../../src/providers/testLab'; describe('Test Lab Functions', () => { describe('#onComplete', () => { diff --git a/spec/v1/setup.spec.ts b/spec/v1/setup.spec.ts index 20ca26d12..25a6fbe0c 100644 --- a/spec/v1/setup.spec.ts +++ b/spec/v1/setup.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { setup } from '../../src/v1/setup'; +import { setup } from '../../src/setup'; describe('setup()', () => { afterEach(() => { diff --git a/spec/v1/utils.spec.ts b/spec/v1/utils.spec.ts index 119d203f6..db749ca5d 100644 --- a/spec/v1/utils.spec.ts +++ b/spec/v1/utils.spec.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { expect } from 'chai'; -import { applyChange } from '../../src/v1/utils'; +import { applyChange } from '../../src/utils'; describe('utils', () => { describe('.applyChange(from: any, to: any): any', () => { diff --git a/src/v1/apps.ts b/src/apps.ts similarity index 100% rename from src/v1/apps.ts rename to src/apps.ts diff --git a/src/v1/cloud-functions.ts b/src/cloud-functions.ts similarity index 99% rename from src/v1/cloud-functions.ts rename to src/cloud-functions.ts index b06d63836..85d69924e 100644 --- a/src/v1/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -22,22 +22,22 @@ import { Request, Response } from 'express'; import * as _ from 'lodash'; -import { warn } from '../logger'; import { DEFAULT_FAILURE_POLICY, DeploymentOptions, FailurePolicy, Schedule, } from './function-configuration'; +import { warn } from './logger'; export { Request, Response }; import { convertIfPresent, + convertInvoker, copyIfPresent, Duration, durationFromSeconds, serviceAccountFromShorthand, - convertInvoker, -} from '../common/encoding'; +} from './common/encoding'; /** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 8b426756f..67c63613f 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -28,7 +28,7 @@ import * as logger from '../../logger'; // TODO(inlined): Decide whether we want to un-version apps or whether we want a // different strategy -import { apps } from '../../v1/apps'; +import { apps } from '../../apps'; /** @hidden */ export interface Request extends express.Request { diff --git a/src/v1/config.ts b/src/config.ts similarity index 100% rename from src/v1/config.ts rename to src/config.ts diff --git a/src/v1/encoder.ts b/src/encoder.ts similarity index 100% rename from src/v1/encoder.ts rename to src/encoder.ts diff --git a/src/v1/function-builder.ts b/src/function-builder.ts similarity index 100% rename from src/v1/function-builder.ts rename to src/function-builder.ts diff --git a/src/v1/function-configuration.ts b/src/function-configuration.ts similarity index 100% rename from src/v1/function-configuration.ts rename to src/function-configuration.ts diff --git a/src/v1/handler-builder.ts b/src/handler-builder.ts similarity index 100% rename from src/v1/handler-builder.ts rename to src/handler-builder.ts diff --git a/src/index.ts b/src/index.ts index fcac62f27..dbb42003c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,6 @@ // The MIT License (MIT) // -// Copyright (c) 2021 Firebase +// Copyright (c) 2017 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 @@ -20,4 +20,43 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -export * from './v1'; +// Providers: +import * as analytics from './providers/analytics'; +import * as auth from './providers/auth'; +import * as database from './providers/database'; +import * as firestore from './providers/firestore'; +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 testLab from './providers/testLab'; + +import * as apps from './apps'; +import { handler } from './handler-builder'; +import * as logger from './logger'; +import { setup } from './setup'; + +const app = apps.apps(); + +export { + analytics, + app, + auth, + database, + firestore, + handler, + https, + pubsub, + remoteConfig, + storage, + testLab, + logger, +}; + +// Exported root types: +export * from './cloud-functions'; +export * from './config'; +export * from './function-builder'; +export * from './function-configuration'; + +setup(); diff --git a/src/v1/providers/analytics.ts b/src/providers/analytics.ts similarity index 100% rename from src/v1/providers/analytics.ts rename to src/providers/analytics.ts diff --git a/src/v1/providers/auth.ts b/src/providers/auth.ts similarity index 100% rename from src/v1/providers/auth.ts rename to src/providers/auth.ts diff --git a/src/v1/providers/database.ts b/src/providers/database.ts similarity index 99% rename from src/v1/providers/database.ts rename to src/providers/database.ts index 372419169..76252d515 100644 --- a/src/v1/providers/database.ts +++ b/src/providers/database.ts @@ -22,7 +22,6 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; -import { joinPath, normalizePath, pathParts } from '../../utilities/path'; import { apps } from '../apps'; import { Change, @@ -33,6 +32,7 @@ import { } from '../cloud-functions'; import { firebaseConfig } from '../config'; import { DeploymentOptions } from '../function-configuration'; +import { joinPath, normalizePath, pathParts } from '../utilities/path'; import { applyChange } from '../utils'; /** @hidden */ diff --git a/src/v1/providers/firestore.ts b/src/providers/firestore.ts similarity index 99% rename from src/v1/providers/firestore.ts rename to src/providers/firestore.ts index 5554f6e3b..620040d2b 100644 --- a/src/v1/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -24,7 +24,6 @@ import * as firebase from 'firebase-admin'; import * as _ from 'lodash'; import { posix } from 'path'; -import * as logger from '../../logger'; import { apps } from '../apps'; import { Change, @@ -35,6 +34,7 @@ import { } from '../cloud-functions'; import { dateToTimestampProto } from '../encoder'; import { DeploymentOptions } from '../function-configuration'; +import * as logger from '../logger'; /** @hidden */ export const provider = 'google.firestore'; diff --git a/src/v1/providers/https.ts b/src/providers/https.ts similarity index 98% rename from src/v1/providers/https.ts rename to src/providers/https.ts index 659c43586..1b1fc9422 100644 --- a/src/v1/providers/https.ts +++ b/src/providers/https.ts @@ -22,8 +22,8 @@ import * as express from 'express'; -import * as common from '../../common/providers/https'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; +import * as common from '../common/providers/https'; import { DeploymentOptions } from '../function-configuration'; export type Request = common.Request; diff --git a/src/v1/providers/pubsub.ts b/src/providers/pubsub.ts similarity index 100% rename from src/v1/providers/pubsub.ts rename to src/providers/pubsub.ts diff --git a/src/v1/providers/remoteConfig.ts b/src/providers/remoteConfig.ts similarity index 100% rename from src/v1/providers/remoteConfig.ts rename to src/providers/remoteConfig.ts diff --git a/src/v1/providers/storage.ts b/src/providers/storage.ts similarity index 100% rename from src/v1/providers/storage.ts rename to src/providers/storage.ts diff --git a/src/v1/providers/testLab.ts b/src/providers/testLab.ts similarity index 100% rename from src/v1/providers/testLab.ts rename to src/providers/testLab.ts diff --git a/src/v1/setup.ts b/src/setup.ts similarity index 98% rename from src/v1/setup.ts rename to src/setup.ts index 6b0eb3506..6a9db702d 100644 --- a/src/v1/setup.ts +++ b/src/setup.ts @@ -21,8 +21,8 @@ // SOFTWARE. /** @hidden */ -import { warn } from '../logger'; import { firebaseConfig } from './config'; +import { warn } from './logger'; // Set up for config and vars export function setup() { diff --git a/src/v1/utils.ts b/src/utils.ts similarity index 100% rename from src/v1/utils.ts rename to src/utils.ts diff --git a/src/v1/index.ts b/src/v1/index.ts deleted file mode 100644 index ec83eeab5..000000000 --- a/src/v1/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 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. - -// Providers: -import * as analytics from './providers/analytics'; -import * as auth from './providers/auth'; -import * as database from './providers/database'; -import * as firestore from './providers/firestore'; -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 testLab from './providers/testLab'; - -import * as logger from '../logger'; -import * as apps from './apps'; -import { handler } from './handler-builder'; -import { setup } from './setup'; - -const app = apps.apps(); - -export { - analytics, - app, - auth, - database, - firestore, - handler, - https, - pubsub, - remoteConfig, - storage, - testLab, - logger, -}; - -// Exported root types: -export * from './cloud-functions'; -export * from './config'; -export * from './function-builder'; -export * from './function-configuration'; - -setup(); diff --git a/src/v2/options.ts b/src/v2/options.ts index 41480cfeb..94aaeb749 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -21,9 +21,9 @@ // SOFTWARE. import { + convertInvoker, durationFromSeconds, serviceAccountFromShorthand, - convertInvoker, } from '../common/encoding'; import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; From e720f8770c32df92313884ffdde0279ee637d184 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 12 Aug 2021 19:54:53 +0000 Subject: [PATCH 344/705] 3.15.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0baf9d4d..c12a3c36c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.1", + "version": "3.15.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 57ce24316..4f0081ef4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.1", + "version": "3.15.2", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 1d80b5f34bccb5c8cf678f0f50f4945c7e265269 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 12 Aug 2021 19:54:58 +0000 Subject: [PATCH 345/705] [firebase-release] Removed change log and reset repo after 3.15.2 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08bf07b55..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fix an error that broke `firebase emulators:start` on older CLIs From 331e14ec81d61ca62437c94c2dedf681ee909900 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Fri, 13 Aug 2021 11:28:12 -0700 Subject: [PATCH 346/705] Fix "functions.https.HttpsError is not a constructor" (#949) * Fix "functions.https.HttpsError is not a constructor" It turns out that type aliases in TypeScript don't copy constructors. Replacing "export type Foo = common.Foo" with "import { Foo } from common; export { Foo }" is lossless and fixes the bug. * Lint fixes --- src/providers/https.ts | 18 +++++++++--------- src/v2/providers/https.ts | 16 +++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/providers/https.ts b/src/providers/https.ts index 1b1fc9422..af39ad881 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -23,13 +23,16 @@ import * as express from 'express'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; -import * as common from '../common/providers/https'; +import { + CallableContext, + FunctionsErrorCode, + HttpsError, + onCallHandler, + Request, +} from '../common/providers/https'; import { DeploymentOptions } from '../function-configuration'; -export type Request = common.Request; -export type CallableContext = common.CallableContext; -export type FunctionsErrorCode = common.FunctionsErrorCode; -export type HttpsError = common.HttpsError; +export { Request, CallableContext, FunctionsErrorCode, HttpsError }; /** * Handle HTTP requests. @@ -74,10 +77,7 @@ export function _onCallWithOptions( handler: (data: any, context: CallableContext) => any | Promise, options: DeploymentOptions ): HttpsFunction & Runnable { - const func: any = common.onCallHandler( - { origin: true, methods: 'POST' }, - handler - ); + const func: any = onCallHandler({ origin: true, methods: 'POST' }, handler); func.__trigger = { labels: {}, diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index a3d96ccb6..72462673c 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -23,14 +23,16 @@ import * as cors from 'cors'; import * as express from 'express'; -import * as common from '../../common/providers/https'; +import { + CallableRequest, + FunctionsErrorCode, + HttpsError, + onCallHandler, + Request, +} from '../../common/providers/https'; import * as options from '../options'; -export type Request = common.Request; - -export type CallableRequest = common.CallableRequest; -export type FunctionsErrorCode = common.FunctionsErrorCode; -export type HttpsError = common.HttpsError; +export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; export interface HttpsOptions extends Omit { region?: @@ -142,7 +144,7 @@ export function onCall>( } const origin = 'cors' in opts ? opts.cors : true; - const func: any = common.onCallHandler({ origin, methods: 'POST' }, handler); + const func: any = onCallHandler({ origin, methods: 'POST' }, handler); Object.defineProperty(func, '__trigger', { get: () => { From c842e758510f4671998db97025a05af790a4ee84 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Fri, 13 Aug 2021 11:33:25 -0700 Subject: [PATCH 347/705] Export every real and namespace file for v1 (#948) --- package.json | 58 ++++++++++++++++++++++++++++++++++++++++++---- v1/analytics.js | 26 +++++++++++++++++++++ v1/auth.js | 26 +++++++++++++++++++++ v1/database.js | 26 +++++++++++++++++++++ v1/firestore.js | 26 +++++++++++++++++++++ v1/pubsub.js | 26 +++++++++++++++++++++ v1/remoteConfig.js | 26 +++++++++++++++++++++ v1/storage.js | 26 +++++++++++++++++++++ v1/testLab.js | 26 +++++++++++++++++++++ 9 files changed, 261 insertions(+), 5 deletions(-) create mode 100644 v1/analytics.js create mode 100644 v1/auth.js create mode 100644 v1/database.js create mode 100644 v1/firestore.js create mode 100644 v1/pubsub.js create mode 100644 v1/remoteConfig.js create mode 100644 v1/storage.js create mode 100644 v1/testLab.js diff --git a/package.json b/package.json index 4f0081ef4..c5c7acf19 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,33 @@ "types": "lib/index.d.ts", "exports": { ".": "./lib/index.js", - "./lib/providers/https": "./lib/v1/providers/https.js", - "./v1": "./lib/v1/index.js", - "./logger": "./lib/logger/index.js", "./logger/compat": "./lib/logger/compat.js", - "./lib/logger": "./lib/logger/index.js", "./lib/logger/compat": "./lib/logger/compat.js", + + "./logger": "./lib/logger/index.js", + "./lib/logger": "./lib/logger/index.js", + + "./lib/providers/auth": "./lib/providers/auth.js", + "./lib/providers/analytics": "./lib/providers/analytics.js", + "./lib/providers/database": "./lib/providers/database.js", + "./lib/providers/firestore": "./lib/providers/firestore.js", + "./lib/providers/https": "./lib/providers/https.js", + "./lib/providers/pubsub": "./lib/providers/pubsub.js", + "./lib/providers/remoteConfig": "./lib/providers/remoteConfig.js", + "./lib/providers/storage": "./lib/providers/storage.js", + "./lib/providers/testLab": "./lib/providers/testLab.js", + + "./v1": "./lib/index.js", + "./v1/analytics": "./lib/providers/analytics.js", + "./v1/auth": "./lib/providers/auth.js", + "./v1/database": "./lib/providers/database.js", + "./v1/firestore": "./lib/providers/firestore.js", + "./v1/https": "./lib/providers/https.js", + "./v1/pubsub": "./lib/providers/pubsub.js", + "./v1/remoteConfig": "./lib/providers/remoteConfig.js", + "./v1/storage": "./lib/providers/storage.js", + "./v1/testLab": "./lib/providers/testLab.js", + "./v2": "./lib/v2/index.js", "./v2/core": "./lib/v2/core.js", "./v2/options": "./lib/v2/options.js", @@ -47,7 +68,34 @@ "lib/logger/compat" ], "v1": [ - "lib/v1" + "lib" + ], + "v1/analytics": [ + "lib/providers/analytics" + ], + "v1/auth": [ + "lib/providers/auth" + ], + "v1/database": [ + "lib/providers/database" + ], + "v1/firestore": [ + "lib/providers/firestore" + ], + "v1/https": [ + "lib/providers/https" + ], + "v1/pubsub": [ + "lib/providers/pubsub" + ], + "v1/remoteConfig": [ + "lib/providers/remoteConfig" + ], + "v1/storage": [ + "lib/providers/storage" + ], + "v1/testLab": [ + "lib/providers/testLab" ], "v2": [ "lib/v2" diff --git a/v1/analytics.js b/v1/analytics.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/analytics.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/auth.js b/v1/auth.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/auth.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/database.js b/v1/database.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/database.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/firestore.js b/v1/firestore.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/firestore.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/pubsub.js b/v1/pubsub.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/pubsub.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/remoteConfig.js b/v1/remoteConfig.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/remoteConfig.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/storage.js b/v1/storage.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/storage.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v1/testLab.js b/v1/testLab.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v1/testLab.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 2a8265f06c531838c252031318bf6161eee0fe54 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Fri, 13 Aug 2021 11:57:41 -0700 Subject: [PATCH 348/705] Changelog (#951) * Changelog * Lint fixes --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..7928ca58d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +- (temporarly) adds the previously accessible "lib/providers" files as exports. These will be yanked in the next major release. +- Fixes a bug where functions.https.HttpsError could not be constructed From eb98f0c3175debb90c447534208db1970d5a8b0f Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 13 Aug 2021 19:03:21 +0000 Subject: [PATCH 349/705] 3.15.3 --- package-lock.json | 2 +- package.json | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index c12a3c36c..9541a65c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.2", + "version": "3.15.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c5c7acf19..d1a858cc9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.2", + "version": "3.15.3", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", @@ -27,10 +27,8 @@ ".": "./lib/index.js", "./logger/compat": "./lib/logger/compat.js", "./lib/logger/compat": "./lib/logger/compat.js", - "./logger": "./lib/logger/index.js", "./lib/logger": "./lib/logger/index.js", - "./lib/providers/auth": "./lib/providers/auth.js", "./lib/providers/analytics": "./lib/providers/analytics.js", "./lib/providers/database": "./lib/providers/database.js", @@ -40,7 +38,6 @@ "./lib/providers/remoteConfig": "./lib/providers/remoteConfig.js", "./lib/providers/storage": "./lib/providers/storage.js", "./lib/providers/testLab": "./lib/providers/testLab.js", - "./v1": "./lib/index.js", "./v1/analytics": "./lib/providers/analytics.js", "./v1/auth": "./lib/providers/auth.js", @@ -51,7 +48,6 @@ "./v1/remoteConfig": "./lib/providers/remoteConfig.js", "./v1/storage": "./lib/providers/storage.js", "./v1/testLab": "./lib/providers/testLab.js", - "./v2": "./lib/v2/index.js", "./v2/core": "./lib/v2/core.js", "./v2/options": "./lib/v2/options.js", From 4c33a76b7f3d72bc878210d836ac65f30a44d32e Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 13 Aug 2021 19:03:26 +0000 Subject: [PATCH 350/705] [firebase-release] Removed change log and reset repo after 3.15.3 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7928ca58d..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- (temporarly) adds the previously accessible "lib/providers" files as exports. These will be yanked in the next major release. -- Fixes a bug where functions.https.HttpsError could not be constructed From 78db0b8134e3ff11b5e891dfc1380574dc2c7058 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 16 Aug 2021 13:57:54 -0700 Subject: [PATCH 351/705] Fix bug where v1 HTTP used v2 API if callback had len 1 (#955) * Fix bug where v1 HTTP used v2 API if callback had len 1 * Changelog * Formatter --- CHANGELOG.md | 1 + spec/v1/providers/https.spec.ts | 22 ++++++++++++++++++++++ src/providers/https.ts | 7 ++++++- src/v2/providers/https.ts | 6 +++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..c4b77c3d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix bug where the arg of https onCall functions sometimes deviates from the documented format. diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 52b64df69..88e1ec3f8 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -175,6 +175,28 @@ describe('#onCall', () => { }; expect(cf.run(data, context)).to.deep.equal({ data, context }); }); + + // Regression test for firebase-functions#947 + it('should lock to the v1 API even with function.length == 1', async () => { + let gotData: Record; + const func = https.onCall((data) => { + gotData = data; + }); + + const req = new MockRequest( + { + data: { foo: 'bar' }, + }, + { + 'content-type': 'application/json', + } + ); + req.method = 'POST'; + + const response = await runHandler(func, req as any); + expect(response.status).to.equal(200); + expect(gotData).to.deep.equal({ foo: 'bar' }); + }); }); describe('callable CORS', () => { diff --git a/src/providers/https.ts b/src/providers/https.ts index af39ad881..db6f46448 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -77,7 +77,12 @@ export function _onCallWithOptions( handler: (data: any, context: CallableContext) => any | Promise, options: DeploymentOptions ): HttpsFunction & Runnable { - const func: any = onCallHandler({ origin: true, methods: 'POST' }, handler); + // onCallHandler sniffs the function length of the passed-in callback + // and the user could have only tried to listen to data. Wrap their handler + // in another handler to avoid accidentally triggering the v2 API + const fixedLen = (data: any, context: CallableContext) => + handler(data, context); + const func: any = onCallHandler({ origin: true, methods: 'POST' }, fixedLen); func.__trigger = { labels: {}, diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 72462673c..ad60da280 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -144,7 +144,11 @@ export function onCall>( } const origin = 'cors' in opts ? opts.cors : true; - const func: any = onCallHandler({ origin, methods: 'POST' }, handler); + + // onCallHandler sniffs the function length to determine which API to present. + // fix the length to prevent api versions from being mismatched. + const fixedLen = (req: CallableRequest) => handler(req); + const func: any = onCallHandler({ origin, methods: 'POST' }, fixedLen); Object.defineProperty(func, '__trigger', { get: () => { From de1c3c19887757a1060fda0a8b03fd457c55c535 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 16 Aug 2021 21:56:56 +0000 Subject: [PATCH 352/705] 3.15.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9541a65c1..4ca5bc357 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.3", + "version": "3.15.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d1a858cc9..2e6b69771 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.3", + "version": "3.15.4", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From ac20b2b1a71e8e0bd607d50a0d633c403752e97c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 16 Aug 2021 21:57:01 +0000 Subject: [PATCH 353/705] [firebase-release] Removed change log and reset repo after 3.15.4 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b77c3d5..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fix bug where the arg of https onCall functions sometimes deviates from the documented format. From 1a727bbafa6c23f2d1e1f9638b72c608ed21a013 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Thu, 19 Aug 2021 10:45:24 -0700 Subject: [PATCH 354/705] Tiny change to bring API reference TOC source up to date (#958) * Adding required tags to page template. * Adding formatting and fixing typo discovered in internal review. * More fixes/additions discovered in internal review. * Fixing format of toc.yaml file. * Adding EAP TOC and index top matter. * Refine TOC, fix paths in template, attempt to hide params. * Doing all possible to make this YAML valid. VSCode extensions believe that it is. * Fixing reference to TopicBuilder and adding HTTP interfaces. --- docgen/content-sources/v2/toc.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docgen/content-sources/v2/toc.yaml b/docgen/content-sources/v2/toc.yaml index 917a7a402..61e330865 100644 --- a/docgen/content-sources/v2/toc.yaml +++ b/docgen/content-sources/v2/toc.yaml @@ -15,6 +15,10 @@ toc: section: - title: 'functions.https.CallableFunction' path: /docs/functions/alpha/v2_providers_https.CallableFunction.html + - title: 'functions.https.CallableRequest' + path: /docs/functions/alpha/v2_providers_https.CallableRequest.html + - title: 'functions.https.error' + path: /docs/functions/alpha/v2_providers_https.HttpsError.html - title: 'functions.https.options' path: /docs/functions/alpha/v2_providers_https.HttpsOptions.html - title: 'functions.logger' @@ -34,7 +38,7 @@ toc: section: - title: 'Message' path: /docs/functions/alpha/v2_providers_pubsub.Message.html - - title: 'TopicBuilder' + - title: 'MessagePublishedData' path: /docs/functions/alpha/v2_providers_pubsub.MessagePublishedData.html - title: 'PubSubOptions' path: /docs/functions/alpha/v2_providers_pubsub.PubSubOptions.html From fb1fe3d4b56296dc2e7b3aba0885af00a2591507 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Mon, 23 Aug 2021 16:10:58 -0400 Subject: [PATCH 355/705] moving invoker into HttpsTrigger block and adding more tests (#960) --- spec/common/encoding.spec.ts | 12 ++++++++++++ spec/v1/providers/https.spec.ts | 2 ++ spec/v2/providers/https.spec.ts | 4 ++-- src/cloud-functions.ts | 7 +++---- src/common/encoding.ts | 10 +++++++++- src/providers/https.ts | 8 ++++++++ src/v2/core.ts | 5 +++-- src/v2/options.ts | 2 -- src/v2/providers/https.ts | 11 ++++++++++- 9 files changed, 49 insertions(+), 12 deletions(-) diff --git a/spec/common/encoding.spec.ts b/spec/common/encoding.spec.ts index 9b251e1da..388a6681c 100644 --- a/spec/common/encoding.spec.ts +++ b/spec/common/encoding.spec.ts @@ -2,6 +2,18 @@ import { expect } from 'chai'; import { convertInvoker } from '../../src/common/encoding'; describe('convertInvoker', () => { + it('should raise an error on empty array', () => { + expect(() => convertInvoker([])).to.throw; + }); + + it('should raise an error on empty string', () => { + expect(() => convertInvoker('')).to.throw; + }); + + it('should raise an error on empty string with service accounts', () => { + expect(() => convertInvoker(['service-account@', ''])).to.throw; + }); + it('should raise an error on mixing public and service accounts', () => { expect(() => convertInvoker(['public', 'service-account@'])).to.throw; }); diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 88e1ec3f8..025c99a7a 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -107,12 +107,14 @@ describe('CloudHttpsBuilder', () => { .runWith({ timeoutSeconds: 90, memory: '256MB', + invoker: 'private', }) .https.onRequest(() => null); expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + expect(fn.__trigger.httpsTrigger.invoker).to.deep.equal(['private']); }); }); }); diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 704c958c1..a28cb1c9c 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -111,9 +111,9 @@ describe('onRequest', () => { ...FULL_TRIGGER, httpsTrigger: { allowInsecure: false, + invoker: ['service-account1@', 'service-account2@'], }, regions: ['us-west1', 'us-central1'], - invoker: ['service-account1@', 'service-account2@'], }); }); @@ -141,12 +141,12 @@ describe('onRequest', () => { platform: 'gcfv2', httpsTrigger: { allowInsecure: false, + invoker: ['private'], }, concurrency: 20, minInstances: 3, regions: ['us-west1', 'us-central1'], labels: {}, - invoker: ['private'], }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 85d69924e..688c4eb78 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -32,7 +32,6 @@ import { warn } from './logger'; export { Request, Response }; import { convertIfPresent, - convertInvoker, copyIfPresent, Duration, durationFromSeconds, @@ -270,7 +269,9 @@ export interface TriggerAnnotated { service: string; }; failurePolicy?: FailurePolicy; - httpsTrigger?: {}; + httpsTrigger?: { + invoker?: string[]; + }; labels?: { [key: string]: string }; regions?: string[]; schedule?: Schedule; @@ -279,7 +280,6 @@ export interface TriggerAnnotated { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; - invoker?: string[]; }; } @@ -542,7 +542,6 @@ export function optionsToTrigger(options: DeploymentOptions) { 'serviceAccount', serviceAccountFromShorthand ); - convertIfPresent(trigger, options, 'invoker', 'invoker', convertInvoker); return trigger; } diff --git a/src/common/encoding.ts b/src/common/encoding.ts index 7ef770a6f..0cbc2d50f 100644 --- a/src/common/encoding.ts +++ b/src/common/encoding.ts @@ -70,12 +70,20 @@ export function convertInvoker(invoker: string | string[]): string[] { invoker = [invoker]; } + if (invoker.length === 0) { + throw new Error('Invalid option for invoker: Must be a non-empty array.'); + } + + if (invoker.find((inv) => inv.length === 0)) { + throw new Error('Invalid option for invoker: Must be a non-empty string.'); + } + if ( invoker.length > 1 && invoker.find((inv) => inv === 'public' || inv === 'private') ) { throw new Error( - "Invalid option for invoker. Cannot have 'public' or 'private' in an array of service accounts" + "Invalid option for invoker: Cannot have 'public' or 'private' in an array of service accounts." ); } diff --git a/src/providers/https.ts b/src/providers/https.ts index db6f46448..074a7fbff 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -23,6 +23,7 @@ import * as express from 'express'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; +import { convertIfPresent, convertInvoker } from '../common/encoding'; import { CallableContext, FunctionsErrorCode, @@ -68,6 +69,13 @@ export function _onRequestWithOptions( ...optionsToTrigger(options), httpsTrigger: {}, }; + convertIfPresent( + cloudFunction.__trigger.httpsTrigger, + options, + 'invoker', + 'invoker', + convertInvoker + ); // TODO parse the options return cloudFunction; } diff --git a/src/v2/core.ts b/src/v2/core.ts index 0772de6f7..d471c107b 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -32,7 +32,9 @@ export interface TriggerAnnotation { service: string; }; failurePolicy?: { retry: boolean }; - httpsTrigger?: {}; + httpsTrigger?: { + invoker?: string[]; + }; labels?: { [key: string]: string }; regions?: string[]; timeout?: string; @@ -40,7 +42,6 @@ export interface TriggerAnnotation { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; - invoker?: string[]; // TODO: schedule } diff --git a/src/v2/options.ts b/src/v2/options.ts index 94aaeb749..f7a679589 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -21,7 +21,6 @@ // SOFTWARE. import { - convertInvoker, durationFromSeconds, serviceAccountFromShorthand, } from '../common/encoding'; @@ -276,7 +275,6 @@ export function optionsToTriggerAnnotations( return retry ? { retry: true } : null; } ); - convertIfPresent(annotation, opts, 'invoker', 'invoker', convertInvoker); return annotation; } diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index ad60da280..612352bc8 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -22,6 +22,7 @@ import * as cors from 'cors'; import * as express from 'express'; +import { convertIfPresent, convertInvoker } from '../../common/encoding'; import { CallableRequest, @@ -104,7 +105,7 @@ export function onRequest( const specificOpts = options.optionsToTriggerAnnotations( opts as options.GlobalOptions ); - return { + const trigger: any = { // TODO(inlined): Remove "apiVersion" once the latest version of the CLI // has migrated to "platform". apiVersion: 2, @@ -119,6 +120,14 @@ export function onRequest( allowInsecure: false, }, }; + convertIfPresent( + trigger.httpsTrigger, + opts, + 'invoker', + 'invoker', + convertInvoker + ); + return trigger; }, }); return handler as HttpsFunction; From 50dcd827acf15060a6b800c01fffe24bdc1cc8f5 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 1 Sep 2021 13:31:37 -0700 Subject: [PATCH 356/705] Release minInstances feature (#966) * Release minInstances feature * Lint fixes * PR feedback --- CHANGELOG.md | 1 + src/function-configuration.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..5e4da0ced 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Make the minInstances feature public. diff --git a/src/function-configuration.ts b/src/function-configuration.ts index c4ba01f9c..9ec182a60 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -123,7 +123,6 @@ export interface RuntimeOptions { * Min number of actual instances to be running at a given time. * Instances will be billed for memory allocation and 10% of CPU allocation * while idle. - * @hidden */ minInstances?: number; From c5beb045620534ebc40a266bf43519cfc56e6f61 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 1 Sep 2021 20:35:37 +0000 Subject: [PATCH 357/705] 3.15.5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ca5bc357..57b0ebe0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.4", + "version": "3.15.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2e6b69771..dedee3974 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.4", + "version": "3.15.5", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From d46ec6191e61f560f3f21f13333e0f3285d3de90 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 1 Sep 2021 20:35:41 +0000 Subject: [PATCH 358/705] [firebase-release] Removed change log and reset repo after 3.15.5 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e4da0ced..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Make the minInstances feature public. From 5ced4a45df56ebf265f61dbda1054e27a12c2533 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 15 Sep 2021 10:15:15 -0700 Subject: [PATCH 359/705] Add missing type annotations (#974) * adding config options for cors * update changelog * fix changelog * newline --- CHANGELOG.md | 1 + src/v2/providers/https.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..b22b63fe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Add missing type annotations diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 612352bc8..f462d270e 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -40,7 +40,7 @@ export interface HttpsOptions extends Omit { | options.SupportedRegion | string | Array; - cors?: string | boolean; + cors?: string | boolean | RegExp | (string | RegExp)[]; } export type HttpsFunction = (( From 6cee06e961b48610d858585d249f15cdca20c6b2 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 15 Sep 2021 19:31:11 +0000 Subject: [PATCH 360/705] 3.15.6 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57b0ebe0e..eb7037071 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.5", + "version": "3.15.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index dedee3974..56861df06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.5", + "version": "3.15.6", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From b6cb79776dcc57656fcdcbc072f804142541ab6b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 15 Sep 2021 19:31:15 +0000 Subject: [PATCH 361/705] [firebase-release] Removed change log and reset repo after 3.15.6 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b22b63fe5..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Add missing type annotations From 0a40a56a2be1a2853703e77e0a1139bfd4063b88 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 20 Sep 2021 11:34:07 -0700 Subject: [PATCH 362/705] Adjust acceptable options values (#980) --- CHANGELOG.md | 1 + src/v2/options.ts | 2 +- src/v2/providers/https.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..f107824a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adjust acceptable runtime options values diff --git a/src/v2/options.ts b/src/v2/options.ts index f7a679589..076cb8532 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -33,7 +33,7 @@ import { ParamSpec } from './params/types'; /** * List of all regions supported by Cloud Functions v2 */ -export const SUPPORTED_REGIONS = ['us-west1'] as const; +export const SUPPORTED_REGIONS = ['us-west1', 'europe-west4'] as const; /** * A region known to be supported by CloudFunctions v2 diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index f462d270e..54f1a1b36 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -40,7 +40,7 @@ export interface HttpsOptions extends Omit { | options.SupportedRegion | string | Array; - cors?: string | boolean | RegExp | (string | RegExp)[]; + cors?: string | boolean | RegExp | Array; } export type HttpsFunction = (( From 347a381b3300e99aaa94687cb2d4ba8f06b8f42b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 20 Sep 2021 18:37:45 +0000 Subject: [PATCH 363/705] 3.15.7 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb7037071..b46f581ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.6", + "version": "3.15.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 56861df06..b2b31acca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.6", + "version": "3.15.7", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 10650154ef00187a5ef4ae569cf25f35c769292f Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 20 Sep 2021 18:37:50 +0000 Subject: [PATCH 364/705] [firebase-release] Removed change log and reset repo after 3.15.7 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f107824a1..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Adjust acceptable runtime options values From 0479817fd00b2c889063748d7f7cb1dfa73ac4dc Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 30 Sep 2021 11:19:25 -0700 Subject: [PATCH 365/705] GCS Enhancement (#981) * inital gcs work * removing bucket path * adding tests * cleaning up and fixing pr issues * clean up comment * removing redundant code * fixing undefined argument bug * format:fix * removing apiVersion, changing hidden to internal, and cleaning up tests * format * changelog --- CHANGELOG.md | 1 + package.json | 6 +- spec/v2/providers/storage.spec.ts | 489 ++++++++++++++++++++++++++++++ src/v2/index.ts | 3 +- src/v2/providers/storage.ts | 373 +++++++++++++++++++++++ v2/storage.js | 26 ++ 6 files changed, 896 insertions(+), 2 deletions(-) create mode 100644 spec/v2/providers/storage.spec.ts create mode 100644 src/v2/providers/storage.ts create mode 100644 v2/storage.js diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..881256402 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- GCS Enhancement diff --git a/package.json b/package.json index b2b31acca..e1755efa1 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "./v2/options": "./lib/v2/options.js", "./v2/https": "./lib/v2/providers/https.js", "./v2/params": "./lib/v2/params/index.js", - "./v2/pubsub": "./lib/v2/providers/pubsub.js" + "./v2/pubsub": "./lib/v2/providers/pubsub.js", + "./v2/storage": "./lib/v2/providers/storage.js" }, "typesVersions": { "*": { @@ -110,6 +111,9 @@ ], "v2/pubsub": [ "lib/v2/providers/pubsub" + ], + "v2/storage": [ + "lib/v2/providers/storage" ] } }, diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts new file mode 100644 index 000000000..601b5c024 --- /dev/null +++ b/spec/v2/providers/storage.spec.ts @@ -0,0 +1,489 @@ +import { expect } from 'chai'; +import * as sinon from 'sinon'; +import * as config from '../../../src/config'; +import * as options from '../../../src/v2/options'; +import * as storage from '../../../src/v2/providers/storage'; +import { FULL_OPTIONS } from './helpers'; + +const EVENT_TRIGGER = { + eventType: 'event-type', + resource: 'some-bucket', +}; + +describe('v2/storage', () => { + describe('getOptsAndBucket', () => { + it('should return the default bucket with empty opts', () => { + const configStub = sinon + .stub(config, 'firebaseConfig') + .returns({ storageBucket: 'default-bucket' }); + + const [opts, bucket] = storage.getOptsAndBucket({}); + + configStub.restore(); + expect(opts).to.deep.equal({}); + expect(bucket).to.eq('default-bucket'); + }); + + it('should return the default bucket with opts param', () => { + const configStub = sinon + .stub(config, 'firebaseConfig') + .returns({ storageBucket: 'default-bucket' }); + + const [opts, bucket] = storage.getOptsAndBucket({ region: 'us-west1' }); + + configStub.restore(); + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(bucket).to.eq('default-bucket'); + }); + + it('should return the given bucket', () => { + const [opts, bucket] = storage.getOptsAndBucket('my-bucket'); + + expect(opts).to.deep.equal({}); + expect(bucket).to.eq('my-bucket'); + }); + + it('should return the given bucket and opts', () => { + const [opts, bucket] = storage.getOptsAndBucket({ + bucket: 'my-bucket', + region: 'us-west1', + }); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(bucket).to.eq('my-bucket'); + }); + }); + + describe('onOperation', () => { + let configStub: sinon.SinonStub; + + beforeEach(() => { + process.env.GCLOUD_PROJECT = 'aProject'; + configStub = sinon.stub(config, 'firebaseConfig'); + }); + + afterEach(() => { + options.setGlobalOptions({}); + delete process.env.GCLOUD_PROJECT; + configStub.restore(); + }); + + it('should create a minimal trigger with bucket', () => { + const result = storage.onOperation('event-type', 'some-bucket', () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: EVENT_TRIGGER, + }); + }); + + it('should create a minimal trigger with opts', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onOperation( + 'event-type', + { region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...EVENT_TRIGGER, + resource: 'default-bucket', + }, + regions: ['us-west1'], + }); + }); + + it('should create a minimal trigger with bucket with opts and bucket', () => { + const result = storage.onOperation( + 'event-type', + { bucket: 'some-bucket' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: EVENT_TRIGGER, + }); + }); + + it('should create a complex trigger with appropriate values', () => { + const result = storage.onOperation( + 'event-type', + { + ...FULL_OPTIONS, + bucket: 'some-bucket', + }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + regions: ['us-west1'], + availableMemoryMb: 512, + timeout: '60s', + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpcConnector: 'aConnector', + vpcConnectorEgressSettings: 'ALL_TRAFFIC', + serviceAccountEmail: 'root@aProject.iam.gserviceaccount.com', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, + eventTrigger: EVENT_TRIGGER, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = storage.onOperation( + 'event-type', + { + bucket: 'some-bucket', + region: 'us-west1', + minInstances: 3, + }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + concurrency: 20, + minInstances: 3, + regions: ['us-west1'], + labels: {}, + eventTrigger: EVENT_TRIGGER, + }); + }); + }); + + describe('onObjectArchived', () => { + const ARCHIVED_TRIGGER = { + ...EVENT_TRIGGER, + eventType: storage.archivedEvent, + }; + let configStub: sinon.SinonStub; + + beforeEach(() => { + configStub = sinon.stub(config, 'firebaseConfig'); + }); + + afterEach(() => { + configStub.restore(); + }); + + it('should accept only handler', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectArchived(() => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ARCHIVED_TRIGGER, + resource: 'default-bucket', + }, + }); + }); + + it('should accept bucket and handler', () => { + const result = storage.onObjectArchived('my-bucket', () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ARCHIVED_TRIGGER, + resource: 'my-bucket', + }, + }); + }); + + it('should accept opts and handler', () => { + const result = storage.onObjectArchived( + { bucket: 'my-bucket', region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ARCHIVED_TRIGGER, + resource: 'my-bucket', + }, + regions: ['us-west1'], + }); + }); + + it('should accept opts and handler, default bucket', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectArchived({ region: 'us-west1' }, () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ARCHIVED_TRIGGER, + resource: 'default-bucket', + }, + regions: ['us-west1'], + }); + }); + }); + + describe('onObjectFinalized', () => { + const FINALIZED_TRIGGER = { + ...EVENT_TRIGGER, + eventType: storage.finalizedEvent, + }; + let configStub: sinon.SinonStub; + + beforeEach(() => { + configStub = sinon.stub(config, 'firebaseConfig'); + }); + + afterEach(() => { + configStub.restore(); + }); + + it('should accept only handler', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectFinalized(() => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...FINALIZED_TRIGGER, + resource: 'default-bucket', + }, + }); + }); + + it('should accept bucket and handler', () => { + const result = storage.onObjectFinalized('my-bucket', () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...FINALIZED_TRIGGER, + resource: 'my-bucket', + }, + }); + }); + + it('should accept opts and handler', () => { + const result = storage.onObjectFinalized( + { bucket: 'my-bucket', region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...FINALIZED_TRIGGER, + resource: 'my-bucket', + }, + regions: ['us-west1'], + }); + }); + + it('should accept opts and handler, default bucket', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectFinalized( + { region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...FINALIZED_TRIGGER, + resource: 'default-bucket', + }, + regions: ['us-west1'], + }); + }); + }); + + describe('onObjectDeleted', () => { + const DELETED_TRIGGER = { + ...EVENT_TRIGGER, + eventType: storage.deletedEvent, + }; + let configStub: sinon.SinonStub; + + beforeEach(() => { + configStub = sinon.stub(config, 'firebaseConfig'); + }); + + afterEach(() => { + configStub.restore(); + }); + + it('should accept only handler', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectDeleted(() => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...DELETED_TRIGGER, + resource: 'default-bucket', + }, + }); + + configStub.restore(); + }); + + it('should accept bucket and handler', () => { + const result = storage.onObjectDeleted('my-bucket', () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...DELETED_TRIGGER, + resource: 'my-bucket', + }, + }); + }); + + it('should accept opts and handler', () => { + const result = storage.onObjectDeleted( + { bucket: 'my-bucket', region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...DELETED_TRIGGER, + resource: 'my-bucket', + }, + regions: ['us-west1'], + }); + }); + + it('should accept opts and handler, default bucket', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectDeleted({ region: 'us-west1' }, () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...DELETED_TRIGGER, + resource: 'default-bucket', + }, + regions: ['us-west1'], + }); + }); + }); + + describe('onObjectMetadataUpdated', () => { + const METADATA_TRIGGER = { + ...EVENT_TRIGGER, + eventType: storage.metadataUpdatedEvent, + }; + let configStub: sinon.SinonStub; + + beforeEach(() => { + configStub = sinon.stub(config, 'firebaseConfig'); + }); + + afterEach(() => { + configStub.restore(); + }); + + it('should accept only handler', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectMetadataUpdated(() => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...METADATA_TRIGGER, + resource: 'default-bucket', + }, + }); + + configStub.restore(); + }); + + it('should accept bucket and handler', () => { + const result = storage.onObjectMetadataUpdated('my-bucket', () => 42); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...METADATA_TRIGGER, + resource: 'my-bucket', + }, + }); + }); + + it('should accept opts and handler', () => { + const result = storage.onObjectMetadataUpdated( + { bucket: 'my-bucket', region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...METADATA_TRIGGER, + resource: 'my-bucket', + }, + regions: ['us-west1'], + }); + }); + + it('should accept opts and handler, default bucket', () => { + configStub.returns({ storageBucket: 'default-bucket' }); + + const result = storage.onObjectMetadataUpdated( + { region: 'us-west1' }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...METADATA_TRIGGER, + resource: 'default-bucket', + }, + regions: ['us-west1'], + }); + }); + }); +}); diff --git a/src/v2/index.ts b/src/v2/index.ts index 679df995a..5c99a4678 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -24,8 +24,9 @@ import * as logger from '../logger'; import * as params from './params'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; +import * as storage from './providers/storage'; -export { https, pubsub, logger, params }; +export { https, pubsub, storage, logger, params }; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts new file mode 100644 index 000000000..4240ae9a9 --- /dev/null +++ b/src/v2/providers/storage.ts @@ -0,0 +1,373 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + +import { firebaseConfig } from '../../config'; +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; + +/** + * An object within Google Cloud Storage. + * Ref: https://github.com/googleapis/google-cloudevents-nodejs/blob/main/cloud/storage/v1/StorageObjectData.ts + */ +export interface StorageObjectData { + /** + * The name of the bucket containing this object. + */ + bucket?: string; + /** + * Cache-Control directive for the object data, matching + * [https://tools.ietf.org/html/rfc7234#section-5.2"][RFC 7234 §5.2]. + */ + cacheControl?: string; + /** + * Number of underlying components that make up this object. Components are + * accumulated by compose operations. + * Attempting to set this field will result in an error. + */ + componentCount?: number; + /** + * Content-Disposition of the object data, matching + * [https://tools.ietf.org/html/rfc6266][RFC 6266]. + */ + contentDisposition?: string; + /** + * Content-Encoding of the object data, matching + * [https://tools.ietf.org/html/rfc7231#section-3.1.2.2][RFC 7231 §3.1.2.2] + */ + contentEncoding?: string; + /** + * Content-Language of the object data, matching + * [https://tools.ietf.org/html/rfc7231#section-3.1.3.2][RFC 7231 §3.1.3.2]. + */ + contentLanguage?: string; + /** + * Content-Type of the object data, matching + * [https://tools.ietf.org/html/rfc7231#section-3.1.1.5][RFC 7231 §3.1.1.5]. + * If an object is stored without a Content-Type, it is served as + * `application/octet-stream`. + */ + contentType?: string; + /** + * CRC32c checksum. For more information about using the CRC32c + * checksum, see + * [https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI][Hashes and + * ETags: Best Practices]. + */ + crc32c?: string; + /** + * Metadata of customer-supplied encryption key, if the object is encrypted by + * such a key. + */ + customerEncryption?: CustomerEncryption; + /** + * HTTP 1.1 Entity tag for the object. See + * [https://tools.ietf.org/html/rfc7232#section-2.3][RFC 7232 §2.3]. + */ + etag?: string; + /** + * The content generation of this object. Used for object versioning. + * Attempting to set this field will result in an error. + */ + generation?: number; + /** + * The ID of the object, including the bucket name, object name, and + * generation number. + */ + id?: string; + /** + * The kind of item this is. For objects, this is always "storage#object". + */ + kind?: string; + /** + * MD5 hash of the data; encoded using base64 as per + * [https://tools.ietf.org/html/rfc4648#section-4][RFC 4648 §4]. For more + * information about using the MD5 hash, see + * [https://cloud.google.com/storage/docs/hashes-etags#_JSONAPI][Hashes and + * ETags: Best Practices]. + */ + md5Hash?: string; + /** + * Media download link. + */ + mediaLink?: string; + /** + * User-provided metadata, in key/value pairs. + */ + metadata?: { [key: string]: string }; + /** + * The version of the metadata for this object at this generation. Used for + * preconditions and for detecting changes in metadata. A metageneration + * number is only meaningful in the context of a particular generation of a + * particular object. + */ + metageneration?: number; + /** + * The name of the object. + */ + name?: string; + /** + * The link to this object. + */ + selfLink?: string; + /** + * Content-Length of the object data in bytes, matching + * [https://tools.ietf.org/html/rfc7230#section-3.3.2][RFC 7230 §3.3.2]. + */ + size?: number; + /** + * Storage class of the object. + */ + storageClass?: string; + /** + * The creation time of the object. + * Attempting to set this field will result in an error. + */ + timeCreated?: Date | string; + /** + * The deletion time of the object. Will be returned if and only if this + * version of the object has been deleted. + */ + timeDeleted?: Date | string; + /** + * The time at which the object's storage class was last changed. + */ + timeStorageClassUpdated?: Date | string; + /** + * The modification time of the object metadata. + */ + updated?: Date | string; +} + +/** + * Metadata of customer-supplied encryption key, if the object is encrypted by + * such a key. + */ +export interface CustomerEncryption { + /** + * The encryption algorithm. + */ + encryptionAlgorithm?: string; + /** + * SHA256 hash value of the encryption key. + */ + keySha256?: string; +} + +/** @internal */ +export const archivedEvent = 'google.cloud.storage.object.v1.archived'; +/** @internal */ +export const finalizedEvent = 'google.cloud.storage.object.v1.finalized'; +/** @internal */ +export const deletedEvent = 'google.cloud.storage.object.v1.deleted'; +/** @internal */ +export const metadataUpdatedEvent = + 'google.cloud.storage.object.v1.metadataUpdated'; + +/** StorageOptions extend EventHandlerOptions with a bucket name */ +export interface StorageOptions extends options.EventHandlerOptions { + bucket?: string; +} + +/** Handle a storage object archived */ +export function onObjectArchived( + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectArchived( + bucket: string, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectArchived( + opts: StorageOptions, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectArchived( + buketOrOptsOrHandler: + | string + | StorageOptions + | ((event: CloudEvent) => any | Promise), + handler?: (event: CloudEvent) => any | Promise +): CloudFunction { + return onOperation(archivedEvent, buketOrOptsOrHandler, handler); +} + +/** Handle a storage object finalized */ +export function onObjectFinalized( + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectFinalized( + bucket: string, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectFinalized( + opts: StorageOptions, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectFinalized( + buketOrOptsOrHandler: + | string + | StorageOptions + | ((event: CloudEvent) => any | Promise), + handler?: (event: CloudEvent) => any | Promise +): CloudFunction { + return onOperation(finalizedEvent, buketOrOptsOrHandler, handler); +} + +/** Handle a storage object deleted */ +export function onObjectDeleted( + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectDeleted( + bucket: string, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectDeleted( + opts: StorageOptions, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectDeleted( + buketOrOptsOrHandler: + | string + | StorageOptions + | ((event: CloudEvent) => any | Promise), + handler?: (event: CloudEvent) => any | Promise +): CloudFunction { + return onOperation(deletedEvent, buketOrOptsOrHandler, handler); +} + +/** Handle a storage object metadata updated */ +export function onObjectMetadataUpdated( + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectMetadataUpdated( + bucket: string, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectMetadataUpdated( + opts: StorageOptions, + handler: (event: CloudEvent) => any | Promise +): CloudFunction; + +export function onObjectMetadataUpdated( + buketOrOptsOrHandler: + | string + | StorageOptions + | ((event: CloudEvent) => any | Promise), + handler?: (event: CloudEvent) => any | Promise +): CloudFunction { + return onOperation(metadataUpdatedEvent, buketOrOptsOrHandler, handler); +} + +/** @internal */ +export function onOperation( + eventType: string, + bucketOrOptsOrHandler: + | string + | StorageOptions + | ((event: CloudEvent) => any | Promise), + handler: (event: CloudEvent) => any | Promise +): CloudFunction { + if (typeof bucketOrOptsOrHandler === 'function') { + handler = bucketOrOptsOrHandler as ( + event: CloudEvent + ) => any | Promise; + bucketOrOptsOrHandler = {}; + } + + const [opts, bucket] = getOptsAndBucket( + bucketOrOptsOrHandler as string | StorageOptions + ); + + const func = (raw: CloudEvent) => { + return handler(raw as CloudEvent); + }; + + func.run = handler; + + // TypeScript doesn't recongize defineProperty as adding a property and complains + // that __trigger doesn't exist. We can either cast to any and lose all type safety + // or we can just assign a meaningless value before calling defineProperty. + func.__trigger = 'silence the transpiler'; + + Object.defineProperty(func, '__trigger', { + get: () => { + const baseOpts = options.optionsToTriggerAnnotations( + options.getGlobalOptions() + ); + const specificOpts = options.optionsToTriggerAnnotations(opts); + + return { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType: eventType, + resource: bucket, // TODO(colerogers): replace with 'bucket,' eventually + }, + }; + }, + }); + + return func; +} + +/** @internal */ +export function getOptsAndBucket( + bucketOrOpts: string | StorageOptions +): [options.EventHandlerOptions, string] { + let bucket: string; + let opts: options.EventHandlerOptions; + if (typeof bucketOrOpts === 'string') { + bucket = bucketOrOpts; + opts = {}; + } else { + bucket = bucketOrOpts.bucket || firebaseConfig().storageBucket; + opts = { ...bucketOrOpts }; + delete (opts as any).bucket; + } + + if (!bucket) { + throw new Error( + 'Missing bucket name. If you are unit testing, please provide a bucket name' + + ' by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG.' + ); + } + if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) { + throw new Error(`Invalid bucket name ${bucket}`); + } + + return [opts, bucket]; +} diff --git a/v2/storage.js b/v2/storage.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/storage.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 63bd14d08c1f1f5640e2124ab3a54e93c5a6dea2 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 14 Oct 2021 15:21:55 -0700 Subject: [PATCH 366/705] Add an option to disable rejection of requests with invalid App Check token for callable functions. (#989) Since releasing App Check integration for Callable Functions, we've received several requests from our users to make it possible turn App Check enforcement off. By default, if a request includes an App Check token, callable functions will verify the token, and - if the token is invalid - reject the request. This makes it hard for developers to onboard to App Check, especially for developers that want to "soft launch" App Check integration to measure the App Check enforcement would have on its users. The change here adds a `runWith` option to allow requests with invalid App check token to continue to user code execution, e.g. ```js exports.yourCallableFunction = functions. .runWith({ allowInvalidAppCheckToken: true // Opt-out: Invalid App Check token cont. to user code. }). .https.onCall( (data, context) => { // Requests with an invalid App Check token are not rejected. // // context.app will be undefined if the request: // 1) Does not include an App Check token // 2) Includes an invalid App Check token if (context.app == undefined) { // Users can manually inspect raw request header to check whether an App Check // token was provided in the request. const rawToken = context.rawRequest.header['X-Firebase-AppCheck']; if (rawToken == undefined) { throw new functions.https.HttpsError( 'failed-precondition', 'The function must be called from an App Check verified app.' ); } else { throw new functions.https.HttpsError( 'unauthenticated', 'Provided App Check token failed to validate.' ); } }, } ); ``` --- CHANGELOG.md | 1 + spec/common/providers/https.spec.ts | 31 ++++++++++++++++++++++++++++- src/common/providers/https.ts | 18 +++++++++++++---- src/function-configuration.ts | 5 +++++ src/providers/https.ts | 8 +++++++- src/v2/providers/https.ts | 5 ++++- 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 881256402..eae642ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - GCS Enhancement +- Add option to allow callable functions to ignore invalid App Check tokens. diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index b8cc9546b..78d4c0705 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -40,6 +40,8 @@ interface CallTest { callableFunction2: (request: https.CallableRequest) => any; + callableOption?: https.CallableOptions; + // The expected shape of the http response returned to the callable SDK. expectedHttpResponse: RunHandlerResult; } @@ -104,7 +106,10 @@ function runHandler( // Runs a CallTest test. async function runTest(test: CallTest): Promise { - const opts = { origin: true, methods: 'POST' }; + const opts = { + cors: { origin: true, methods: 'POST' }, + ...test.callableOption, + }; const callableFunctionV1 = https.onCallHandler(opts, (data, context) => { expect(data).to.deep.equal(test.expectedData); return test.callableFunction(data, context); @@ -470,6 +475,30 @@ describe('onCallHandler', () => { }); }); + it('should handle bad AppCheck token with callable option', async () => { + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + appCheckToken: 'FAKE', + }), + expectedData: null, + callableFunction: (data, context) => { + return; + }, + callableFunction2: (request) => { + return; + }, + callableOption: { + cors: { origin: true, methods: 'POST' }, + allowInvalidAppCheckToken: true, + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + it('should handle instance id', async () => { await runTest({ httpRequest: mockRequest(null, 'application/json', { diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 67c63613f..9599be76c 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -592,16 +592,22 @@ async function checkTokens( type v1Handler = (data: any, context: CallableContext) => any | Promise; type v2Handler = (request: CallableRequest) => Res; +/** @hidden **/ +export interface CallableOptions { + cors: cors.CorsOptions; + allowInvalidAppCheckToken?: boolean; +} + /** @hidden */ export function onCallHandler( - options: cors.CorsOptions, + options: CallableOptions, handler: v1Handler | v2Handler ): (req: Request, res: express.Response) => Promise { - const wrapped = wrapOnCallHandler(handler); + const wrapped = wrapOnCallHandler(options, handler); return (req: Request, res: express.Response) => { return new Promise((resolve) => { res.on('finish', resolve); - cors(options)(req, res, () => { + cors(options.cors)(req, res, () => { resolve(wrapped(req, res)); }); }); @@ -610,6 +616,7 @@ export function onCallHandler( /** @internal */ function wrapOnCallHandler( + options: CallableOptions, handler: v1Handler | v2Handler ): (req: Request, res: express.Response) => Promise { return async (req: Request, res: express.Response): Promise => { @@ -621,7 +628,10 @@ function wrapOnCallHandler( const context: CallableContext = { rawRequest: req }; const tokenStatus = await checkTokens(req, context); - if (tokenStatus.app === 'INVALID' || tokenStatus.auth === 'INVALID') { + if (tokenStatus.auth === 'INVALID') { + throw new HttpsError('unauthenticated', 'Unauthenticated'); + } + if (tokenStatus.app === 'INVALID' && !options.allowInvalidAppCheckToken) { throw new HttpsError('unauthenticated', 'Unauthenticated'); } diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 9ec182a60..5aa6177fd 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -160,6 +160,11 @@ export interface RuntimeOptions { * Invoker to set access control on https functions. */ invoker?: 'public' | 'private' | string | string[]; + + /* + * Allow requests with invalid App Check tokens on callable functions. + */ + allowInvalidAppCheckToken?: boolean; } export interface DeploymentOptions extends RuntimeOptions { diff --git a/src/providers/https.ts b/src/providers/https.ts index 074a7fbff..8a48f41fe 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -90,7 +90,13 @@ export function _onCallWithOptions( // in another handler to avoid accidentally triggering the v2 API const fixedLen = (data: any, context: CallableContext) => handler(data, context); - const func: any = onCallHandler({ origin: true, methods: 'POST' }, fixedLen); + const func: any = onCallHandler( + { + allowInvalidAppCheckToken: options.allowInvalidAppCheckToken, + cors: { origin: true, methods: 'POST' }, + }, + fixedLen + ); func.__trigger = { labels: {}, diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 54f1a1b36..9e4c466e4 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -157,7 +157,10 @@ export function onCall>( // onCallHandler sniffs the function length to determine which API to present. // fix the length to prevent api versions from being mismatched. const fixedLen = (req: CallableRequest) => handler(req); - const func: any = onCallHandler({ origin, methods: 'POST' }, fixedLen); + const func: any = onCallHandler( + { cors: { origin, methods: 'POST' } }, + fixedLen + ); Object.defineProperty(func, '__trigger', { get: () => { From ede96e66c56580bbca0a2efdcc8512d58712ca8f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 18 Oct 2021 15:38:59 -0700 Subject: [PATCH 367/705] Add debug mode (#992) Debug mode is intended to be used by the Functions Emulator to enable/disable certain aspect of the Functions SDK. Debug mode allows the Functions SDK to operate in development friendly way without the need to monkey-patch the Functions SDK. For example, auth or App Check token verification can be disabled during development to make Functions SDK compatible with the Auth Emulator. This feature is intended for internal use-cases and won't expose any public interfaces. No one outside the Firebase team should use it, and if they do, we can't promise any stability or feature support. --- src/common/debug.ts | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/common/debug.ts diff --git a/src/common/debug.ts b/src/common/debug.ts new file mode 100644 index 000000000..c3cbd86e1 --- /dev/null +++ b/src/common/debug.ts @@ -0,0 +1,52 @@ +// 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. + +// Do NOT turn on a debug feature in production. +const debugMode = process.env.FIREBASE_DEBUG_MODE === 'true'; + +interface DebugFeatures { + skipCallableTokenVerification?: boolean; +} + +function loadDebugFeatures(): DebugFeatures { + if (!debugMode) return {}; + try { + const obj = JSON.parse(process.env.FIREBASE_DEBUG_FEATURES); + if (typeof obj !== 'object') { + return {}; + } + return obj as DebugFeatures; + } catch (e) { + return {}; + } +} + +/* @internal */ +export function debugFeatureValue(feat: keyof DebugFeatures): unknown { + if (!debugMode) return; + return loadDebugFeatures()[feat]; +} + +/* @internal */ +export function isDebugFeatureEnabled(feat: keyof DebugFeatures): boolean { + return debugMode && !!debugFeatureValue(feat); +} From 11e045ab698651ee295fd09e0e79fb9786308ec9 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 19 Oct 2021 08:58:41 -0700 Subject: [PATCH 368/705] Fix docgen script (#990) --- docgen/content-sources/v1/toc.yaml | 126 +++++++++++++++-------------- docgen/generate-docs.js | 7 +- docgen/theme/layouts/default.hbs | 4 +- package-lock.json | 43 +++++----- package.json | 2 +- 5 files changed, 94 insertions(+), 88 deletions(-) diff --git a/docgen/content-sources/v1/toc.yaml b/docgen/content-sources/v1/toc.yaml index ac430151b..c4091f15d 100644 --- a/docgen/content-sources/v1/toc.yaml +++ b/docgen/content-sources/v1/toc.yaml @@ -1,148 +1,154 @@ toc: - title: 'functions' - path: /docs/reference/functions/v1_cloud_functions_.html + path: /docs/reference/functions/cloud_functions.html section: - title: 'CloudFunction' - path: /docs/reference/functions/v1_cloud_functions_.html#cloudfunction + path: /docs/reference/functions/cloud_functions.html#cloudfunction - title: 'HttpsFunction' - path: /docs/reference/functions/v1_cloud_functions_.html#httpsfunction + path: /docs/reference/functions/cloud_functions.html#httpsfunction - title: 'EventContext' - path: /docs/reference/functions/v1_cloud_functions_.eventcontext.html + path: /docs/reference/functions/cloud_functions.eventcontext.html - title: 'FunctionBuilder' - path: /docs/reference/functions/v1_function_builder_.functionbuilder.html + path: /docs/reference/functions/function_builder.functionbuilder.html - title: 'Change' - path: /docs/reference/functions/v1_cloud_functions_.change.html + path: /docs/reference/functions/cloud_functions.change.html - title: 'ChangeJson' - path: /docs/reference/functions/v1_cloud_functions_.changejson.html + path: /docs/reference/functions/cloud_functions.changejson.html - title: 'functions.config' - path: /docs/reference/functions/v1_config_.html + path: /docs/reference/functions/config.html section: - title: 'Config' - path: /docs/reference/functions/v1_config_.config.html + path: /docs/reference/functions/config.config-1.html - title: 'config.Config' - path: /docs/reference/functions/v1_config_.config.config.html + path: /docs/reference/functions/config.config-1.config.html - title: 'functions.function-configuration' - path: /docs/reference/functions/v1_function_configuration_.html + path: /docs/reference/functions/function_configuration.html section: - title: 'config.DeploymentOptions' - path: /docs/reference/functions/v1_function_configuration_.deploymentoptions.html + path: /docs/reference/functions/function_configuration.deploymentoptions.html - title: 'config.FailurePolicy' - path: /docs/reference/functions/v1_function_configuration_.failurepolicy.html + path: /docs/reference/functions/function_configuration.failurepolicy.html - title: 'config.RuntimeOptions' - path: /docs/reference/functions/v1_function_configuration_.runtimeoptions.html + path: /docs/reference/functions/function_configuration.runtimeoptions.html - title: 'config.Schedule' - path: /docs/reference/functions/v1_function_configuration_.schedule.html + path: /docs/reference/functions/function_configuration.schedule.html - title: 'config.ScheduleRetryConfig' - path: /docs/reference/functions/v1_function_configuration_.scheduleretryconfig.html + path: /docs/reference/functions/function_configuration.scheduleretryconfig.html - title: 'functions.analytics' - path: /docs/reference/functions/v1_providers_analytics_.html + path: /docs/reference/functions/providers_analytics.html section: - title: 'AnalyticsEvent' - path: /docs/reference/functions/v1_providers_analytics_.analyticsevent.html + path: /docs/reference/functions/providers_analytics.analyticsevent.html - title: 'AnalyticsEventBuilder' - path: /docs/reference/functions/v1_providers_analytics_.analyticseventbuilder.html + path: /docs/reference/functions/providers_analytics.analyticseventbuilder.html - title: 'AppInfo' - path: /docs/reference/functions/v1_providers_analytics_.appinfo.html + path: /docs/reference/functions/providers_analytics.appinfo.html - title: 'DeviceInfo' - path: /docs/reference/functions/v1_providers_analytics_.deviceinfo.html + path: /docs/reference/functions/providers_analytics.deviceinfo.html - title: 'ExportBundleInfo' - path: /docs/reference/functions/v1_providers_analytics_.exportbundleinfo.html + path: /docs/reference/functions/providers_analytics.exportbundleinfo.html - title: 'GeoInfo' - path: /docs/reference/functions/v1_providers_analytics_.geoinfo.html + path: /docs/reference/functions/providers_analytics.geoinfo.html - title: 'UserDimensions' - path: /docs/reference/functions/v1_providers_analytics_.userdimensions.html + path: /docs/reference/functions/providers_analytics.userdimensions.html - title: 'UserPropertyValue' - path: /docs/reference/functions/v1_providers_analytics_.userpropertyvalue.html + path: /docs/reference/functions/providers_analytics.userpropertyvalue.html - title: 'functions.auth' - path: /docs/reference/functions/v1_providers_auth_.html + path: /docs/reference/functions/providers_auth.html section: - title: 'UserBuilder' - path: /docs/reference/functions/v1_providers_auth_.userbuilder.html + path: /docs/reference/functions/providers_auth.userbuilder.html - title: 'UserInfo' - path: /docs/reference/functions/v1_providers_auth_.html#userinfo + path: /docs/reference/functions/providers_auth.html#userinfo - title: 'UserRecordMetadata' - path: /docs/reference/functions/v1_providers_auth_.userrecordmetadata.html + path: /docs/reference/functions/providers_auth.userrecordmetadata.html - title: 'UserRecord' - path: /docs/reference/functions/v1_providers_auth_.html#userrecord + path: /docs/reference/functions/providers_auth.html#userrecord - title: 'functions.firestore' - path: /docs/reference/functions/v1_providers_firestore_.html + path: /docs/reference/functions/providers_firestore.html section: - title: 'DocumentBuilder' - path: /docs/reference/functions/v1_providers_firestore_.documentbuilder.html + path: /docs/reference/functions/providers_firestore.documentbuilder.html - title: 'DocumentSnapshot' - path: /docs/reference/functions/v1_providers_firestore_.html#documentsnapshot + path: /docs/reference/functions/providers_firestore.html#documentsnapshot - title: 'functions.database' - path: /docs/reference/functions/v1_providers_database_.html + path: /docs/reference/functions/providers_database.html section: - title: 'DataSnapshot' - path: /docs/reference/functions/v1_providers_database_.datasnapshot.html + path: /docs/reference/functions/providers_database.datasnapshot.html - title: 'RefBuilder' - path: /docs/reference/functions/v1_providers_database_.refbuilder.html + path: /docs/reference/functions/providers_database.refbuilder.html - title: 'InstanceBuilder' - path: /docs/reference/functions/v1_providers_database_.instancebuilder.html + path: /docs/reference/functions/providers_database.instancebuilder.html - title: 'functions.https' - path: /docs/reference/functions/v1_providers_https_.html + path: /docs/reference/functions/providers_https.html section: - title: 'HttpsError' - path: /docs/reference/functions/v1_providers_https_.httpserror.html + path: /docs/reference/functions/common_providers_https.httpserror.html + - title: 'CallableRequest' + path: /docs/reference/functions/common_providers_https.callablerequest.html - title: 'CallableContext' - path: /docs/reference/functions/v1_providers_https_.callablecontext.html + path: /docs/reference/functions/common_providers_https.callablecontext.html + - title: 'AuthData' + path: /docs/reference/functions/common_providers_https.authdata.html + - title: 'AppCheckData' + path: /docs/reference/functions/common_providers_https.appcheckdata.html - title: 'functions.logger' - path: /docs/reference/functions/logger_index_.html + path: /docs/reference/functions/logger.html section: - title: 'LogEntry' - path: /docs/reference/functions/logger_index_.logentry.html + path: /docs/reference/functions/logger.logentry.html - title: 'functions.pubsub' - path: /docs/reference/functions/v1_providers_pubsub_.html + path: /docs/reference/functions/providers_pubsub.html section: - title: 'Message' - path: /docs/reference/functions/v1_providers_pubsub_.message.html + path: /docs/reference/functions/providers_pubsub.message.html - title: 'TopicBuilder' - path: /docs/reference/functions/v1_providers_pubsub_.topicbuilder.html + path: /docs/reference/functions/providers_pubsub.topicbuilder.html - title: 'ScheduleBuilder' - path: /docs/reference/functions/v1_providers_pubsub_.schedulebuilder.html + path: /docs/reference/functions/providers_pubsub.schedulebuilder.html - title: 'functions.remoteconfig' - path: /docs/reference/functions/v1_providers_remoteconfig_.html + path: /docs/reference/functions/providers_remoteconfig.html section: - title: 'RemoteConfigUser' - path: /docs/reference/functions/v1_providers_remoteconfig_.remoteconfiguser.html + path: /docs/reference/functions/providers_remoteconfig.remoteconfiguser.html - title: 'TemplateVersion' - path: /docs/reference/functions/v1_providers_remoteconfig_.templateversion.html + path: /docs/reference/functions/providers_remoteconfig.templateversion.html - title: 'functions.storage' - path: /docs/reference/functions/v1_providers_storage_.html + path: /docs/reference/functions/providers_storage.html section: - title: 'BucketBuilder' - path: /docs/reference/functions/v1_providers_storage_.bucketbuilder.html + path: /docs/reference/functions/providers_storage.bucketbuilder.html - title: 'ObjectBuilder' - path: /docs/reference/functions/v1_providers_storage_.objectbuilder.html + path: /docs/reference/functions/providers_storage.objectbuilder.html - title: 'ObjectMetadata' - path: /docs/reference/functions/v1_providers_storage_.objectmetadata.html + path: /docs/reference/functions/providers_storage.objectmetadata.html - title: 'functions.testLab' - path: /docs/reference/functions/v1_providers_testlab_.html + path: /docs/reference/functions/providers_testlab.html section: - title: 'testLab.clientInfo' - path: /docs/reference/functions/v1_providers_testlab_.clientinfo.html + path: /docs/reference/functions/providers_testlab.clientinfo.html - title: 'testLab.resultStorage' - path: /docs/reference/functions/v1_providers_testlab_.resultstorage.html + path: /docs/reference/functions/providers_testlab.resultstorage.html - title: 'testLab.testMatrix' - path: /docs/reference/functions/v1_providers_testlab_.testmatrix.html + path: /docs/reference/functions/providers_testlab.testmatrix.html - title: 'testLab.testMatrixBuilder' - path: /docs/reference/functions/v1_providers_testlab_.testmatrixbuilder.html + path: /docs/reference/functions/providers_testlab.testmatrixbuilder.html - title: 'functions.handler' - path: /docs/reference/functions/v1_handler_builder_.html + path: /docs/reference/functions/handler_builder.html section: - title: 'HandlerBuilder' - path: /docs/reference/functions/v1_handler_builder_.handlerbuilder.html + path: /docs/reference/functions/handler_builder.handlerbuilder.html diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js index ab7b128a7..bf07f3881 100644 --- a/docgen/generate-docs.js +++ b/docgen/generate-docs.js @@ -33,15 +33,17 @@ const { api: apiVersion } = yargs .version(false) .help().argv; -let sourceFile, devsitePath; +let sourceFile, devsitePath, exclude; switch (apiVersion) { case 'v1': - sourceFile = `${repoPath}/src/{v1,logger}`; + sourceFile = `${repoPath}/src`; devsitePath = '/docs/reference/functions/'; + exclude = ['"**/v2/**/*.ts"', '"src/index.ts"']; break; case 'v2': sourceFile = `${repoPath}/src/{v2,logger}`; devsitePath = '/docs/functions/alpha/'; + exclude = []; break; default: throw new Error( @@ -75,6 +77,7 @@ function stripPath(path) { function runTypedoc() { const command = `${repoPath}/node_modules/.bin/typedoc ${sourceFile} \ --out ${docPath} \ + ${exclude.map(ex => "--exclude " + ex).join(" ")} \ --readme ${tempHomePath} \ --options ${__dirname}/typedoc.js \ --theme ${__dirname}/theme`; diff --git a/docgen/theme/layouts/default.hbs b/docgen/theme/layouts/default.hbs index 5e749dd87..17106e8d8 100644 --- a/docgen/theme/layouts/default.hbs +++ b/docgen/theme/layouts/default.hbs @@ -5,8 +5,8 @@ - - + + {{#ifCond model.name '==' project.name}}{{project.name}}{{else}}{{model.name}} | {{project.name}}{{/ifCond}} diff --git a/package-lock.json b/package-lock.json index b46f581ef..e32576e6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -537,7 +537,6 @@ "version": "2.8.5", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", - "dev": true, "requires": { "@types/express": "*" } @@ -645,7 +644,7 @@ "@types/range-parser": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha1-fuMwunyq+5gJC+zoal7kQRWQTCw=" + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" }, "@types/serve-static": { "version": "1.13.5", @@ -2410,14 +2409,11 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } + "jsonc-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", + "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "dev": true }, "jsonwebtoken": { "version": "8.5.1", @@ -3726,12 +3722,12 @@ "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "shiki": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.6.tgz", - "integrity": "sha512-h2y5Uq9QEWsEmi97n+BOdPOVxkOUdVunl+jVIzU9EqJ6/QbIX+U6F7TsrWZQ2xqwPgvvQaC9r7/zeegi1b48dQ==", + "version": "0.9.12", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.12.tgz", + "integrity": "sha512-VXcROdldv0/Qu0w2XvzU4IrvTeBNs/Kj/FCmtcEXGz7Tic/veQzliJj6tEiAgoKianhQstpYmbPDStHU5Opqcw==", "dev": true, "requires": { - "json5": "^2.2.0", + "jsonc-parser": "^3.0.0", "onigasm": "^2.2.5", "vscode-textmate": "5.2.0" } @@ -4158,13 +4154,14 @@ } }, "typedoc": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.5.tgz", - "integrity": "sha512-uRDRmYheE5Iju9Zz0X50pTASTpBorIHFt02F5Y8Dt4eBt55h3mwk1CBSY2+EfwBxY16N4Xm7f8KXhnfFZ0AmBw==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", + "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", "dev": true, "requires": { "glob": "^7.1.7", "handlebars": "^4.7.7", + "lodash": "^4.17.21", "lunr": "^2.3.9", "marked": "^2.1.1", "minimatch": "^3.0.0", @@ -4174,9 +4171,9 @@ }, "dependencies": { "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -4202,9 +4199,9 @@ "dev": true }, "uglify-js": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz", - "integrity": "sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz", + "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index e1755efa1..708831ccc 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "^0.21.5", + "typedoc": "0.21.2", "typescript": "^4.3.5", "yargs": "^15.3.1" }, From 43e68afbef70adee15c1cc9d2835f6b82f2987a6 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 25 Oct 2021 16:38:26 -0700 Subject: [PATCH 369/705] Allow firebase-admin v10. Add integration tests for Node 16 (#998) * Allow firebase-admin v10. Add integration tests for Node 16 * Add changelog. Run formatter * rerun formatter --- CHANGELOG.md | 1 + integration_test/package.json.template | 2 +- integration_test/run_tests.sh | 10 +- package-lock.json | 5919 +++++++++++++++++++++++- package.json | 4 +- src/common/debug.ts | 8 +- src/v2/providers/storage.ts | 2 +- 7 files changed, 5875 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eae642ee0..8c1bb5b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - GCS Enhancement - Add option to allow callable functions to ignore invalid App Check tokens. +- Add firebase-admin v10 as an allowed peer dependency diff --git a/integration_test/package.json.template b/integration_test/package.json.template index 5bcd8761b..a5259aeb6 100644 --- a/integration_test/package.json.template +++ b/integration_test/package.json.template @@ -6,7 +6,7 @@ }, "dependencies": { "@google-cloud/pubsub": "^2.10.0", - "firebase-admin": "^9.1.0", + "firebase-admin": "__FIREBASE_ADMIN__", "firebase-functions": "__SDK_TARBALL__", "lodash": "~4.17.2" }, diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 100e24a32..498a9b0a0 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -68,6 +68,7 @@ function create_package_json { # backup file called package.json-e that we should clean up afterwards. sed -i -e "s/__SDK_TARBALL__/firebase-functions-$1.tgz/g" functions/package.json sed -i -e "s/__NODE_VERSION__/$2/g" functions/package.json + sed -i -e "s/__FIREBASE_ADMIN__/$3/g" functions/package.json rm -f functions/package.json-e } @@ -138,8 +139,13 @@ build_sdk delete_all_functions set_region -for version in 10 12 14; do - create_package_json $TIMESTAMP $version +for version in 10 12 14 16; do + if [[ "$version" -eq 10 ]]; then + admin_sdk="^9.12.0" + else + admin_sdk="^10.0.0" + fi + create_package_json $TIMESTAMP $version $admin_sdk install_deps announce "Re-deploying the same functions to Node $version runtime ..." deploy diff --git a/package-lock.json b/package-lock.json index e32576e6b..c0b6fe545 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,5705 @@ { "name": "firebase-functions", "version": "3.15.7", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "version": "3.15.7", + "license": "MIT", + "dependencies": { + "@types/cors": "^2.8.5", + "@types/express": "4.17.3", + "cors": "^2.8.5", + "express": "^4.17.1", + "lodash": "^4.17.14" + }, + "devDependencies": { + "@types/chai": "^4.1.7", + "@types/chai-as-promised": "^7.1.0", + "@types/jsonwebtoken": "^8.3.2", + "@types/lodash": "^4.14.135", + "@types/mocha": "^5.2.7", + "@types/mock-require": "^2.0.0", + "@types/nock": "^10.0.3", + "@types/node": "^8.10.50", + "@types/sinon": "^7.0.13", + "chai": "^4.2.0", + "chai-as-promised": "^7.1.1", + "child-process-promise": "^2.2.1", + "firebase-admin": "10.0.0", + "js-yaml": "^3.13.1", + "jsdom": "^16.2.1", + "jsonwebtoken": "^8.5.1", + "jwk-to-pem": "^2.0.5", + "mocha": "^6.1.4", + "mock-require": "^3.0.3", + "mz": "^2.7.0", + "nock": "^10.0.6", + "prettier": "^1.18.2", + "sinon": "^7.3.2", + "ts-node": "^8.3.0", + "tslint": "^5.18.0", + "tslint-config-prettier": "^1.18.0", + "tslint-no-unused-expression-chai": "^0.1.4", + "tslint-plugin-prettier": "^2.0.1", + "typedoc": "0.21.2", + "typescript": "^4.3.5", + "yargs": "^15.3.1" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + }, + "peerDependencies": { + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "node_modules/@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "node_modules/@firebase/app": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.4.tgz", + "integrity": "sha512-XBrZb60m7N1XqmRhSJWADDD3J/0j9wM2VhxC5KUEtFA9SWfTn9Z3EWGtRGz7ahrMkgPJsmo0fXpvUh6cY8pQvQ==", + "dev": true, + "peer": true, + "dependencies": { + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.5.tgz", + "integrity": "sha512-GJURp5Nn8dEm72/y13Z+XMvWmMomsYViNxw6VKYqVH9f9VKnJ46Q8zYtx2ePvOuj7pAqsfwNkvAdAFYcveTe9g==", + "dev": true, + "peer": true, + "dependencies": { + "@firebase/app": "0.7.4", + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true, + "peer": true + }, + "node_modules/@firebase/app-types": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", + "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==", + "dev": true + }, + "node_modules/@firebase/app/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true, + "peer": true + }, + "node_modules/@firebase/auth-interop-types": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", + "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", + "dev": true, + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/component": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz", + "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==", + "dev": true, + "dependencies": { + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/component/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/@firebase/database": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.2.tgz", + "integrity": "sha512-Y1LZR1LIQM8YKMkeUPpAq3/e53hcfcXO+JEZ6vCzBeD6xRawqmpw6B5/DzePdCNNvjcqheXzSaR7T39eRZo/wA==", + "dev": true, + "dependencies": { + "@firebase/auth-interop-types": "0.1.6", + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/database-compat": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.2.tgz", + "integrity": "sha512-sV32QIRSNIBj/6OYtpmPzA/SfQz1/NBZbhxg9dIhGaSt9e5HaMxXRuz2lImudX0Sd/v8DKdExrxa++K6rKrRtA==", + "dev": true, + "dependencies": { + "@firebase/component": "0.5.7", + "@firebase/database": "0.12.2", + "@firebase/database-types": "0.9.1", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/database-compat/node_modules/@firebase/database-types": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz", + "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==", + "dev": true, + "dependencies": { + "@firebase/app-types": "0.7.0", + "@firebase/util": "1.4.0" + } + }, + "node_modules/@firebase/database-compat/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/@firebase/database-types": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz", + "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==", + "dev": true, + "dependencies": { + "@firebase/app-types": "0.6.3" + } + }, + "node_modules/@firebase/database-types/node_modules/@firebase/app-types": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz", + "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw==", + "dev": true + }, + "node_modules/@firebase/database/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/@firebase/logger": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz", + "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/logger/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/@firebase/util": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz", + "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/util/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + }, + "node_modules/@google-cloud/common": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", + "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", + "dev": true, + "optional": true, + "dependencies": { + "@google-cloud/projectify": "^2.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.1", + "duplexify": "^4.1.1", + "ent": "^2.2.0", + "extend": "^3.0.2", + "google-auth-library": "^7.0.2", + "retry-request": "^4.1.1", + "teeny-request": "^7.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/firestore": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", + "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", + "dev": true, + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "functional-red-black-tree": "^1.0.1", + "google-gax": "^2.9.2", + "protobufjs": "^6.8.6" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@google-cloud/paginator": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", + "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", + "dev": true, + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "extend": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/projectify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", + "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/promisify": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", + "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage": { + "version": "5.8.5", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", + "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", + "dev": true, + "optional": true, + "dependencies": { + "@google-cloud/common": "^3.6.0", + "@google-cloud/paginator": "^3.0.0", + "@google-cloud/promisify": "^2.0.0", + "arrify": "^2.0.0", + "async-retry": "^1.3.1", + "compressible": "^2.0.12", + "date-and-time": "^1.0.0", + "duplexify": "^4.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "gcs-resumable-upload": "^3.1.4", + "get-stream": "^6.0.0", + "hash-stream-validation": "^0.2.2", + "mime": "^2.2.0", + "mime-types": "^2.0.8", + "onetime": "^5.1.0", + "p-limit": "^3.0.1", + "pumpify": "^2.0.0", + "snakeize": "^0.1.0", + "stream-events": "^1.0.1", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage/node_modules/mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true, + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/@google-cloud/storage/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "optional": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@grpc/grpc-js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", + "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", + "dev": true, + "optional": true, + "dependencies": { + "@types/node": ">=12.12.47" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + } + }, + "node_modules/@grpc/grpc-js/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", + "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", + "dev": true, + "optional": true, + "dependencies": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^6.10.0", + "yargs": "^16.1.1" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@grpc/proto-loader/node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "optional": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/@grpc/proto-loader/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@grpc/proto-loader/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "optional": true + }, + "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "optional": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "optional": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@panva/asn1.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", + "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "dev": true, + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", + "dev": true, + "optional": true + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", + "dev": true, + "optional": true + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/formatio": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", + "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", + "dev": true + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/chai": { + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", + "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", + "dev": true + }, + "node_modules/@types/chai-as-promised": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", + "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, + "dependencies": { + "@types/chai": "*" + } + }, + "node_modules/@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "node_modules/@types/connect": { + "version": "3.4.33", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", + "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", + "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-jwt": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", + "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", + "dev": true, + "dependencies": { + "@types/express": "*", + "@types/express-unless": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", + "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "node_modules/@types/express-unless": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", + "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", + "dev": true, + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/jsonwebtoken": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", + "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/lodash": { + "version": "4.14.161", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", + "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "dev": true + }, + "node_modules/@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "dev": true, + "optional": true + }, + "node_modules/@types/mime": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", + "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" + }, + "node_modules/@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "node_modules/@types/mock-require": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", + "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/nock": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", + "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "8.10.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", + "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" + }, + "node_modules/@types/qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" + }, + "node_modules/@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" + }, + "node_modules/@types/serve-static": { + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", + "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, + "node_modules/@types/sinon": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", + "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "dev": true + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "optional": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dev": true, + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "node_modules/ansi-colors": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", + "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, + "node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", + "dev": true, + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/async-retry": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", + "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", + "dev": true, + "optional": true, + "dependencies": { + "retry": "0.12.0" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "optional": true + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bignumber.js": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", + "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", + "dev": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", + "dev": true + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", + "dev": true + }, + "node_modules/buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", + "dev": true + }, + "node_modules/builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "node_modules/chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "dependencies": { + "check-error": "^1.0.2" + } + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", + "dev": true, + "dependencies": { + "cross-spawn": "^4.0.2", + "node-version": "^1.0.0", + "promise-polyfill": "^6.0.1" + } + }, + "node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "dev": true + }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "optional": true, + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compressible/node_modules/mime-db": { + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", + "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/configstore": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", + "dev": true, + "optional": true, + "dependencies": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "dev": true, + "dependencies": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/date-and-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", + "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", + "dev": true, + "optional": true + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", + "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", + "dev": true + }, + "node_modules/deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "node_modules/define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", + "dev": true, + "dependencies": { + "object-keys": "^1.0.12" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/dicer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", + "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", + "dev": true, + "dependencies": { + "streamsearch": "0.1.2" + }, + "engines": { + "node": ">=4.5.0" + } + }, + "node_modules/diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dev": true, + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "optional": true, + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/duplexify": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", + "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", + "dev": true, + "optional": true, + "dependencies": { + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", + "stream-shift": "^1.0.0" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "node_modules/elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "optional": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true, + "optional": true + }, + "node_modules/es-abstract": { + "version": "1.17.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", + "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "dev": true, + "dependencies": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-regex": "^1.1.0", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", + "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", + "dev": true + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true, + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "node_modules/fast-text-encoding": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", + "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", + "dev": true, + "optional": true + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dev": true, + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/firebase-admin": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.0.0.tgz", + "integrity": "sha512-EOAk5ZaqXhBBvx9ZyXd28kw8glMTt3xl0g3BepGRCy0RSSUPGOzfAqjGhc65guSKgFOpT5mAUycYcJbqullKUQ==", + "dev": true, + "dependencies": { + "@firebase/database-compat": "^0.1.1", + "@firebase/database-types": "^0.7.2", + "@types/node": ">=12.12.47", + "dicer": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^2.0.2", + "node-forge": "^0.10.0" + }, + "engines": { + "node": ">=12.7.0" + }, + "optionalDependencies": { + "@google-cloud/firestore": "^4.5.0", + "@google-cloud/storage": "^5.3.0" + } + }, + "node_modules/firebase-admin/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true + }, + "node_modules/flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "dev": true, + "dependencies": { + "is-buffer": "~2.0.3" + }, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat/node_modules/is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true, + "optional": true + }, + "node_modules/gaxios": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", + "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", + "dev": true, + "optional": true, + "dependencies": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.3.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gcp-metadata": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", + "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", + "dev": true, + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gcs-resumable-upload": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", + "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", + "dev": true, + "optional": true, + "dependencies": { + "abort-controller": "^3.0.0", + "configstore": "^5.0.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "google-auth-library": "^7.0.0", + "pumpify": "^2.0.0", + "stream-events": "^1.0.4" + }, + "bin": { + "gcs-upload": "build/src/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/google-auth-library": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", + "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", + "dev": true, + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "fast-text-encoding": "^1.0.0", + "gaxios": "^4.0.0", + "gcp-metadata": "^4.2.0", + "gtoken": "^5.0.4", + "jws": "^4.0.0", + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "optional": true + }, + "node_modules/google-gax": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", + "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", + "dev": true, + "optional": true, + "dependencies": { + "@grpc/grpc-js": "~1.3.0", + "@grpc/proto-loader": "^0.6.1", + "@types/long": "^4.0.0", + "abort-controller": "^3.0.0", + "duplexify": "^4.0.0", + "fast-text-encoding": "^1.0.3", + "google-auth-library": "^7.0.2", + "is-stream-ended": "^0.1.4", + "node-fetch": "^2.6.1", + "object-hash": "^2.1.1", + "protobufjs": "^6.10.2", + "retry-request": "^4.0.0" + }, + "bin": { + "compileProtos": "build/tools/compileProtos.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-p12-pem": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", + "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", + "dev": true, + "optional": true, + "dependencies": { + "node-forge": "^0.10.0" + }, + "bin": { + "gp12-pem": "build/src/bin/gp12-pem.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true, + "optional": true + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/gtoken": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", + "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", + "dev": true, + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "google-p12-pem": "^3.0.3", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gtoken/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dev": true, + "optional": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/gtoken/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dev": true, + "optional": true, + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "dev": true, + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hash-stream-validation": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", + "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", + "dev": true, + "optional": true + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "dev": true + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/http-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-callable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", + "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-stream-ended": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", + "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", + "dev": true, + "optional": true + }, + "node_modules/is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "node_modules/jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, + "node_modules/jose": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", + "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", + "dev": true, + "dependencies": { + "@panva/asn1.js": "^1.0.0" + }, + "engines": { + "node": ">=10.13.0 < 13 || >=13.7.0" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/js-yaml/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "node_modules/jsdom": { + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "dev": true, + "dependencies": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsdom/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/jsdom/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jsdom/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "dev": true, + "optional": true, + "dependencies": { + "bignumber.js": "^9.0.0" + } + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "dev": true + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "node_modules/jsonc-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", + "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "dev": true + }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dev": true, + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/just-extend": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", + "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", + "dev": true + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "dev": true, + "dependencies": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwks-rsa": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", + "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", + "dev": true, + "dependencies": { + "@types/express-jwt": "0.0.42", + "debug": "^4.1.0", + "jose": "^2.0.5", + "limiter": "^1.1.5", + "lru-memoizer": "^2.1.2" + }, + "engines": { + "node": ">=10 < 13 || >=14" + } + }, + "node_modules/jwks-rsa/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/jwks-rsa/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/limiter": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", + "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", + "dev": true + }, + "node_modules/lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, + "node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true, + "optional": true + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", + "dev": true + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", + "dev": true + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", + "dev": true + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", + "dev": true + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", + "dev": true + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", + "dev": true + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, + "node_modules/log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "dependencies": { + "chalk": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/lolex": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", + "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", + "dev": true + }, + "node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", + "dev": true, + "optional": true + }, + "node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/lru-memoizer": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", + "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", + "dev": true, + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" + } + }, + "node_modules/lru-memoizer/node_modules/lru-cache": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", + "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" + } + }, + "node_modules/lunr": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", + "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", + "dev": true + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "optional": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "optional": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/marked": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", + "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", + "dev": true, + "bin": { + "marked": "bin/marked" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dependencies": { + "mime-db": "1.40.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp/node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mocha": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", + "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", + "dev": true, + "dependencies": { + "ansi-colors": "3.2.3", + "browser-stdout": "1.3.1", + "debug": "3.2.6", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "find-up": "3.0.0", + "glob": "7.1.3", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.13.1", + "log-symbols": "2.2.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.4", + "ms": "2.1.1", + "node-environment-flags": "1.0.5", + "object.assign": "4.1.0", + "strip-json-comments": "2.0.1", + "supports-color": "6.0.0", + "which": "1.3.1", + "wide-align": "1.1.3", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/mocha/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/mocha/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "node_modules/mocha/node_modules/mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "node_modules/mocha/node_modules/object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mocha/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", + "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/mocha/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/mock-require": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", + "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", + "dev": true, + "dependencies": { + "get-caller-file": "^1.0.2", + "normalize-path": "^2.1.1" + }, + "engines": { + "node": ">=4.3.0" + } + }, + "node_modules/mock-require/node_modules/get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node_modules/nise": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", + "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", + "dev": true, + "dependencies": { + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^5.0.1", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/nise/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "node_modules/nise/node_modules/lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/nise/node_modules/path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/nock": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", + "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", + "dev": true, + "dependencies": { + "chai": "^4.1.2", + "debug": "^4.1.0", + "deep-equal": "^1.0.0", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.5", + "mkdirp": "^0.5.0", + "propagate": "^1.0.0", + "qs": "^6.5.1", + "semver": "^5.5.0" + }, + "engines": { + "node": ">= 6.0" + } + }, + "node_modules/nock/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/nock/node_modules/deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "dependencies": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, + "node_modules/nock/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/node-environment-flags": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", + "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", + "dev": true, + "dependencies": { + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + } + }, + "node_modules/node-environment-flags/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true, + "optional": true, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "dev": true, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/node-version": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", + "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", + "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "node_modules/object-is": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", + "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign/node_modules/es-abstract": { + "version": "1.18.0-next.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", + "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "dev": true, + "dependencies": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.getownpropertydescriptors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "optional": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/onigasm": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", + "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", + "dev": true, + "dependencies": { + "lru-cache": "^5.1.1" + } + }, + "node_modules/onigasm/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/onigasm/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "dev": true + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "node_modules/pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", + "dev": true + }, + "node_modules/propagate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", + "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", + "dev": true, + "engines": [ + "node >= 0.8.1" + ] + }, + "node_modules/protobufjs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", + "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "dev": true, + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + } + }, + "node_modules/protobufjs/node_modules/@types/node": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", + "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "dev": true, + "optional": true + }, + "node_modules/proxy-addr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "dependencies": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "node_modules/psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "optional": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", + "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", + "dev": true, + "optional": true, + "dependencies": { + "duplexify": "^4.1.1", + "inherits": "^2.0.3", + "pump": "^3.0.0" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "dev": true, + "dependencies": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/request-promise-native/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true, + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "dev": true, + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/retry-request": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", + "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", + "dev": true, + "optional": true, + "dependencies": { + "debug": "^4.1.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/retry-request/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/retry-request/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "optional": true + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/shiki": { + "version": "0.9.12", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.12.tgz", + "integrity": "sha512-VXcROdldv0/Qu0w2XvzU4IrvTeBNs/Kj/FCmtcEXGz7Tic/veQzliJj6tEiAgoKianhQstpYmbPDStHU5Opqcw==", + "dev": true, + "dependencies": { + "jsonc-parser": "^3.0.0", + "onigasm": "^2.2.5", + "vscode-textmate": "5.2.0" + } + }, + "node_modules/signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true, + "optional": true + }, + "node_modules/sinon": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + } + }, + "node_modules/sinon/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/snakeize": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", + "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", + "dev": true, + "optional": true + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stream-events": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", + "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", + "dev": true, + "optional": true, + "dependencies": { + "stubs": "^3.0.0" + } + }, + "node_modules/stream-shift": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "dev": true, + "optional": true + }, + "node_modules/streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "optional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "optional": true + }, + "node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stubs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", + "dev": true, + "optional": true + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "node_modules/teeny-request": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", + "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", + "dev": true, + "optional": true, + "dependencies": { + "http-proxy-agent": "^4.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "stream-events": "^1.0.5", + "uuid": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", + "dev": true, + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "dependencies": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ts-node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", + "dev": true, + "dependencies": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, + "node_modules/tslint": { + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^4.0.1", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, + "bin": { + "tslint": "bin/tslint" + }, + "engines": { + "node": ">=4.8.0" + } + }, + "node_modules/tslint-config-prettier": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", + "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", + "dev": true, + "bin": { + "tslint-config-prettier-check": "bin/check.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/tslint-no-unused-expression-chai": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", + "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", + "dev": true, + "dependencies": { + "tsutils": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/tslint-plugin-prettier": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", + "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", + "dev": true, + "dependencies": { + "eslint-plugin-prettier": "^2.2.0", + "lines-and-columns": "^1.1.6", + "tslib": "^1.7.1" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/tslint/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslint/node_modules/resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "dependencies": { + "path-parse": "^1.0.6" + } + }, + "node_modules/tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "optional": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typedoc": { + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", + "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", + "dev": true, + "dependencies": { + "glob": "^7.1.7", + "handlebars": "^4.7.7", + "lodash": "^4.17.21", + "lunr": "^2.3.9", + "marked": "^2.1.1", + "minimatch": "^3.0.0", + "progress": "^2.0.3", + "shiki": "^0.9.3", + "typedoc-default-themes": "^0.12.10" + }, + "bin": { + "typedoc": "bin/typedoc" + }, + "engines": { + "node": ">= 12.20.0" + } + }, + "node_modules/typedoc-default-themes": { + "version": "0.12.10", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", + "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/typedoc/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uglify-js": { + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz", + "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==", + "dev": true, + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "dev": true, + "optional": true, + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true, + "optional": true + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "optional": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/vscode-textmate": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", + "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", + "dev": true + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dev": true, + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true, + "engines": { + "node": ">=10.4" + } + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dev": true, + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", + "dev": true, + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", + "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", + "dev": true, + "engines": { + "node": ">=8.3.0" + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/yargs-unparser": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", + "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", + "dev": true, + "dependencies": { + "flat": "^4.1.0", + "lodash": "^4.17.15", + "yargs": "^13.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/yargs-unparser/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "dependencies": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/yargs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/yargs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "optional": true, + "engines": { + "node": ">=10" + } + } + }, "dependencies": { "@babel/code-frame": { "version": "7.10.4", @@ -30,87 +5727,183 @@ "js-tokens": "^4.0.0" } }, + "@firebase/app": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.4.tgz", + "integrity": "sha512-XBrZb60m7N1XqmRhSJWADDD3J/0j9wM2VhxC5KUEtFA9SWfTn9Z3EWGtRGz7ahrMkgPJsmo0fXpvUh6cY8pQvQ==", + "dev": true, + "peer": true, + "requires": { + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true, + "peer": true + } + } + }, + "@firebase/app-compat": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.5.tgz", + "integrity": "sha512-GJURp5Nn8dEm72/y13Z+XMvWmMomsYViNxw6VKYqVH9f9VKnJ46Q8zYtx2ePvOuj7pAqsfwNkvAdAFYcveTe9g==", + "dev": true, + "peer": true, + "requires": { + "@firebase/app": "0.7.4", + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true, + "peer": true + } + } + }, "@firebase/app-types": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.2.tgz", - "integrity": "sha512-2VXvq/K+n8XMdM4L2xy5bYp2ZXMawJXluUIDzUBvMthVR+lhxK4pfFiqr1mmDbv9ydXvEAuFsD+6DpcZuJcSSw==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", + "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==", "dev": true }, "@firebase/auth-interop-types": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true + "dev": true, + "requires": {} }, "@firebase/component": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.0.tgz", - "integrity": "sha512-v18csWtXb0ri+3m7wuGLY/UDgcb89vuMlZGQ//+7jEPLIQeLbylvZhol1uzW9WzoOpxMxOS2W5qyVGX36wZvEA==", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz", + "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==", "dev": true, "requires": { - "@firebase/util": "1.1.0", + "@firebase/util": "1.4.0", "tslib": "^2.1.0" }, "dependencies": { "tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true } } }, "@firebase/database": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.0.tgz", - "integrity": "sha512-GsHvuES83Edtboij2h3txKg+yV/TD4b5Owc01SgXEQtvj1lulkHt4Ufmd9OZz1WreWQJMIqKpbVowIDHjlkZJQ==", + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.2.tgz", + "integrity": "sha512-Y1LZR1LIQM8YKMkeUPpAq3/e53hcfcXO+JEZ6vCzBeD6xRawqmpw6B5/DzePdCNNvjcqheXzSaR7T39eRZo/wA==", "dev": true, "requires": { "@firebase/auth-interop-types": "0.1.6", - "@firebase/component": "0.5.0", - "@firebase/database-types": "0.7.2", - "@firebase/logger": "0.2.6", - "@firebase/util": "1.1.0", - "faye-websocket": "0.11.3", + "@firebase/component": "0.5.7", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + } + } + }, + "@firebase/database-compat": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.2.tgz", + "integrity": "sha512-sV32QIRSNIBj/6OYtpmPzA/SfQz1/NBZbhxg9dIhGaSt9e5HaMxXRuz2lImudX0Sd/v8DKdExrxa++K6rKrRtA==", + "dev": true, + "requires": { + "@firebase/component": "0.5.7", + "@firebase/database": "0.12.2", + "@firebase/database-types": "0.9.1", + "@firebase/logger": "0.3.0", + "@firebase/util": "1.4.0", "tslib": "^2.1.0" }, "dependencies": { + "@firebase/database-types": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz", + "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==", + "dev": true, + "requires": { + "@firebase/app-types": "0.7.0", + "@firebase/util": "1.4.0" + } + }, "tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true } } }, "@firebase/database-types": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.2.tgz", - "integrity": "sha512-cdAd/dgwvC0r3oLEDUR+ULs1vBsEvy0b27nlzKhU6LQgm9fCDzgaH9nFGv8x+S9dly4B0egAXkONkVoWcOAisg==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz", + "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==", "dev": true, "requires": { - "@firebase/app-types": "0.6.2" + "@firebase/app-types": "0.6.3" + }, + "dependencies": { + "@firebase/app-types": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz", + "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw==", + "dev": true + } } }, "@firebase/logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz", - "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==", - "dev": true + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz", + "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true + } + } }, "@firebase/util": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.1.0.tgz", - "integrity": "sha512-lfuSASuPKNdfebuFR8rjFamMQUPH9iiZHcKS755Rkm/5gRT0qC7BMhCh3ZkHf7NVbplzIc/GhmX2jM+igDRCag==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz", + "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==", "dev": true, "requires": { "tslib": "^2.1.0" }, "dependencies": { "tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true } } @@ -1620,9 +7413,9 @@ "optional": true }, "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -1652,12 +7445,12 @@ } }, "firebase-admin": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.8.0.tgz", - "integrity": "sha512-v8B1qU8McZZT2hlLZ018TKz2FoKlfFkZq9mOIyzN7wJUOlAywqQX0JyqNpVGyPeU+B+77ojlvmkGTNXt2OFkgw==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.0.0.tgz", + "integrity": "sha512-EOAk5ZaqXhBBvx9ZyXd28kw8glMTt3xl0g3BepGRCy0RSSUPGOzfAqjGhc65guSKgFOpT5mAUycYcJbqullKUQ==", "dev": true, "requires": { - "@firebase/database": "^0.10.0", + "@firebase/database-compat": "^0.1.1", "@firebase/database-types": "^0.7.2", "@google-cloud/firestore": "^4.5.0", "@google-cloud/storage": "^5.3.0", @@ -3859,6 +9652,25 @@ "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", "dev": true }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "optional": true + } + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -3889,25 +9701,6 @@ "es-abstract": "^1.17.5" } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "optional": true - } - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", diff --git a/package.json b/package.json index 708831ccc..fd9747143 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", - "firebase-admin": "^9.8.0", + "firebase-admin": "10.0.0", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", "jsonwebtoken": "^8.5.1", @@ -173,7 +173,7 @@ "yargs": "^15.3.1" }, "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0" + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0" }, "engines": { "node": "^8.13.0 || >=10.10.0" diff --git a/src/common/debug.ts b/src/common/debug.ts index c3cbd86e1..33ce8e990 100644 --- a/src/common/debug.ts +++ b/src/common/debug.ts @@ -28,7 +28,9 @@ interface DebugFeatures { } function loadDebugFeatures(): DebugFeatures { - if (!debugMode) return {}; + if (!debugMode) { + return {}; + } try { const obj = JSON.parse(process.env.FIREBASE_DEBUG_FEATURES); if (typeof obj !== 'object') { @@ -42,7 +44,9 @@ function loadDebugFeatures(): DebugFeatures { /* @internal */ export function debugFeatureValue(feat: keyof DebugFeatures): unknown { - if (!debugMode) return; + if (!debugMode) { + return; + } return loadDebugFeatures()[feat]; } diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 4240ae9a9..e58405820 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -334,7 +334,7 @@ export function onOperation( ...specificOpts?.labels, }, eventTrigger: { - eventType: eventType, + eventType, resource: bucket, // TODO(colerogers): replace with 'bucket,' eventually }, }; From 87472f3142033cd564d95ade22dda4d93a7506d0 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 27 Oct 2021 23:10:39 -0700 Subject: [PATCH 370/705] Fix bug where onCall handler failed to encode returned value that contained a function (#1000) In https://github.com/firebase/firebase-functions/pull/915, we replaced use of `_.isObject(data)` with `typeof data === 'object'`. Turns out that `_.isObject` returns `true` for functions ([code](https://github.com/lodash/lodash/blob/2da024c3b4f9947a48517639de7560457cd4ec6c/isObject.js#L26)). We update the condition to match the previous behavior. Fixes https://github.com/firebase/firebase-functions/issues/964 --- CHANGELOG.md | 3 ++- spec/common/providers/https.spec.ts | 4 ++++ src/common/providers/https.ts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c1bb5b7f..eafb8cd39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ - GCS Enhancement -- Add option to allow callable functions to ignore invalid App Check tokens. +- Add option to allow callable functions to ignore invalid App Check tokens - Add firebase-admin v10 as an allowed peer dependency +- Fix bug where onCall handler failed to encode returned value with functions diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 78d4c0705..18f3fea50 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -665,4 +665,8 @@ describe('encoding/decoding', () => { baz: [1, 2, 1099511627776], }); }); + + it('encodes function as an empty object', () => { + expect(https.encode(() => 'foo')).to.deep.equal({}); + }); }); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 9599be76c..f35646a60 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -426,7 +426,7 @@ export function encode(data: any): any { if (Array.isArray(data)) { return data.map(encode); } - if (typeof data === 'object') { + if (typeof data === 'object' || typeof data === 'function') { // Sadly we don't have Object.fromEntries in Node 10, so we can't use a single // list comprehension const obj: Record = {}; From 9c2142b3faf1f198eb8cb23ebbea0b6f8a335236 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 27 Oct 2021 23:29:52 -0700 Subject: [PATCH 371/705] Allow callable functions to skip token verification in debug mode (#983) To replace monkey-patching of the Firebase Functions SDK in the Functions Emulator ([code](https://github.com/firebase/firebase-tools/blob/c2feb0836f6f64236e117f2906ef6083840e212b/src/emulator/functionsEmulatorRuntime.ts#L401-L496)), we provide native support for bypassing token verification for `onCall` handlers. Using the new debug mode introduced in https://github.com/firebase/firebase-functions/pull/992, Auth/App Check token included in the request will be decoded but no verified. --- spec/common/providers/https.spec.ts | 212 +++++++++++++++++++++++----- spec/fixtures/mockrequest.ts | 31 ++++ src/common/debug.ts | 2 +- src/common/providers/https.ts | 192 ++++++++++++++++--------- 4 files changed, 332 insertions(+), 105 deletions(-) diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 18f3fea50..0e957a255 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -1,18 +1,28 @@ import { expect } from 'chai'; import * as express from 'express'; import * as firebase from 'firebase-admin'; +import * as sinon from 'sinon'; import { apps as appsNamespace } from '../../../src/apps'; import * as https from '../../../src/common/providers/https'; +import * as debug from '../../../src/common/debug'; import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, generateAppCheckToken, generateIdToken, + generateUnsignedAppCheckToken, + generateUnsignedIdToken, mockFetchAppCheckPublicJwks, mockFetchPublicKeys, mockRequest, } from '../../fixtures/mockrequest'; +import { + CallableContext, + CallableRequest, + unsafeDecodeAppCheckToken, + unsafeDecodeIdToken, +} from '../../../src/common/providers/https'; /** * RunHandlerResult contains the data from an express.Response. @@ -133,6 +143,64 @@ async function runTest(test: CallTest): Promise { expect(responseV2.status).to.equal(test.expectedHttpResponse.status); } +function checkAuthContext( + context: CallableContext, + projectId: string, + userId: string +) { + expect(context.auth).to.not.be.undefined; + expect(context.auth).to.not.be.null; + expect(context.auth.uid).to.equal(userId); + expect(context.auth.token.uid).to.equal(userId); + expect(context.auth.token.sub).to.equal(userId); + expect(context.auth.token.aud).to.equal(projectId); + expect(context.instanceIdToken).to.be.undefined; +} + +function checkAppCheckContext( + context: CallableContext, + projectId: string, + appId: string +) { + expect(context.app).to.not.be.undefined; + expect(context.app).to.not.be.null; + expect(context.app.appId).to.equal(appId); + expect(context.app.token.app_id).to.be.equal(appId); + expect(context.app.token.sub).to.be.equal(appId); + expect(context.app.token.aud).to.be.deep.equal([`projects/${projectId}`]); + expect(context.auth).to.be.undefined; + expect(context.instanceIdToken).to.be.undefined; +} + +function checkAuthRequest( + request: CallableRequest, + projectId: string, + userId: string +) { + expect(request.auth).to.not.be.undefined; + expect(request.auth).to.not.be.null; + expect(request.auth.uid).to.equal(userId); + expect(request.auth.token.uid).to.equal(userId); + expect(request.auth.token.sub).to.equal(userId); + expect(request.auth.token.aud).to.equal(projectId); + expect(request.instanceIdToken).to.be.undefined; +} + +function checkAppCheckRequest( + request: CallableRequest, + projectId: string, + appId: string +) { + expect(request.app).to.not.be.undefined; + expect(request.app).to.not.be.null; + expect(request.app.appId).to.equal(appId); + expect(request.app.token.app_id).to.be.equal(appId); + expect(request.app.token.sub).to.be.equal(appId); + expect(request.app.token.aud).to.be.deep.equal([`projects/${projectId}`]); + expect(request.auth).to.be.undefined; + expect(request.instanceIdToken).to.be.undefined; +} + describe('onCallHandler', () => { let app: firebase.app.App; @@ -354,23 +422,11 @@ describe('onCallHandler', () => { }), expectedData: null, callableFunction: (data, context) => { - expect(context.auth).to.not.be.undefined; - expect(context.auth).to.not.be.null; - expect(context.auth.uid).to.equal(mocks.user_id); - expect(context.auth.token.uid).to.equal(mocks.user_id); - expect(context.auth.token.sub).to.equal(mocks.user_id); - expect(context.auth.token.aud).to.equal(projectId); - expect(context.instanceIdToken).to.be.undefined; + checkAuthContext(context, projectId, mocks.user_id); return null; }, callableFunction2: (request) => { - expect(request.auth).to.not.be.undefined; - expect(request.auth).to.not.be.null; - expect(request.auth.uid).to.equal(mocks.user_id); - expect(request.auth.token.uid).to.equal(mocks.user_id); - expect(request.auth.token.sub).to.equal(mocks.user_id); - expect(request.auth.token.aud).to.equal(projectId); - expect(request.instanceIdToken).to.be.undefined; + checkAuthRequest(request, projectId, mocks.user_id); return null; }, expectedHttpResponse: { @@ -383,9 +439,11 @@ describe('onCallHandler', () => { }); it('should reject bad auth', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); await runTest({ httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer FAKE', + authorization: 'Bearer ' + idToken, }), expectedData: null, callableFunction: (data, context) => { @@ -410,35 +468,17 @@ describe('onCallHandler', () => { it('should handle AppCheck token', async () => { const mock = mockFetchAppCheckPublicJwks(); const projectId = appsNamespace().admin.options.projectId; - const appId = '1:65211879909:web:3ae38ef1cdcb2e01fe5f0c'; + const appId = '123:web:abc'; const appCheckToken = generateAppCheckToken(projectId, appId); await runTest({ httpRequest: mockRequest(null, 'application/json', { appCheckToken }), expectedData: null, callableFunction: (data, context) => { - expect(context.app).to.not.be.undefined; - expect(context.app).to.not.be.null; - expect(context.app.appId).to.equal(appId); - expect(context.app.token.app_id).to.be.equal(appId); - expect(context.app.token.sub).to.be.equal(appId); - expect(context.app.token.aud).to.be.deep.equal([ - `projects/${projectId}`, - ]); - expect(context.auth).to.be.undefined; - expect(context.instanceIdToken).to.be.undefined; + checkAppCheckContext(context, projectId, appId); return null; }, callableFunction2: (request) => { - expect(request.app).to.not.be.undefined; - expect(request.app).to.not.be.null; - expect(request.app.appId).to.equal(appId); - expect(request.app.token.app_id).to.be.equal(appId); - expect(request.app.token.sub).to.be.equal(appId); - expect(request.app.token.aud).to.be.deep.equal([ - `projects/${projectId}`, - ]); - expect(request.auth).to.be.undefined; - expect(request.instanceIdToken).to.be.undefined; + checkAppCheckRequest(request, projectId, appId); return null; }, expectedHttpResponse: { @@ -451,10 +491,11 @@ describe('onCallHandler', () => { }); it('should reject bad AppCheck token', async () => { + const projectId = appsNamespace().admin.options.projectId; + const appId = '123:web:abc'; + const appCheckToken = generateUnsignedAppCheckToken(projectId, appId); await runTest({ - httpRequest: mockRequest(null, 'application/json', { - appCheckToken: 'FAKE', - }), + httpRequest: mockRequest(null, 'application/json', { appCheckToken }), expectedData: null, callableFunction: (data, context) => { return; @@ -545,6 +586,66 @@ describe('onCallHandler', () => { }, }); }); + + describe('skip token verification debug mode support', () => { + before(() => { + sinon + .stub(debug, 'isDebugFeatureEnabled') + .withArgs('skipTokenVerification') + .returns(true); + }); + + after(() => { + sinon.verifyAndRestore(); + }); + + it('should skip auth token verification', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); + await runTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + callableFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + return null; + }, + callableFunction2: (request) => { + checkAuthRequest(request, projectId, mocks.user_id); + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + + it('should skip app check token verification', async () => { + const projectId = appsNamespace().admin.options.projectId; + const appId = '123:web:abc'; + const appCheckToken = generateUnsignedAppCheckToken(projectId, appId); + await runTest({ + httpRequest: mockRequest(null, 'application/json', { appCheckToken }), + expectedData: null, + callableFunction: (data, context) => { + checkAppCheckContext(context, projectId, appId); + return null; + }, + callableFunction2: (request) => { + checkAppCheckRequest(request, projectId, appId); + return null; + }, + expectedHttpResponse: { + status: 200, + headers: expectedResponseHeaders, + body: { result: null }, + }, + }); + }); + }); }); describe('encoding/decoding', () => { @@ -670,3 +771,36 @@ describe('encoding/decoding', () => { expect(https.encode(() => 'foo')).to.deep.equal({}); }); }); + +describe('decode tokens', () => { + const projectId = 'myproject'; + const appId = '123:web:abc'; + + it('decodes valid Auth ID Token', () => { + const idToken = unsafeDecodeIdToken(generateIdToken(projectId)); + expect(idToken.uid).to.equal(mocks.user_id); + expect(idToken.sub).to.equal(mocks.user_id); + }); + + it('decodes invalid Auth ID Token', () => { + const idToken = unsafeDecodeIdToken(generateUnsignedIdToken(projectId)); + expect(idToken.uid).to.equal(mocks.user_id); + expect(idToken.sub).to.equal(mocks.user_id); + }); + + it('decodes valid App Check Token', () => { + const idToken = unsafeDecodeAppCheckToken( + generateAppCheckToken(projectId, appId) + ); + expect(idToken.app_id).to.equal(appId); + expect(idToken.sub).to.equal(appId); + }); + + it('decodes invalid App Check Token', () => { + const idToken = unsafeDecodeAppCheckToken( + generateUnsignedAppCheckToken(projectId, appId) + ); + expect(idToken.app_id).to.equal(appId); + expect(idToken.sub).to.equal(appId); + }); +}); diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index 68827610b..4a4a6df70 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -85,6 +85,20 @@ export function generateIdToken(projectId: string): string { return jwt.sign(claims, mockKey.private_key, options); } +/** + * Generates a mocked, unsigned Firebase ID token. + */ +export function generateUnsignedIdToken(projectId: string): string { + return [ + { alg: 'RS256', typ: 'JWT' }, + { aud: projectId, sub: mockKey.user_id }, + 'Invalid signature', + ] + .map((str) => JSON.stringify(str)) + .map((str) => Buffer.from(str).toString('base64')) + .join('.'); +} + /** * Mocks out the http request used by the firebase-admin SDK to get the jwks for * verifying an AppCheck token. @@ -121,3 +135,20 @@ export function generateAppCheckToken( }; return jwt.sign(claims, jwkToPem(mockJWK, { private: true }), options); } + +/** + * Generates a mocked, unsigned AppCheck token. + */ +export function generateUnsignedAppCheckToken( + projectId: string, + appId: string +): string { + return [ + { alg: 'RS256', typ: 'JWT' }, + { aud: [`projects/${projectId}`], sub: appId }, + 'Invalid signature', + ] + .map((component) => JSON.stringify(component)) + .map((str) => Buffer.from(str).toString('base64')) + .join('.'); +} diff --git a/src/common/debug.ts b/src/common/debug.ts index 33ce8e990..4e2fd2a8c 100644 --- a/src/common/debug.ts +++ b/src/common/debug.ts @@ -24,7 +24,7 @@ const debugMode = process.env.FIREBASE_DEBUG_MODE === 'true'; interface DebugFeatures { - skipCallableTokenVerification?: boolean; + skipTokenVerification?: boolean; } function loadDebugFeatures(): DebugFeatures { diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index f35646a60..fa64116cd 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -29,71 +29,75 @@ import * as logger from '../../logger'; // TODO(inlined): Decide whether we want to un-version apps or whether we want a // different strategy import { apps } from '../../apps'; +import { isDebugFeatureEnabled } from '../../common/debug'; + +const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/; /** @hidden */ export interface Request extends express.Request { rawBody: Buffer; } +// This is actually a firebase.appCheck.DecodedAppCheckToken, but +// that type may not be available in some supported SDK versions. +// Declare as an inline type, which DecodedAppCheckToken will be +// able to merge with. +// TODO: Replace with the real type once we bump the min-version of +// the admin SDK +interface DecodedAppCheckToken { + /** + * The issuer identifier for the issuer of the response. + * + * This value is a URL with the format + * `https://firebaseappcheck.googleapis.com/`, where `` is the + * same project number specified in the [`aud`](#aud) property. + */ + iss: string; + + /** + * The Firebase App ID corresponding to the app the token belonged to. + * + * As a convenience, this value is copied over to the [`app_id`](#app_id) property. + */ + sub: string; + + /** + * The audience for which this token is intended. + * + * This value is a JSON array of two strings, the first is the project number of your + * Firebase project, and the second is the project ID of the same project. + */ + aud: string[]; + + /** + * The App Check token's expiration time, in seconds since the Unix epoch. That is, the + * time at which this App Check token expires and should no longer be considered valid. + */ + exp: number; + + /** + * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the + * time at which this App Check token was issued and should start to be considered + * valid.; + */ + iat: number; + + /** + * The App ID corresponding to the App the App Check token belonged to. + * + * This value is not actually one of the JWT token claims. It is added as a + * convenience, and is set as the value of the [`sub`](#sub) property. + */ + app_id: string; + [key: string]: any; +} + /** * The interface for AppCheck tokens verified in Callable functions */ export interface AppCheckData { appId: string; - - // This is actually a firebase.appCheck.DecodedAppCheckToken, but - // that type may not be available in some supported SDK versions. - // Declare as an inline type, which DecodedAppCheckToken will be - // able to merge with. - // TODO: Replace with the real type once we bump the min-version of - // the admin SDK - token: { - /** - * The issuer identifier for the issuer of the response. - * - * This value is a URL with the format - * `https://firebaseappcheck.googleapis.com/`, where `` is the - * same project number specified in the [`aud`](#aud) property. - */ - iss: string; - - /** - * The Firebase App ID corresponding to the app the token belonged to. - * - * As a convenience, this value is copied over to the [`app_id`](#app_id) property. - */ - sub: string; - - /** - * The audience for which this token is intended. - * - * This value is a JSON array of two strings, the first is the project number of your - * Firebase project, and the second is the project ID of the same project. - */ - aud: string[]; - - /** - * The App Check token's expiration time, in seconds since the Unix epoch. That is, the - * time at which this App Check token expires and should no longer be considered valid. - */ - exp: number; - - /** - * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the - * time at which this App Check token was issued and should start to be considered - * valid. - */ - iat: number; - - /** - * The App ID corresponding to the App the App Check token belonged to. - * - * This value is not actually one of the JWT token claims. It is added as a - * convenience, and is set as the value of the [`sub`](#sub) property. - */ - app_id: string; - [key: string]: any; - }; + token: DecodedAppCheckToken; } /** @@ -500,6 +504,55 @@ interface CallableTokenStatus { auth: TokenStatus; } +function unsafeDecodeToken(token: string): unknown { + if (!JWT_REGEX.test(token)) { + return {}; + } + const components = token + .split('.') + .map((s) => Buffer.from(s, 'base64').toString()); + let payload = components[1]; + if (typeof payload === 'string') { + try { + const obj = JSON.parse(payload); + if (typeof obj === 'object') { + payload = obj; + } + } catch (e) {} + } + return payload; +} + +/** + * Decode, but not verify, a Auth ID token. + * + * Do not use in production. Token should always be verified using the Admin SDK. + * + * This is exposed only for testing. + */ +/** @internal */ +export function unsafeDecodeIdToken( + token: string +): firebase.auth.DecodedIdToken { + const decoded = unsafeDecodeToken(token) as firebase.auth.DecodedIdToken; + decoded.uid = decoded.sub; + return decoded; +} + +/** + * Decode, but not verify, an App Check token. + * + * Do not use in production. Token should always be verified using the Admin SDK. + * + * This is exposed only for testing. + */ +/** @internal */ +export function unsafeDecodeAppCheckToken(token: string): DecodedAppCheckToken { + const decoded = unsafeDecodeToken(token) as DecodedAppCheckToken; + decoded.app_id = decoded.sub; + return decoded; +} + /** * Check and verify tokens included in the requests. Once verified, tokens * are injected into the callable context. @@ -518,6 +571,8 @@ async function checkTokens( auth: 'MISSING', }; + const skipTokenVerify = isDebugFeatureEnabled('skipTokenVerification'); + const appCheck = req.header('X-Firebase-AppCheck'); if (appCheck) { verifications.app = 'INVALID'; @@ -527,13 +582,16 @@ async function checkTokens( 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' ); } - const appCheckToken = await apps() - .admin.appCheck() - .verifyToken(appCheck); - ctx.app = { - appId: appCheckToken.appId, - token: appCheckToken.token, - }; + let appCheckData; + if (skipTokenVerify) { + const decodedToken = unsafeDecodeAppCheckToken(appCheck); + appCheckData = { appId: decodedToken.app_id, token: decodedToken }; + } else { + appCheckData = await apps() + .admin.appCheck() + .verifyToken(appCheck); + } + ctx.app = appCheckData; verifications.app = 'VALID'; } catch (err) { logger.warn('Failed to validate AppCheck token.', err); @@ -547,10 +605,14 @@ async function checkTokens( if (match) { const idToken = match[1]; try { - const authToken = await apps() - .admin.auth() - .verifyIdToken(idToken); - + let authToken: firebase.auth.DecodedIdToken; + if (skipTokenVerify) { + authToken = unsafeDecodeIdToken(idToken); + } else { + authToken = await apps() + .admin.auth() + .verifyIdToken(idToken); + } verifications.auth = 'VALID'; ctx.auth = { uid: authToken.uid, From 24e4c20e0b9f321b5cec0403e86c79ab7d111a0b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 28 Oct 2021 20:27:48 +0000 Subject: [PATCH 372/705] 3.16.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0b6fe545..45768bc71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.15.7", + "version": "3.16.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.15.7", + "version": "3.16.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index fd9747143..50637bb74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.15.7", + "version": "3.16.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From a3f5351bd1aa710cea24a8759c3cb3c1ef2f1480 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 28 Oct 2021 20:27:50 +0000 Subject: [PATCH 373/705] [firebase-release] Removed change log and reset repo after 3.16.0 release --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eafb8cd39..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +0,0 @@ -- GCS Enhancement -- Add option to allow callable functions to ignore invalid App Check tokens -- Add firebase-admin v10 as an allowed peer dependency -- Fix bug where onCall handler failed to encode returned value with functions From 38f1946df4804002be9c585f386c5ae61fd45b10 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 11 Nov 2021 09:20:37 -0800 Subject: [PATCH 374/705] Add TQ support (#1002) * Add TQ support * Adjust visibility labels & add doc * PR feedback --- CHANGELOG.md | 1 + spec/common/providers/https.spec.ts | 326 ++++++++++++++++++++++------ spec/v1/providers/https.spec.ts | 107 +++++++++ spec/v2/providers/https.spec.ts | 136 ++++++++++++ src/common/encoding.ts | 6 + src/common/providers/https.ts | 245 +++++++++++++++------ src/function-builder.ts | 9 + src/handler-builder.ts | 16 ++ src/providers/https.ts | 94 +++++++- src/v2/providers/https.ts | 104 ++++++++- 10 files changed, 916 insertions(+), 128 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..f41e7f57d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Parallelizes network calls that occur when validating authorization for onCall handlers. diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 0e957a255..c0a1c7767 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -4,8 +4,16 @@ import * as firebase from 'firebase-admin'; import * as sinon from 'sinon'; import { apps as appsNamespace } from '../../../src/apps'; -import * as https from '../../../src/common/providers/https'; import * as debug from '../../../src/common/debug'; +import * as https from '../../../src/common/providers/https'; +import { + CallableContext, + CallableRequest, + TaskContext, + TaskRequest, + unsafeDecodeAppCheckToken, + unsafeDecodeIdToken, +} from '../../../src/common/providers/https'; import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, @@ -17,12 +25,6 @@ import { mockFetchPublicKeys, mockRequest, } from '../../fixtures/mockrequest'; -import { - CallableContext, - CallableRequest, - unsafeDecodeAppCheckToken, - unsafeDecodeIdToken, -} from '../../../src/common/providers/https'; /** * RunHandlerResult contains the data from an express.Response. @@ -115,7 +117,7 @@ function runHandler( } // Runs a CallTest test. -async function runTest(test: CallTest): Promise { +async function runCallableTest(test: CallTest): Promise { const opts = { cors: { origin: true, methods: 'POST' }, ...test.callableOption, @@ -143,8 +145,50 @@ async function runTest(test: CallTest): Promise { expect(responseV2.status).to.equal(test.expectedHttpResponse.status); } +/** Represents a test case for a Task Queue Function */ +interface TaskTest { + // An http request, mocking a subset of https.Request. + httpRequest: any; + + // The expected format of the request passed to the handler. + expectedData: any; + + taskFunction?: ( + data: any, + context: https.TaskContext + ) => void | Promise; + + taskFunction2?: (request: https.TaskRequest) => void | Promise; + + // The expected shape of the http response returned to the callable SDK. + expectedStatus: number; +} + +// Runs a TaskTest test. +async function runTaskTest(test: TaskTest): Promise { + const taskQueueFunctionV1 = https.onEnqueueHandler((data, context) => { + expect(data).to.deep.equal(test.expectedData); + if (test.taskFunction) { + test.taskFunction(data, context); + } + }); + + const responseV1 = await runHandler(taskQueueFunctionV1, test.httpRequest); + expect(responseV1.status).to.equal(test.expectedStatus); + + const taskQueueFunctionV2 = https.onEnqueueHandler((request) => { + expect(request.data).to.deep.equal(test.expectedData); + if (test.taskFunction2) { + test.taskFunction2(request); + } + }); + + const responseV2 = await runHandler(taskQueueFunctionV2, test.httpRequest); + expect(responseV2.status).to.equal(test.expectedStatus); +} + function checkAuthContext( - context: CallableContext, + context: CallableContext | CallableRequest | TaskContext | TaskRequest, projectId: string, userId: string ) { @@ -154,11 +198,15 @@ function checkAuthContext( expect(context.auth.token.uid).to.equal(userId); expect(context.auth.token.sub).to.equal(userId); expect(context.auth.token.aud).to.equal(projectId); - expect(context.instanceIdToken).to.be.undefined; + + // TaskContext & TaskRequest don't have instanceIdToken + if ({}.hasOwnProperty.call(context, 'instanceIdToken')) { + expect((context as CallableContext).instanceIdToken).to.be.undefined; + } } function checkAppCheckContext( - context: CallableContext, + context: CallableContext | CallableRequest, projectId: string, appId: string ) { @@ -172,35 +220,6 @@ function checkAppCheckContext( expect(context.instanceIdToken).to.be.undefined; } -function checkAuthRequest( - request: CallableRequest, - projectId: string, - userId: string -) { - expect(request.auth).to.not.be.undefined; - expect(request.auth).to.not.be.null; - expect(request.auth.uid).to.equal(userId); - expect(request.auth.token.uid).to.equal(userId); - expect(request.auth.token.sub).to.equal(userId); - expect(request.auth.token.aud).to.equal(projectId); - expect(request.instanceIdToken).to.be.undefined; -} - -function checkAppCheckRequest( - request: CallableRequest, - projectId: string, - appId: string -) { - expect(request.app).to.not.be.undefined; - expect(request.app).to.not.be.null; - expect(request.app.appId).to.equal(appId); - expect(request.app.token.app_id).to.be.equal(appId); - expect(request.app.token.sub).to.be.equal(appId); - expect(request.app.token.aud).to.be.deep.equal([`projects/${projectId}`]); - expect(request.auth).to.be.undefined; - expect(request.instanceIdToken).to.be.undefined; -} - describe('onCallHandler', () => { let app: firebase.app.App; @@ -231,7 +250,7 @@ describe('onCallHandler', () => { }); it('should handle success', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest({ foo: 'bar' }), expectedData: { foo: 'bar' }, callableFunction: (data, context) => ({ baz: 'qux' }), @@ -245,7 +264,7 @@ describe('onCallHandler', () => { }); it('should handle null data and return', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => null, @@ -259,7 +278,7 @@ describe('onCallHandler', () => { }); it('should handle void return', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => { @@ -279,7 +298,7 @@ describe('onCallHandler', () => { it('should reject bad method', () => { const req = mockRequest(null); req.method = 'GET'; - return runTest({ + return runCallableTest({ httpRequest: req, expectedData: null, callableFunction: (data, context) => { @@ -299,7 +318,7 @@ describe('onCallHandler', () => { }); it('should ignore charset', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null, 'application/json; charset=utf-8'), expectedData: null, callableFunction: (data, context) => { @@ -317,7 +336,7 @@ describe('onCallHandler', () => { }); it('should reject bad content type', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null, 'text/plain'), expectedData: null, callableFunction: (data, context) => { @@ -339,7 +358,7 @@ describe('onCallHandler', () => { it('should reject extra body fields', () => { const req = mockRequest(null); req.body.extra = 'bad'; - return runTest({ + return runCallableTest({ httpRequest: req, expectedData: null, callableFunction: (data, context) => { @@ -359,7 +378,7 @@ describe('onCallHandler', () => { }); it('should handle unhandled error', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => { @@ -377,7 +396,7 @@ describe('onCallHandler', () => { }); it('should handle unknown error status', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => { @@ -395,7 +414,7 @@ describe('onCallHandler', () => { }); it('should handle well-formed error', () => { - return runTest({ + return runCallableTest({ httpRequest: mockRequest(null), expectedData: null, callableFunction: (data, context) => { @@ -416,7 +435,7 @@ describe('onCallHandler', () => { const mock = mockFetchPublicKeys(); const projectId = appsNamespace().admin.options.projectId; const idToken = generateIdToken(projectId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { authorization: 'Bearer ' + idToken, }), @@ -426,7 +445,7 @@ describe('onCallHandler', () => { return null; }, callableFunction2: (request) => { - checkAuthRequest(request, projectId, mocks.user_id); + checkAuthContext(request, projectId, mocks.user_id); return null; }, expectedHttpResponse: { @@ -441,7 +460,7 @@ describe('onCallHandler', () => { it('should reject bad auth', async () => { const projectId = appsNamespace().admin.options.projectId; const idToken = generateUnsignedIdToken(projectId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { authorization: 'Bearer ' + idToken, }), @@ -470,7 +489,7 @@ describe('onCallHandler', () => { const projectId = appsNamespace().admin.options.projectId; const appId = '123:web:abc'; const appCheckToken = generateAppCheckToken(projectId, appId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { appCheckToken }), expectedData: null, callableFunction: (data, context) => { @@ -478,7 +497,7 @@ describe('onCallHandler', () => { return null; }, callableFunction2: (request) => { - checkAppCheckRequest(request, projectId, appId); + checkAppCheckContext(request, projectId, appId); return null; }, expectedHttpResponse: { @@ -494,7 +513,7 @@ describe('onCallHandler', () => { const projectId = appsNamespace().admin.options.projectId; const appId = '123:web:abc'; const appCheckToken = generateUnsignedAppCheckToken(projectId, appId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { appCheckToken }), expectedData: null, callableFunction: (data, context) => { @@ -517,7 +536,7 @@ describe('onCallHandler', () => { }); it('should handle bad AppCheck token with callable option', async () => { - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { appCheckToken: 'FAKE', }), @@ -541,7 +560,7 @@ describe('onCallHandler', () => { }); it('should handle instance id', async () => { - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { instanceIdToken: 'iid-token', }), @@ -566,7 +585,7 @@ describe('onCallHandler', () => { it('should expose raw request', async () => { const mockReq = mockRequest(null, 'application/json', {}); - await runTest({ + await runCallableTest({ httpRequest: mockReq, expectedData: null, callableFunction: (data, context) => { @@ -602,7 +621,7 @@ describe('onCallHandler', () => { it('should skip auth token verification', async () => { const projectId = appsNamespace().admin.options.projectId; const idToken = generateUnsignedIdToken(projectId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { authorization: 'Bearer ' + idToken, }), @@ -612,7 +631,7 @@ describe('onCallHandler', () => { return null; }, callableFunction2: (request) => { - checkAuthRequest(request, projectId, mocks.user_id); + checkAuthContext(request, projectId, mocks.user_id); return null; }, expectedHttpResponse: { @@ -627,7 +646,7 @@ describe('onCallHandler', () => { const projectId = appsNamespace().admin.options.projectId; const appId = '123:web:abc'; const appCheckToken = generateUnsignedAppCheckToken(projectId, appId); - await runTest({ + await runCallableTest({ httpRequest: mockRequest(null, 'application/json', { appCheckToken }), expectedData: null, callableFunction: (data, context) => { @@ -635,7 +654,7 @@ describe('onCallHandler', () => { return null; }, callableFunction2: (request) => { - checkAppCheckRequest(request, projectId, appId); + checkAppCheckContext(request, projectId, appId); return null; }, expectedHttpResponse: { @@ -648,6 +667,187 @@ describe('onCallHandler', () => { }); }); +describe('onEnqueueHandler', () => { + let app: firebase.app.App; + + before(() => { + const credential = { + getAccessToken: () => { + return Promise.resolve({ + expires_in: 1000, + access_token: 'fake', + }); + }, + getCertificate: () => { + return { + projectId: 'aProjectId', + }; + }, + }; + app = firebase.initializeApp({ + projectId: 'aProjectId', + credential, + }); + Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); + }); + + after(() => { + app.delete(); + delete appsNamespace.singleton; + }); + + it('should handle success', () => { + return runTaskTest({ + httpRequest: mockRequest({ foo: 'bar' }), + expectedData: { foo: 'bar' }, + expectedStatus: 204, + }); + }); + + it('should reject bad method', () => { + const req = mockRequest(null); + req.method = 'GET'; + return runTaskTest({ + httpRequest: req, + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should ignore charset', () => { + return runTaskTest({ + httpRequest: mockRequest(null, 'application/json; charset=utf-8'), + expectedData: null, + expectedStatus: 204, + }); + }); + + it('should reject bad content type', () => { + return runTaskTest({ + httpRequest: mockRequest(null, 'text/plain'), + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should reject extra body fields', () => { + const req = mockRequest(null); + req.body.extra = 'bad'; + return runTaskTest({ + httpRequest: req, + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should handle unhandled error', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new Error(`ceci n'est pas une error`); + }, + taskFunction2: (request) => { + throw new Error(`cece n'est pas une error`); + }, + expectedStatus: 500, + }); + }); + + it('should handle unknown error status', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, + taskFunction2: (request) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, + expectedStatus: 500, + }); + }); + + it('should handle well-formed error', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new https.HttpsError('not-found', 'i am error'); + }, + taskFunction2: (request) => { + throw new https.HttpsError('not-found', 'i am error'); + }, + expectedStatus: 404, + }); + }); + + it('should handle auth', async () => { + const mock = mockFetchPublicKeys(); + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + taskFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + return null; + }, + taskFunction2: (request) => { + checkAuthContext(request, projectId, mocks.user_id); + return null; + }, + expectedStatus: 204, + }); + mock.done(); + }); + + it('should reject bad auth', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + expectedStatus: 401, + }); + }); + + describe('skip token verification debug mode support', () => { + before(() => { + sinon + .stub(debug, 'isDebugFeatureEnabled') + .withArgs('skipTokenVerification') + .returns(true); + }); + + after(() => { + sinon.verifyAndRestore(); + }); + + it('should skip auth token verification', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + taskFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + }, + taskFunction2: (request) => { + checkAuthContext(request, projectId, mocks.user_id); + }, + expectedStatus: 204, + }); + }); + }); +}); + describe('encoding/decoding', () => { it('encodes null', () => { expect(https.encode(null)).to.be.null; diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 025c99a7a..e8c4785c6 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -135,6 +135,13 @@ describe('handler namespace', () => { expect(result.__trigger).to.deep.equal({}); }); }); + + describe('#onEnqueue', () => { + it('should return an empty trigger', () => { + const result = functions.handler.https.taskQueue.onEnqueue(() => null); + expect(result.__trigger).to.deep.equal({}); + }); + }); }); describe('#onCall', () => { @@ -201,6 +208,106 @@ describe('#onCall', () => { }); }); +describe('#onEnqueue', () => { + it('should return a Trigger with appropriate values', () => { + const result = https + .taskQueue({ + rateLimits: { + maxBurstSize: 20, + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: 'private', + }) + .onEnqueue(() => {}); + expect(result.__trigger).to.deep.equal({ + taskQueueTrigger: { + rateLimits: { + maxBurstSize: 20, + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: ['private'], + }, + }); + }); + + it('should allow both region and runtime options to be set', () => { + const fn = functions + .region('us-east1') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .https.taskQueue({ retryConfig: { maxAttempts: 5 } }) + .onEnqueue(() => null); + + expect(fn.__trigger).to.deep.equal({ + regions: ['us-east1'], + availableMemoryMb: 256, + timeout: '90s', + taskQueueTrigger: { + retryConfig: { + maxAttempts: 5, + }, + }, + }); + }); + + it('has a .run method', async () => { + const data = 'data'; + const context = { + auth: { + uid: 'abc', + token: 'token' as any, + }, + }; + let done = false; + const cf = https.taskQueue().onEnqueue((d, c) => { + expect(d).to.equal(data); + expect(c).to.deep.equal(context); + done = true; + }); + + await cf.run(data, context); + expect(done).to.be.true; + }); + + // Regression test for firebase-functions#947 + it('should lock to the v1 API even with function.length == 1', async () => { + let gotData: Record; + const func = https.taskQueue().onEnqueue((data) => { + gotData = data; + }); + + const req = new MockRequest( + { + data: { foo: 'bar' }, + }, + { + 'content-type': 'application/json', + } + ); + req.method = 'POST'; + + const response = await runHandler(func, req as any); + expect(response.status).to.equal(204); + expect(gotData).to.deep.equal({ foo: 'bar' }); + }); +}); + describe('callable CORS', () => { it('handles OPTIONS preflight', async () => { const func = https.onCall((data, context) => { diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index a28cb1c9c..d815d43e2 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -366,3 +366,139 @@ describe('onCall', () => { https.onCall((request: https.CallableRequest) => `Hello, ${request.data}`); }); }); + +describe('onTaskEnqueue', () => { + beforeEach(() => { + options.setGlobalOptions({}); + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a minimal trigger with appropriate values', () => { + const result = https.onTaskEnqueue(() => {}); + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + taskQueueTrigger: {}, + labels: {}, + }); + }); + + it('should create a complex trigger with appropriate values', () => { + const result = https.onTaskEnqueue( + { + ...FULL_OPTIONS, + retryConfig: { + maxAttempts: 4, + maxDoublings: 3, + minBackoffSeconds: 1, + maxBackoffSeconds: 2, + }, + rateLimits: { + maxBurstSize: 10, + maxConcurrentDispatches: 5, + maxDispatchesPerSecond: 10, + }, + invoker: 'private', + }, + () => {} + ); + expect(result.__trigger).to.deep.equal({ + ...FULL_TRIGGER, + taskQueueTrigger: { + retryConfig: { + maxAttempts: 4, + maxDoublings: 3, + minBackoffSeconds: 1, + maxBackoffSeconds: 2, + }, + rateLimits: { + maxBurstSize: 10, + maxConcurrentDispatches: 5, + maxDispatchesPerSecond: 10, + }, + invoker: ['private'], + }, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = https.onTaskEnqueue( + { + region: 'us-west1', + minInstances: 3, + }, + (request) => {} + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + taskQueueTrigger: {}, + concurrency: 20, + minInstances: 3, + regions: ['us-west1'], + labels: {}, + }); + }); + + it('has a .run method', async () => { + const request: any = { + data: 'data', + auth: { + uid: 'abc', + token: 'token', + }, + }; + const cf = https.onTaskEnqueue((r) => { + expect(r.data).to.deep.equal(request.data); + expect(r.auth).to.deep.equal(request.auth); + }); + + await cf.run(request); + }); + + it('should be an express handler', async () => { + const func = https.onTaskEnqueue((request) => {}); + + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; + + const resp = await runHandler(func, req as any); + expect(resp.status).to.equal(204); + }); + + // These tests pass if the code transpiles + it('allows desirable syntax', () => { + https.onTaskEnqueue((request: https.TaskRequest) => { + // There should be no lint warnings that data is not a string. + console.log(`hello, ${request.data}`); + }); + https.onTaskEnqueue((request: https.TaskRequest) => { + console.log(`hello, ${request.data}`); + }); + https.onTaskEnqueue((request: https.TaskRequest) => { + console.log(`hello, ${request.data}`); + }); + https.onTaskEnqueue((request: https.TaskRequest) => { + console.log(`Hello, ${request.data}`); + }); + }); +}); diff --git a/src/common/encoding.ts b/src/common/encoding.ts index 0cbc2d50f..8960b5ddc 100644 --- a/src/common/encoding.ts +++ b/src/common/encoding.ts @@ -21,6 +21,9 @@ export function copyIfPresent( src: Src, ...fields: Array ) { + if (!src) { + return; + } for (const field of fields) { if (!Object.prototype.hasOwnProperty.call(src, field)) { continue; @@ -38,6 +41,9 @@ export function convertIfPresent( return from; } ) { + if (!src) { + return; + } if (!Object.prototype.hasOwnProperty.call(src, srcField)) { return; } diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index fa64116cd..0340bbce4 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -169,6 +169,56 @@ export interface CallableRequest { rawRequest: Request; } +/** How a task should be retried in the event of a non-2xx return. */ +export interface TaskRetryConfig { + // If left unspecified, will default to 3 + maxAttempts?: number; + + // If left unspecified will default to 1hr + maxBackoffSeconds?: number; + + // If left unspecified will default to 16 + maxDoublings?: number; + + // If left unspecified will default to 100ms + minBackoffSeconds?: number; +} + +/** How congestion control should be applied to the function. */ +export interface TaskRateLimits { + // If left unspecified, will default to 100 + maxBurstSize?: number; + + // If left unspecified, wild default to 1000 + maxConcurrentDispatches?: number; + + // If left unspecified, will default to 500 + maxDispatchesPerSecond?: number; +} + +/** Metadata about a call to a Task Queue function. */ +export interface TaskContext { + /** + * The result of decoding and verifying an ODIC token. + */ + auth?: AuthData; +} + +/** + * The request used to call a Task Queue function. + */ +export interface TaskRequest { + /** + * The parameters used by a client when calling this function. + */ + data: T; + + /** + * The result of decoding and verifying an ODIC token. + */ + auth?: AuthData; +} + /** * The set of Firebase Functions status codes. The codes are the same at the * ones exposed by gRPC here: @@ -561,68 +611,24 @@ export function unsafeDecodeAppCheckToken(token: string): DecodedAppCheckToken { * @param {CallableContext} ctx - Context to be sent to callable function handler. * @return {CallableTokenStatus} Status of the token verifications. */ -/** @hidden */ +/** @internal */ async function checkTokens( req: Request, ctx: CallableContext ): Promise { const verifications: CallableTokenStatus = { - app: 'MISSING', - auth: 'MISSING', + app: 'INVALID', + auth: 'INVALID', }; - const skipTokenVerify = isDebugFeatureEnabled('skipTokenVerification'); - - const appCheck = req.header('X-Firebase-AppCheck'); - if (appCheck) { - verifications.app = 'INVALID'; - try { - if (!apps().admin.appCheck) { - throw new Error( - 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' - ); - } - let appCheckData; - if (skipTokenVerify) { - const decodedToken = unsafeDecodeAppCheckToken(appCheck); - appCheckData = { appId: decodedToken.app_id, token: decodedToken }; - } else { - appCheckData = await apps() - .admin.appCheck() - .verifyToken(appCheck); - } - ctx.app = appCheckData; - verifications.app = 'VALID'; - } catch (err) { - logger.warn('Failed to validate AppCheck token.', err); - } - } - - const authorization = req.header('Authorization'); - if (authorization) { - verifications.auth = 'INVALID'; - const match = authorization.match(/^Bearer (.*)$/); - if (match) { - const idToken = match[1]; - try { - let authToken: firebase.auth.DecodedIdToken; - if (skipTokenVerify) { - authToken = unsafeDecodeIdToken(idToken); - } else { - authToken = await apps() - .admin.auth() - .verifyIdToken(idToken); - } - verifications.auth = 'VALID'; - ctx.auth = { - uid: authToken.uid, - token: authToken, - }; - } catch (err) { - logger.warn('Failed to validate auth token.', err); - } - } - } + await Promise.all([ + Promise.resolve().then(async () => { + verifications.auth = await checkAuthToken(req, ctx); + }), + Promise.resolve().then(async () => { + verifications.app = await checkAppCheckToken(req, ctx); + }), + ]); const logPayload = { verifications, @@ -651,19 +657,89 @@ async function checkTokens( return verifications; } -type v1Handler = (data: any, context: CallableContext) => any | Promise; -type v2Handler = (request: CallableRequest) => Res; +/** @interanl */ +async function checkAuthToken( + req: Request, + ctx: CallableContext | TaskContext +): Promise { + const authorization = req.header('Authorization'); + if (!authorization) { + return 'MISSING'; + } + const match = authorization.match(/^Bearer (.*)$/); + if (match) { + const idToken = match[1]; + try { + let authToken: firebase.auth.DecodedIdToken; + if (isDebugFeatureEnabled('skipTokenVerification')) { + authToken = unsafeDecodeIdToken(idToken); + } else { + authToken = await apps() + .admin.auth() + .verifyIdToken(idToken); + } + ctx.auth = { + uid: authToken.uid, + token: authToken, + }; + return 'VALID'; + } catch (err) { + logger.warn('Failed to validate auth token.', err); + return 'INVALID'; + } + } +} + +/** @internal */ +async function checkAppCheckToken( + req: Request, + ctx: CallableContext +): Promise { + const appCheck = req.header('X-Firebase-AppCheck'); + if (!appCheck) { + return 'MISSING'; + } + try { + if (!apps().admin.appCheck) { + throw new Error( + 'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0' + ); + } + let appCheckData; + if (isDebugFeatureEnabled('skipTokenVerification')) { + const decodedToken = unsafeDecodeAppCheckToken(appCheck); + appCheckData = { appId: decodedToken.app_id, token: decodedToken }; + } else { + appCheckData = await apps() + .admin.appCheck() + .verifyToken(appCheck); + } + ctx.app = appCheckData; + return 'VALID'; + } catch (err) { + logger.warn('Failed to validate AppCheck token.', err); + return 'INVALID'; + } +} + +type v1CallableHandler = ( + data: any, + context: CallableContext +) => any | Promise; +type v2CallableHandler = (request: CallableRequest) => Res; +type v1TaskHandler = (data: any, context: TaskContext) => void | Promise; +type v2TaskHandler = (request: TaskRequest) => void | Promise; -/** @hidden **/ +/** @internal **/ export interface CallableOptions { cors: cors.CorsOptions; allowInvalidAppCheckToken?: boolean; } -/** @hidden */ +/** @internal */ export function onCallHandler( options: CallableOptions, - handler: v1Handler | v2Handler + handler: v1CallableHandler | v2CallableHandler ): (req: Request, res: express.Response) => Promise { const wrapped = wrapOnCallHandler(options, handler); return (req: Request, res: express.Response) => { @@ -679,7 +755,7 @@ export function onCallHandler( /** @internal */ function wrapOnCallHandler( options: CallableOptions, - handler: v1Handler | v2Handler + handler: v1CallableHandler | v2CallableHandler ): (req: Request, res: express.Response) => Promise { return async (req: Request, res: express.Response): Promise => { try { @@ -740,3 +816,50 @@ function wrapOnCallHandler( } }; } + +/** @internal */ +export function onEnqueueHandler( + handler: v1TaskHandler | v2TaskHandler +): (req: Request, res: express.Response) => Promise { + return async (req: Request, res: express.Response): Promise => { + try { + if (!isValidRequest(req)) { + logger.error('Invalid request, unable to process.'); + throw new HttpsError('invalid-argument', 'Bad Request'); + } + + const context: TaskContext = {}; + const status = await checkAuthToken(req, context); + // Note: this should never happen since task queue functions are guarded by IAM. + if (status === 'INVALID') { + throw new HttpsError('unauthenticated', 'Unauthenticated'); + } + + const data: Req = decode(req.body.data); + if (handler.length === 2) { + await handler(data, context); + } else { + const arg: TaskRequest = { + ...context, + data, + }; + // For some reason the type system isn't picking up that the handler + // is a one argument function. + await (handler as any)(arg); + } + + res.status(204).end(); + } catch (err) { + if (!(err instanceof HttpsError)) { + // This doesn't count as an 'explicit' error. + logger.error('Unhandled error', err); + err = new HttpsError('internal', 'INTERNAL'); + } + + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; + + res.status(status).send(body); + } + }; +} diff --git a/src/function-builder.ts b/src/function-builder.ts index ada3b724c..f8a6b19d2 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -355,6 +355,15 @@ export class FunctionBuilder { context: https.CallableContext ) => any | Promise ) => https._onCallWithOptions(handler, this.options), + + /** + * Declares a task queue function for clients to call using a Firebase Admin SDK. + * @param handler A method that takes a data and context and returns void or Promise. + */ + /** @hidden */ + taskQueue: (options?: https.TaskQueueOptions) => { + return new https.TaskQueueBuilder(options, this.options); + }, }; } diff --git a/src/handler-builder.ts b/src/handler-builder.ts index ad4cd1541..2f66d1572 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -82,6 +82,22 @@ export class HandlerBuilder { func.__trigger = {}; return func; }, + /** @hidden */ + get taskQueue() { + return { + onEnqueue( + handler: ( + data: any, + context: https.TaskContext + ) => void | Promise + ) { + const builder = new https.TaskQueueBuilder(); + const func = builder.onEnqueue(handler); + func.__trigger = {}; + return func; + }, + }; + }, }; } diff --git a/src/providers/https.ts b/src/providers/https.ts index 8a48f41fe..7039e37a0 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -23,17 +23,36 @@ import * as express from 'express'; import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; -import { convertIfPresent, convertInvoker } from '../common/encoding'; +import { + convertIfPresent, + convertInvoker, + copyIfPresent, +} from '../common/encoding'; import { CallableContext, FunctionsErrorCode, HttpsError, onCallHandler, + onEnqueueHandler, Request, + TaskContext, + TaskRateLimits, + TaskRetryConfig, } from '../common/providers/https'; import { DeploymentOptions } from '../function-configuration'; -export { Request, CallableContext, FunctionsErrorCode, HttpsError }; +export { + Request, + CallableContext, + FunctionsErrorCode, + HttpsError, + /** @hidden */ + TaskRetryConfig as TaskRetryPolicy, + /** @hidden */ + TaskRateLimits, + /** @hidden */ + TaskContext, +}; /** * Handle HTTP requests. @@ -56,6 +75,77 @@ export function onCall( return _onCallWithOptions(handler, {}); } +/** + * 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; + __trigger: unknown; + run(data: any, context: TaskContext): void | Promise; +} + +/** @hidden */ +export class TaskQueueBuilder { + /** @internal */ + constructor( + private readonly tqOpts?: TaskQueueOptions, + private readonly depOpts?: DeploymentOptions + ) {} + + onEnqueue( + handler: (data: any, context: TaskContext) => void | Promise + ): TaskQueueFunction { + // 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: any, context: TaskContext) => + handler(data, context); + const func: any = onEnqueueHandler(fixedLen); + + func.__trigger = { + ...optionsToTrigger(this.depOpts || {}), + taskQueueTrigger: {}, + }; + copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig'); + copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits'); + convertIfPresent( + func.__trigger.taskQueueTrigger, + this.tqOpts, + 'invoker', + 'invoker', + convertInvoker + ); + + func.run = handler; + + return func; + } +} + +/** + * 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 function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder { + return new TaskQueueBuilder(options); +} + /** @hidden */ export function _onRequestWithOptions( handler: (req: Request, resp: express.Response) => void | Promise, diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 9e4c466e4..6f6725e63 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -22,18 +22,34 @@ import * as cors from 'cors'; import * as express from 'express'; -import { convertIfPresent, convertInvoker } from '../../common/encoding'; +import { + convertIfPresent, + convertInvoker, + copyIfPresent, +} from '../../common/encoding'; import { CallableRequest, FunctionsErrorCode, HttpsError, onCallHandler, + onEnqueueHandler, Request, + TaskRateLimits, + TaskRequest, + TaskRetryConfig, } from '../../common/providers/https'; import * as options from '../options'; -export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; +export { + Request, + CallableRequest, + FunctionsErrorCode, + HttpsError, + TaskRateLimits, + TaskRequest, + TaskRetryConfig as TaskRetryPolicy, +}; export interface HttpsOptions extends Omit { region?: @@ -43,6 +59,18 @@ export interface HttpsOptions extends Omit { cors?: string | boolean | RegExp | Array; } +export interface TaskQueueOptions extends options.GlobalOptions { + 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[]; +} + export type HttpsFunction = (( req: Request, res: express.Response @@ -50,6 +78,9 @@ export type HttpsFunction = (( export interface CallableFunction extends HttpsFunction { run(data: CallableRequest): Return; } +export interface TaskQueueFunction extends HttpsFunction { + run(data: TaskRequest): void | Promise; +} export function onRequest( opts: HttpsOptions, @@ -194,3 +225,72 @@ export function onCall>( func.run = handler; return func; } + +/** Handle a request sent to a Cloud Tasks queue. */ +export function onTaskEnqueue( + handler: (request: TaskRequest) => void | Promise +): TaskQueueFunction; + +/** Handle a request sent to a Cloud Tasks queue. */ +export function onTaskEnqueue( + options: TaskQueueOptions, + handler: (request: TaskRequest) => void | Promise +): TaskQueueFunction; + +export function onTaskEnqueue( + optsOrHandler: + | TaskQueueOptions + | ((request: TaskRequest) => void | Promise), + handler?: (request: TaskRequest) => void | Promise +): TaskQueueFunction { + let opts: TaskQueueOptions; + if (arguments.length == 1) { + opts = {}; + handler = optsOrHandler as ( + request: TaskRequest + ) => void | Promise; + } else { + opts = optsOrHandler as TaskQueueOptions; + } + + // onEnqueueHandler sniffs the function length to determine which API to present. + // fix the length to prevent api versions from being mismatched. + const fixedLen = (req: TaskRequest) => handler(req); + const func: any = onEnqueueHandler(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 as options.GlobalOptions + ); + const taskQueueTrigger: Record = {}; + copyIfPresent(taskQueueTrigger, opts, 'retryConfig', 'rateLimits'); + convertIfPresent( + taskQueueTrigger, + opts, + 'invoker', + 'invoker', + convertInvoker + ); + return { + apiVersion: 2, + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + taskQueueTrigger, + }; + }, + }); + + func.run = handler; + return func; +} From c9bc7362aaea376e5209070551f52deb7ffe7ea4 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 15 Nov 2021 09:28:56 -0800 Subject: [PATCH 375/705] Rename enqueue to dispatch to match API proposal (#1004) * Rename enqueue to dispatch to match API proposal * Update src/common/providers/https.ts Co-authored-by: Daniel Lee * Update src/function-builder.ts Co-authored-by: Daniel Lee Co-authored-by: Daniel Lee --- spec/common/providers/https.spec.ts | 4 ++-- spec/v1/providers/https.spec.ts | 8 ++++---- spec/v2/providers/https.spec.ts | 18 +++++++++--------- src/common/providers/https.ts | 22 +++++++++++++++++----- src/function-builder.ts | 2 +- src/handler-builder.ts | 2 +- src/providers/https.ts | 6 +++--- src/v2/providers/https.ts | 10 +++++----- 8 files changed, 42 insertions(+), 30 deletions(-) diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index c0a1c7767..d9d8e63c4 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -166,7 +166,7 @@ interface TaskTest { // Runs a TaskTest test. async function runTaskTest(test: TaskTest): Promise { - const taskQueueFunctionV1 = https.onEnqueueHandler((data, context) => { + const taskQueueFunctionV1 = https.onDispatchHandler((data, context) => { expect(data).to.deep.equal(test.expectedData); if (test.taskFunction) { test.taskFunction(data, context); @@ -176,7 +176,7 @@ async function runTaskTest(test: TaskTest): Promise { const responseV1 = await runHandler(taskQueueFunctionV1, test.httpRequest); expect(responseV1.status).to.equal(test.expectedStatus); - const taskQueueFunctionV2 = https.onEnqueueHandler((request) => { + const taskQueueFunctionV2 = https.onDispatchHandler((request) => { expect(request.data).to.deep.equal(test.expectedData); if (test.taskFunction2) { test.taskFunction2(request); diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index e8c4785c6..2fbddcd26 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -225,7 +225,7 @@ describe('#onEnqueue', () => { }, invoker: 'private', }) - .onEnqueue(() => {}); + .onDispatch(() => {}); expect(result.__trigger).to.deep.equal({ taskQueueTrigger: { rateLimits: { @@ -252,7 +252,7 @@ describe('#onEnqueue', () => { memory: '256MB', }) .https.taskQueue({ retryConfig: { maxAttempts: 5 } }) - .onEnqueue(() => null); + .onDispatch(() => null); expect(fn.__trigger).to.deep.equal({ regions: ['us-east1'], @@ -275,7 +275,7 @@ describe('#onEnqueue', () => { }, }; let done = false; - const cf = https.taskQueue().onEnqueue((d, c) => { + const cf = https.taskQueue().onDispatch((d, c) => { expect(d).to.equal(data); expect(c).to.deep.equal(context); done = true; @@ -288,7 +288,7 @@ describe('#onEnqueue', () => { // Regression test for firebase-functions#947 it('should lock to the v1 API even with function.length == 1', async () => { let gotData: Record; - const func = https.taskQueue().onEnqueue((data) => { + const func = https.taskQueue().onDispatch((data) => { gotData = data; }); diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index d815d43e2..ef9efbc29 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -378,7 +378,7 @@ describe('onTaskEnqueue', () => { }); it('should return a minimal trigger with appropriate values', () => { - const result = https.onTaskEnqueue(() => {}); + const result = https.onTaskDispatched(() => {}); expect(result.__trigger).to.deep.equal({ apiVersion: 2, platform: 'gcfv2', @@ -388,7 +388,7 @@ describe('onTaskEnqueue', () => { }); it('should create a complex trigger with appropriate values', () => { - const result = https.onTaskEnqueue( + const result = https.onTaskDispatched( { ...FULL_OPTIONS, retryConfig: { @@ -432,7 +432,7 @@ describe('onTaskEnqueue', () => { minInstances: 1, }); - const result = https.onTaskEnqueue( + const result = https.onTaskDispatched( { region: 'us-west1', minInstances: 3, @@ -459,7 +459,7 @@ describe('onTaskEnqueue', () => { token: 'token', }, }; - const cf = https.onTaskEnqueue((r) => { + const cf = https.onTaskDispatched((r) => { expect(r.data).to.deep.equal(request.data); expect(r.auth).to.deep.equal(request.auth); }); @@ -468,7 +468,7 @@ describe('onTaskEnqueue', () => { }); it('should be an express handler', async () => { - const func = https.onTaskEnqueue((request) => {}); + const func = https.onTaskDispatched((request) => {}); const req = new MockRequest( { @@ -487,17 +487,17 @@ describe('onTaskEnqueue', () => { // These tests pass if the code transpiles it('allows desirable syntax', () => { - https.onTaskEnqueue((request: https.TaskRequest) => { + https.onTaskDispatched((request: https.TaskRequest) => { // There should be no lint warnings that data is not a string. console.log(`hello, ${request.data}`); }); - https.onTaskEnqueue((request: https.TaskRequest) => { + https.onTaskDispatched((request: https.TaskRequest) => { console.log(`hello, ${request.data}`); }); - https.onTaskEnqueue((request: https.TaskRequest) => { + https.onTaskDispatched((request: https.TaskRequest) => { console.log(`hello, ${request.data}`); }); - https.onTaskEnqueue((request: https.TaskRequest) => { + https.onTaskDispatched((request: https.TaskRequest) => { console.log(`Hello, ${request.data}`); }); }); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 0340bbce4..5cbc016a1 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -171,16 +171,28 @@ export interface CallableRequest { /** How a task should be retried in the event of a non-2xx return. */ export interface TaskRetryConfig { - // If left unspecified, will default to 3 + /** + * Maximum number of times a request should be attempted. + * If left unspecified, will default to 3. + */ maxAttempts?: number; - // If left unspecified will default to 1hr + /** + * The maximum amount of time to wait between attempts. + * If left unspecified will default to 1hr. + */ maxBackoffSeconds?: number; - // If left unspecified will default to 16 + /** + * The maximum number of times to double the backoff between + * retries. If left unspecified will default to 16. + */ maxDoublings?: number; - // If left unspecified will default to 100ms + /** + * The minimum time to wait between attempts. If left unspecified + * will default to 100ms. + */ minBackoffSeconds?: number; } @@ -818,7 +830,7 @@ function wrapOnCallHandler( } /** @internal */ -export function onEnqueueHandler( +export function onDispatchHandler( handler: v1TaskHandler | v2TaskHandler ): (req: Request, res: express.Response) => Promise { return async (req: Request, res: express.Response): Promise => { diff --git a/src/function-builder.ts b/src/function-builder.ts index f8a6b19d2..ef6f1ad16 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -358,7 +358,7 @@ export class FunctionBuilder { /** * Declares a task queue function for clients to call using a Firebase Admin SDK. - * @param handler A method that takes a data and context and returns void or Promise. + * @param options Configurations for the task queue function. */ /** @hidden */ taskQueue: (options?: https.TaskQueueOptions) => { diff --git a/src/handler-builder.ts b/src/handler-builder.ts index 2f66d1572..7ebf78f15 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -92,7 +92,7 @@ export class HandlerBuilder { ) => void | Promise ) { const builder = new https.TaskQueueBuilder(); - const func = builder.onEnqueue(handler); + const func = builder.onDispatch(handler); func.__trigger = {}; return func; }, diff --git a/src/providers/https.ts b/src/providers/https.ts index 7039e37a0..ecefd6c29 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -33,7 +33,7 @@ import { FunctionsErrorCode, HttpsError, onCallHandler, - onEnqueueHandler, + onDispatchHandler, Request, TaskContext, TaskRateLimits, @@ -107,7 +107,7 @@ export class TaskQueueBuilder { private readonly depOpts?: DeploymentOptions ) {} - onEnqueue( + onDispatch( handler: (data: any, context: TaskContext) => void | Promise ): TaskQueueFunction { // onEnqueueHandler sniffs the function length of the passed-in callback @@ -115,7 +115,7 @@ export class TaskQueueBuilder { // in another handler to avoid accidentally triggering the v2 API const fixedLen = (data: any, context: TaskContext) => handler(data, context); - const func: any = onEnqueueHandler(fixedLen); + const func: any = onDispatchHandler(fixedLen); func.__trigger = { ...optionsToTrigger(this.depOpts || {}), diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 6f6725e63..43556a1ba 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -33,7 +33,7 @@ import { FunctionsErrorCode, HttpsError, onCallHandler, - onEnqueueHandler, + onDispatchHandler, Request, TaskRateLimits, TaskRequest, @@ -227,17 +227,17 @@ export function onCall>( } /** Handle a request sent to a Cloud Tasks queue. */ -export function onTaskEnqueue( +export function onTaskDispatched( handler: (request: TaskRequest) => void | Promise ): TaskQueueFunction; /** Handle a request sent to a Cloud Tasks queue. */ -export function onTaskEnqueue( +export function onTaskDispatched( options: TaskQueueOptions, handler: (request: TaskRequest) => void | Promise ): TaskQueueFunction; -export function onTaskEnqueue( +export function onTaskDispatched( optsOrHandler: | TaskQueueOptions | ((request: TaskRequest) => void | Promise), @@ -256,7 +256,7 @@ export function onTaskEnqueue( // onEnqueueHandler sniffs the function length to determine which API to present. // fix the length to prevent api versions from being mismatched. const fixedLen = (req: TaskRequest) => handler(req); - const func: any = onEnqueueHandler(fixedLen); + const func: any = onDispatchHandler(fixedLen); Object.defineProperty(func, '__trigger', { get: () => { From 9016314de51c02691e2e43abe1707468f18e6074 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Thu, 2 Dec 2021 12:21:02 -0800 Subject: [PATCH 376/705] Add new region support (#1010) --- CHANGELOG.md | 1 + src/v2/options.ts | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f41e7f57d..2d6230214 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Parallelizes network calls that occur when validating authorization for onCall handlers. +- Adds new regions to V2 API diff --git a/src/v2/options.ts b/src/v2/options.ts index 076cb8532..0b2238a9f 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -33,7 +33,12 @@ import { ParamSpec } from './params/types'; /** * List of all regions supported by Cloud Functions v2 */ -export const SUPPORTED_REGIONS = ['us-west1', 'europe-west4'] as const; +export const SUPPORTED_REGIONS = [ + 'us-west1', + 'us-central1', + 'europe-west4', + 'asia-northeast1', +] as const; /** * A region known to be supported by CloudFunctions v2 From 4e48f0326d257b9e2cd27dd6d61fc4559d3514cf Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 19 Jan 2022 10:18:09 -0800 Subject: [PATCH 377/705] Container contract support for Firebase Functions SDK (#1014) * Annotate function triggers with __endpoint property (#999) In addition to annotating function triggers with `__trigger` property, we add `__endpoint` annotation. This property will be used by the to-be-developed functions runtime to generate/declare deployment manifest that the CLI will use to deploy the function. There are lots of code duplication between the utility functions for annotating the `__trigger` and `__endpoint` properties. I didn't try to refactor the common code since I expect that we will favor `__endpoint` property in the future. * Add missing import. * More of annotate endpoint property for functions (#1009) Follows up https://github.com/firebase/firebase-functions/pull/999 to annotate each funuctions with `__endpoint` property. Highlight of changes: * Extend unit test coverage for all v1 providers * Add `__endpoint` annotation to v1 task queue functions * Add `__requiredAPIs` annotation to task queue and scheduler functions * Explicitly set `__endpoint` to undefined in the handler namespace * No SDK-level label setting in the __endpoint annotation. --- spec/v1/cloud-functions.spec.ts | 108 +++++++++- spec/v1/providers/analytics.spec.ts | 22 +- spec/v1/providers/auth.spec.ts | 85 ++++++-- spec/v1/providers/database.spec.ts | 184 +++++++++++----- spec/v1/providers/firestore.spec.ts | 72 ++++--- spec/v1/providers/https.spec.ts | 62 +++++- spec/v1/providers/pubsub.spec.ts | 100 ++++++++- spec/v1/providers/remoteConfig.spec.ts | 43 ++-- spec/v1/providers/storage.spec.ts | 278 +++++++++++++++---------- spec/v1/providers/testLab.spec.ts | 21 +- spec/v2/providers/helpers.ts | 19 ++ spec/v2/providers/https.spec.ts | 59 +++++- spec/v2/providers/pubsub.spec.ts | 66 +++++- spec/v2/providers/storage.spec.ts | 267 +++++++++++++++++++++++- src/cloud-functions.ts | 102 ++++++++- src/common/manifest.ts | 85 ++++++++ src/handler-builder.ts | 68 +++--- src/providers/https.ts | 52 ++++- src/v2/core.ts | 5 +- src/v2/options.ts | 50 ++++- src/v2/providers/https.ts | 48 ++++- src/v2/providers/pubsub.ts | 29 ++- src/v2/providers/storage.ts | 42 +++- 23 files changed, 1564 insertions(+), 303 deletions(-) create mode 100644 src/common/manifest.ts diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index 05e80bd21..c894bfa23 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -41,7 +41,7 @@ describe('makeCloudFunction', () => { legacyEventType: 'providers/provider/eventTypes/event', }; - it('should put a __trigger on the returned CloudFunction', () => { + it('should put a __trigger/__endpoint on the returned CloudFunction', () => { const cf = makeCloudFunction({ provider: 'mock.provider', eventType: 'mock.event', @@ -49,6 +49,7 @@ describe('makeCloudFunction', () => { triggerResource: () => 'resource', handler: () => null, }); + expect(cf.__trigger).to.deep.equal({ eventTrigger: { eventType: 'mock.provider.mock.event', @@ -56,10 +57,23 @@ describe('makeCloudFunction', () => { service: 'service', }, }); + + expect(cf.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'mock.provider.mock.event', + eventFilters: { + resource: 'resource', + }, + retry: false, + }, + labels: {}, + }); }); - it('should have legacy event type in __trigger if provided', () => { + it('should have legacy event type in __trigger/__endpoint if provided', () => { const cf = makeCloudFunction(cloudFunctionArgs); + expect(cf.__trigger).to.deep.equal({ eventTrigger: { eventType: 'providers/provider/eventTypes/event', @@ -67,6 +81,96 @@ describe('makeCloudFunction', () => { service: 'service', }, }); + + expect(cf.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'providers/provider/eventTypes/event', + eventFilters: { + resource: 'resource', + }, + retry: false, + }, + labels: {}, + }); + }); + + it('should include converted options in __endpoint', () => { + const cf = makeCloudFunction({ + provider: 'mock.provider', + eventType: 'mock.event', + service: 'service', + triggerResource: () => 'resource', + handler: () => null, + options: { + timeoutSeconds: 10, + regions: ['us-central1'], + memory: '128MB', + serviceAccount: 'foo@google.com', + }, + }); + + expect(cf.__endpoint).to.deep.equal({ + platform: 'gcfv1', + timeoutSeconds: 10, + region: ['us-central1'], + availableMemoryMb: 128, + serviceAccountEmail: 'foo@google.com', + eventTrigger: { + eventType: 'mock.provider.mock.event', + eventFilters: { + resource: 'resource', + }, + retry: false, + }, + labels: {}, + }); + }); + + it('should set retry given failure policy in __endpoint', () => { + const cf = makeCloudFunction({ + provider: 'mock.provider', + eventType: 'mock.event', + service: 'service', + triggerResource: () => 'resource', + handler: () => null, + options: { failurePolicy: { retry: {} } }, + }); + + expect(cf.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'mock.provider.mock.event', + eventFilters: { + resource: 'resource', + }, + retry: true, + }, + labels: {}, + }); + }); + + it('should setup a scheduleTrigger in __endpoint given a schedule', () => { + const schedule = { + schedule: 'every 5 minutes', + retryConfig: { retryCount: 3 }, + timeZone: 'America/New_York', + }; + const cf = makeCloudFunction({ + provider: 'mock.provider', + eventType: 'mock.event', + service: 'service', + triggerResource: () => 'resource', + handler: () => null, + options: { + schedule, + }, + }); + expect(cf.__endpoint).to.deep.equal({ + platform: 'gcfv1', + scheduleTrigger: schedule, + labels: {}, + }); }); it('should construct the right context for event', () => { diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts index d92244439..24eb0a008 100644 --- a/spec/v1/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -50,10 +50,14 @@ describe('Analytics Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); describe('#onLog', () => { - it('should return a TriggerDefinition with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const cloudFunction = analytics.event('first_open').onLog(() => null); expect(cloudFunction.__trigger).to.deep.equal({ @@ -64,6 +68,19 @@ describe('Analytics Functions', () => { service: 'app-measurement.com', }, }); + + expect(cloudFunction.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventFilters: { + resource: 'projects/project1/events/first_open', + }, + eventType: + 'providers/google.firebase.analytics/eventTypes/event.log', + retry: false, + }, + labels: {}, + }); }); }); @@ -305,11 +322,12 @@ describe('Analytics Functions', () => { describe('handler namespace', () => { describe('#onLog', () => { - it('should return an empty trigger', () => { + it('should return an empty trigger/endpoint', () => { const cloudFunction = functions.handler.analytics.event.onLog( () => null ); expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.undefined; }); it('should handle an event with the appropriate fields', () => { diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index e22052573..6168cf767 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -51,12 +51,38 @@ describe('Auth Functions', () => { }; describe('AuthBuilder', () => { + function expectedTrigger(project: string, eventType: string) { + return { + eventTrigger: { + resource: `projects/${project}`, + eventType: `providers/firebase.auth/eventTypes/${eventType}`, + service: 'firebaseauth.googleapis.com', + }, + }; + } + + function expectedEndpoint(project: string, eventType: string) { + return { + platform: 'gcfv1', + eventTrigger: { + eventFilters: { + resource: `projects/${project}`, + }, + eventType: `providers/firebase.auth/eventTypes/${eventType}`, + retry: false, + }, + labels: {}, + }; + } + const handler = (user: firebase.auth.UserRecord) => { return Promise.resolve(); }; + const project = 'project1'; + before(() => { - process.env.GCLOUD_PROJECT = 'project1'; + process.env.GCLOUD_PROJECT = project; }); after(() => { @@ -76,31 +102,37 @@ describe('Auth Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); describe('#onCreate', () => { - it('should return a TriggerDefinition with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const cloudFunction = auth.user().onCreate(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.auth/eventTypes/user.create', - resource: 'projects/project1', - service: 'firebaseauth.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(project, 'user.create') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(project, 'user.create') + ); }); }); describe('#onDelete', () => { - it('should return a TriggerDefinition with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const cloudFunction = auth.user().onDelete(handler); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'providers/firebase.auth/eventTypes/user.delete', - resource: 'projects/project1', - service: 'firebaseauth.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(project, 'user.delete') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(project, 'user.delete') + ); }); }); @@ -198,6 +230,11 @@ describe('Auth Functions', () => { const cloudFunction = functions.handler.auth.user.onCreate(() => null); expect(cloudFunction.__trigger).to.deep.equal({}); }); + + it('should return an empty endpoint', () => { + const cloudFunction = functions.handler.auth.user.onCreate(() => null); + expect(cloudFunction.__endpoint).to.be.undefined; + }); }); describe('#onDelete', () => { @@ -206,13 +243,15 @@ describe('Auth Functions', () => { ); it('should return an empty trigger', () => { - const handler = (user: firebase.auth.UserRecord) => { - return Promise.resolve(); - }; - const cloudFunction = functions.handler.auth.user.onDelete(handler); + const cloudFunction = functions.handler.auth.user.onDelete(() => null); expect(cloudFunction.__trigger).to.deep.equal({}); }); + it('should return an empty endpoint', () => { + const cloudFunction = functions.handler.auth.user.onDelete(() => null); + expect(cloudFunction.__endpoint).to.be.undefined; + }); + it('should handle wire format as of v5.0.0 of firebase-admin', () => { return cloudFunctionDelete(event.data, event.context).then( (data: any) => { @@ -237,6 +276,10 @@ describe('Auth Functions', () => { expect(() => auth.user().onCreate(() => null).__trigger).to.throw(Error); }); + it('should throw when endpoint is accessed', () => { + expect(() => auth.user().onCreate(() => null).__endpoint).to.throw(Error); + }); + it('should not throw when #run is called', () => { const cf = auth.user().onCreate(() => null); expect(cf.run).to.not.throw(Error); diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index d49c27854..f932dd871 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -31,6 +31,30 @@ describe('Database Functions', () => { describe('DatabaseBuilder', () => { // TODO add tests for building a data or change based on the type of operation + function expectedTrigger(resource: string, eventType: string) { + return { + eventTrigger: { + resource, + eventType: `providers/google.firebase.database/eventTypes/${eventType}`, + service: 'firebaseio.com', + }, + }; + } + + function expectedEndpoint(resource: string, eventType: string) { + return { + platform: 'gcfv1', + eventTrigger: { + eventFilters: { + resource, + }, + eventType: `providers/google.firebase.database/eventTypes/${eventType}`, + retry: false, + }, + labels: {}, + }; + } + before(() => { (config as any).firebaseConfigCache = { databaseURL: 'https://subdomain.apse.firebasedatabase.app', @@ -56,21 +80,29 @@ describe('Database Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); describe('#onWrite()', () => { - it('should return "ref.write" as the event type', () => { - const eventType = database.ref('foo').onWrite(() => null).__trigger - .eventTrigger.eventType; - expect(eventType).to.eq( - 'providers/google.firebase.database/eventTypes/ref.write' + it('should return a trigger/endpoint with appropriate values', () => { + const func = database.ref('foo').onWrite(() => null); + + expect(func.__trigger).to.deep.equal( + expectedTrigger( + 'projects/_/instances/subdomain/refs/foo', + 'ref.write' + ) ); - }); - it('should construct a proper resource path', () => { - const resource = database.ref('foo').onWrite(() => null).__trigger - .eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + expect(func.__endpoint).to.deep.equal( + expectedEndpoint( + 'projects/_/instances/subdomain/refs/foo', + 'ref.write' + ) + ); }); it('should let developers choose a database instance', () => { @@ -78,8 +110,14 @@ describe('Database Functions', () => { .instance('custom') .ref('foo') .onWrite(() => null); - const resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + + expect(func.__trigger).to.deep.equal( + expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.write') + ); + + expect(func.__endpoint).to.deep.equal( + expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.write') + ); }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -107,18 +145,22 @@ describe('Database Functions', () => { }); describe('#onCreate()', () => { - it('should return "ref.create" as the event type', () => { - const eventType = database.ref('foo').onCreate(() => null).__trigger - .eventTrigger.eventType; - expect(eventType).to.eq( - 'providers/google.firebase.database/eventTypes/ref.create' + it('should return a trigger/endpoint with appropriate values', () => { + const func = database.ref('foo').onCreate(() => null); + + expect(func.__trigger).to.deep.equal( + expectedTrigger( + 'projects/_/instances/subdomain/refs/foo', + 'ref.create' + ) ); - }); - it('should construct a proper resource path', () => { - const resource = database.ref('foo').onCreate(() => null).__trigger - .eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + expect(func.__endpoint).to.deep.equal( + expectedEndpoint( + 'projects/_/instances/subdomain/refs/foo', + 'ref.create' + ) + ); }); it('should let developers choose a database instance', () => { @@ -126,8 +168,14 @@ describe('Database Functions', () => { .instance('custom') .ref('foo') .onCreate(() => null); - const resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + + expect(func.__trigger).to.deep.equal( + expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.create') + ); + + expect(func.__endpoint).to.deep.equal( + expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.create') + ); }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -156,18 +204,22 @@ describe('Database Functions', () => { }); describe('#onUpdate()', () => { - it('should return "ref.update" as the event type', () => { - const eventType = database.ref('foo').onUpdate(() => null).__trigger - .eventTrigger.eventType; - expect(eventType).to.eq( - 'providers/google.firebase.database/eventTypes/ref.update' + it('should return a trigger/endpoint with appropriate values', () => { + const func = database.ref('foo').onUpdate(() => null); + + expect(func.__trigger).to.deep.equal( + expectedTrigger( + 'projects/_/instances/subdomain/refs/foo', + 'ref.update' + ) ); - }); - it('should construct a proper resource path', () => { - const resource = database.ref('foo').onUpdate(() => null).__trigger - .eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + expect(func.__endpoint).to.deep.equal( + expectedEndpoint( + 'projects/_/instances/subdomain/refs/foo', + 'ref.update' + ) + ); }); it('should let developers choose a database instance', () => { @@ -175,8 +227,14 @@ describe('Database Functions', () => { .instance('custom') .ref('foo') .onUpdate(() => null); - const resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + + expect(func.__trigger).to.deep.equal( + expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.update') + ); + + expect(func.__endpoint).to.deep.equal( + expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.update') + ); }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -205,18 +263,22 @@ describe('Database Functions', () => { }); describe('#onDelete()', () => { - it('should return "ref.delete" as the event type', () => { - const eventType = database.ref('foo').onDelete(() => null).__trigger - .eventTrigger.eventType; - expect(eventType).to.eq( - 'providers/google.firebase.database/eventTypes/ref.delete' + it('should return a trigger/endpoint with appropriate values', () => { + const func = database.ref('foo').onDelete(() => null); + + expect(func.__trigger).to.deep.equal( + expectedTrigger( + 'projects/_/instances/subdomain/refs/foo', + 'ref.delete' + ) ); - }); - it('should construct a proper resource path', () => { - const resource = database.ref('foo').onDelete(() => null).__trigger - .eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/subdomain/refs/foo'); + expect(func.__endpoint).to.deep.equal( + expectedEndpoint( + 'projects/_/instances/subdomain/refs/foo', + 'ref.delete' + ) + ); }); it('should let developers choose a database instance', () => { @@ -224,8 +286,14 @@ describe('Database Functions', () => { .instance('custom') .ref('foo') .onDelete(() => null); - const resource = func.__trigger.eventTrigger.resource; - expect(resource).to.eq('projects/_/instances/custom/refs/foo'); + + expect(func.__trigger).to.deep.equal( + expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.delete') + ); + + expect(func.__endpoint).to.deep.equal( + expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.delete') + ); }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -259,6 +327,7 @@ describe('Database Functions', () => { it('correctly sets trigger to {}', () => { const cf = functions.handler.database.ref.onWrite(() => null); expect(cf.__trigger).to.deep.equal({}); + expect(cf.__endpoint).to.be.undefined; }); it('should be able to use the instance entry point', () => { @@ -266,6 +335,7 @@ describe('Database Functions', () => { () => null ); expect(func.__trigger).to.deep.equal({}); + expect(func.__endpoint).to.be.undefined; }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -296,7 +366,8 @@ describe('Database Functions', () => { describe('#onCreate()', () => { it('correctly sets trigger to {}', () => { const cf = functions.handler.database.ref.onCreate(() => null); - return expect(cf.__trigger).to.deep.equal({}); + expect(cf.__trigger).to.deep.equal({}); + expect(cf.__endpoint).to.be.undefined; }); it('should be able to use the instance entry point', () => { @@ -304,6 +375,7 @@ describe('Database Functions', () => { () => null ); expect(func.__trigger).to.deep.equal({}); + expect(func.__endpoint).to.be.undefined; }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -333,7 +405,8 @@ describe('Database Functions', () => { describe('#onUpdate()', () => { it('correctly sets trigger to {}', () => { const cf = functions.handler.database.ref.onUpdate(() => null); - return expect(cf.__trigger).to.deep.equal({}); + expect(cf.__trigger).to.deep.equal({}); + expect(cf.__endpoint).to.be.undefined; }); it('should be able to use the instance entry point', () => { @@ -341,6 +414,7 @@ describe('Database Functions', () => { () => null ); expect(func.__trigger).to.deep.equal({}); + expect(func.__endpoint).to.be.undefined; }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -370,7 +444,8 @@ describe('Database Functions', () => { describe('#onDelete()', () => { it('correctly sets trigger to {}', () => { const cf = functions.handler.database.ref.onDelete(() => null); - return expect(cf.__trigger).to.deep.equal({}); + expect(cf.__trigger).to.deep.equal({}); + expect(cf.__endpoint).to.be.undefined; }); it('should be able to use the instance entry point', () => { @@ -378,6 +453,7 @@ describe('Database Functions', () => { () => null ); expect(func.__trigger).to.deep.equal({}); + expect(func.__endpoint).to.be.undefined; }); it('should return a handler that emits events with a proper DataSnapshot', () => { @@ -419,6 +495,12 @@ describe('Database Functions', () => { ).to.throw(Error); }); + it('should throw when endpoint is accessed', () => { + expect( + () => database.ref('/path').onWrite(() => null).__endpoint + ).to.throw(Error); + }); + it('should not throw when #run is called', () => { const cf = database.ref('/path').onWrite(() => null); expect(cf.run).to.not.throw(Error); diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts index 25cffaf6c..3f9f07fbe 100644 --- a/spec/v1/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -103,6 +103,20 @@ describe('Firestore Functions', () => { }; } + function expectedEndpoint(resource: string, eventType: string) { + return { + platform: 'gcfv1', + eventTrigger: { + eventFilters: { + resource, + }, + eventType: `providers/cloud.firestore/eventTypes/${eventType}`, + retry: false, + }, + labels: {}, + }; + } + before(() => { process.env.GCLOUD_PROJECT = 'project1'; }); @@ -117,9 +131,14 @@ describe('Firestore Functions', () => { const cloudFunction = firestore .document('users/{uid}') .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( expectedTrigger(resource, 'document.write') ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(resource, 'document.write') + ); }); it('should allow custom namespaces', () => { @@ -129,9 +148,14 @@ describe('Firestore Functions', () => { .namespace('v2') .document('users/{uid}') .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( expectedTrigger(resource, 'document.write') ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(resource, 'document.write') + ); }); it('should allow custom databases', () => { @@ -140,9 +164,14 @@ describe('Firestore Functions', () => { .database('myDB') .document('users/{uid}') .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( expectedTrigger(resource, 'document.write') ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(resource, 'document.write') + ); }); it('should allow both custom database and namespace', () => { @@ -153,9 +182,14 @@ describe('Firestore Functions', () => { .namespace('v2') .document('users/{uid}') .onWrite(() => null); + expect(cloudFunction.__trigger).to.deep.equal( expectedTrigger(resource, 'document.write') ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(resource, 'document.write') + ); }); it('should allow both region and runtime options to be set', () => { @@ -171,36 +205,10 @@ describe('Firestore Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); - }); - - it('onCreate should have the "document.create" eventType', () => { - const resource = - 'projects/project1/databases/(default)/documents/users/{uid}'; - const eventType = firestore.document('users/{uid}').onCreate(() => null) - .__trigger.eventTrigger.eventType; - expect(eventType).to.eq( - expectedTrigger(resource, 'document.create').eventTrigger.eventType - ); - }); - it('onUpdate should have the "document.update" eventType', () => { - const resource = - 'projects/project1/databases/(default)/documents/users/{uid}'; - const eventType = firestore.document('users/{uid}').onUpdate(() => null) - .__trigger.eventTrigger.eventType; - expect(eventType).to.eq( - expectedTrigger(resource, 'document.update').eventTrigger.eventType - ); - }); - - it('onDelete should have the "document.delete" eventType', () => { - const resource = - 'projects/project1/databases/(default)/documents/users/{uid}'; - const eventType = firestore.document('users/{uid}').onDelete(() => null) - .__trigger.eventTrigger.eventType; - expect(eventType).to.eq( - expectedTrigger(resource, 'document.delete').eventTrigger.eventType - ); + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); }); @@ -217,6 +225,12 @@ describe('Firestore Functions', () => { ).to.throw(Error); }); + it('should throw when endpoint is accessed', () => { + expect( + () => firestore.document('input').onCreate(() => null).__endpoint + ).to.throw(Error); + }); + it('should not throw when #run is called', () => { const cf = firestore.document('input').onCreate(() => null); expect(cf.run).to.not.throw(Error); diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 2fbddcd26..22e6d52fd 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -22,7 +22,7 @@ import { expect } from 'chai'; import * as express from 'express'; -import * as _ from 'lodash'; + import * as functions from '../../../src/index'; import * as https from '../../../src/providers/https'; import { @@ -94,11 +94,15 @@ function runHandler( describe('CloudHttpsBuilder', () => { describe('#onRequest', () => { - it('should return a Trigger with appropriate values', () => { + it('should return a trigger with appropriate values', () => { const result = https.onRequest((req, resp) => { resp.send(200); }); expect(result.__trigger).to.deep.equal({ httpsTrigger: {} }); + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv1', + httpsTrigger: {}, + }); }); it('should allow both region and runtime options to be set', () => { @@ -115,6 +119,11 @@ describe('CloudHttpsBuilder', () => { expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); expect(fn.__trigger.httpsTrigger.invoker).to.deep.equal(['private']); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); + expect(fn.__endpoint.httpsTrigger.invoker).to.deep.equal(['private']); }); }); }); @@ -126,6 +135,7 @@ describe('handler namespace', () => { res.send(200); }); expect(result.__trigger).to.deep.equal({}); + expect(result.__endpoint).to.be.undefined; }); }); @@ -133,6 +143,7 @@ describe('handler namespace', () => { it('should return an empty trigger', () => { const result = functions.handler.https.onCall(() => null); expect(result.__trigger).to.deep.equal({}); + expect(result.__endpoint).to.be.undefined; }); }); @@ -140,19 +151,27 @@ describe('handler namespace', () => { it('should return an empty trigger', () => { const result = functions.handler.https.taskQueue.onEnqueue(() => null); expect(result.__trigger).to.deep.equal({}); + expect(result.__endpoint).to.be.undefined; }); }); }); describe('#onCall', () => { - it('should return a Trigger with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const result = https.onCall((data) => { return 'response'; }); + expect(result.__trigger).to.deep.equal({ httpsTrigger: {}, labels: { 'deployment-callable': 'true' }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv1', + callableTrigger: {}, + labels: {}, + }); }); it('should allow both region and runtime options to be set', () => { @@ -167,6 +186,10 @@ describe('#onCall', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); it('has a .run method', () => { @@ -209,7 +232,7 @@ describe('#onCall', () => { }); describe('#onEnqueue', () => { - it('should return a Trigger with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const result = https .taskQueue({ rateLimits: { @@ -226,6 +249,7 @@ describe('#onEnqueue', () => { invoker: 'private', }) .onDispatch(() => {}); + expect(result.__trigger).to.deep.equal({ taskQueueTrigger: { rateLimits: { @@ -242,6 +266,24 @@ describe('#onEnqueue', () => { invoker: ['private'], }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv1', + taskQueueTrigger: { + rateLimits: { + maxBurstSize: 20, + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: ['private'], + }, + }); }); it('should allow both region and runtime options to be set', () => { @@ -264,6 +306,18 @@ describe('#onEnqueue', () => { }, }, }); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + region: ['us-east1'], + availableMemoryMb: 256, + timeoutSeconds: 90, + taskQueueTrigger: { + retryConfig: { + maxAttempts: 5, + }, + }, + }); }); it('has a .run method', async () => { diff --git a/spec/v1/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts index 1ab8c7ba4..5547515ab 100644 --- a/spec/v1/providers/pubsub.spec.ts +++ b/spec/v1/providers/pubsub.spec.ts @@ -85,12 +85,17 @@ describe('Pubsub Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); describe('#onPublish', () => { - it('should return a TriggerDefinition with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { // Pick up project from process.env.GCLOUD_PROJECT const result = pubsub.topic('toppy').onPublish(() => null); + expect(result.__trigger).to.deep.equal({ eventTrigger: { eventType: 'google.pubsub.topic.publish', @@ -98,6 +103,18 @@ describe('Pubsub Functions', () => { service: 'pubsub.googleapis.com', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'google.pubsub.topic.publish', + eventFilters: { + resource: 'projects/project1/topics/toppy', + }, + retry: false, + }, + labels: {}, + }); }); it('should throw with improperly formatted topics', () => { @@ -143,27 +160,38 @@ describe('Pubsub Functions', () => { }); describe('#schedule', () => { - it('should return a trigger with schedule', () => { + it('should return a trigger/endpoint with schedule', () => { const result = pubsub .schedule('every 5 minutes') .onRun((context) => null); + expect(result.__trigger.schedule).to.deep.equal({ schedule: 'every 5 minutes', }); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + }); }); - it('should return a trigger with schedule and timeZone when one is chosen', () => { + it('should return a trigger/endpoint with schedule and timeZone when one is chosen', () => { const result = pubsub .schedule('every 5 minutes') .timeZone('America/New_York') .onRun((context) => null); + expect(result.__trigger.schedule).to.deep.equal({ schedule: 'every 5 minutes', timeZone: 'America/New_York', }); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + timeZone: 'America/New_York', + }); }); - it('should return a trigger with schedule and retry config when called with retryConfig', () => { + it('should return a trigger/endpoint with schedule and retry config when called with retryConfig', () => { const retryConfig = { retryCount: 3, maxRetryDuration: '10 minutes', @@ -175,6 +203,7 @@ describe('Pubsub Functions', () => { .schedule('every 5 minutes') .retryConfig(retryConfig) .onRun(() => null); + expect(result.__trigger.schedule).to.deep.equal({ schedule: 'every 5 minutes', retryConfig, @@ -182,10 +211,16 @@ describe('Pubsub Functions', () => { expect(result.__trigger.labels).to.deep.equal({ 'deployment-scheduled': 'true', }); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + retryConfig, + }); + expect(result.__endpoint.labels).to.be.empty; }); it( - 'should return a trigger with schedule, timeZone and retry config' + + 'should return a trigger/endpoint with schedule, timeZone and retry config' + 'when called with retryConfig and timeout', () => { const retryConfig = { @@ -200,6 +235,7 @@ describe('Pubsub Functions', () => { .timeZone('America/New_York') .retryConfig(retryConfig) .onRun(() => null); + expect(result.__trigger.schedule).to.deep.equal({ schedule: 'every 5 minutes', retryConfig, @@ -208,10 +244,17 @@ describe('Pubsub Functions', () => { expect(result.__trigger.labels).to.deep.equal({ 'deployment-scheduled': 'true', }); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + retryConfig, + timeZone: 'America/New_York', + }); + expect(result.__endpoint.labels).to.be.empty; } ); - it('should return an appropriate trigger when called with region and options', () => { + it('should return an appropriate trigger/endpoint when called with region and options', () => { const result = functions .region('us-east1') .runWith({ @@ -226,9 +269,16 @@ describe('Pubsub Functions', () => { expect(result.__trigger.regions).to.deep.equal(['us-east1']); expect(result.__trigger.availableMemoryMb).to.deep.equal(256); expect(result.__trigger.timeout).to.deep.equal('90s'); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + }); + expect(result.__endpoint.region).to.deep.equal(['us-east1']); + expect(result.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(result.__endpoint.timeoutSeconds).to.deep.equal(90); }); - it('should return an appropriate trigger when called with region, timeZone, and options', () => { + it('should return an appropriate trigger/endpoint when called with region, timeZone, and options', () => { const result = functions .region('us-east1') .runWith({ @@ -245,9 +295,17 @@ describe('Pubsub Functions', () => { expect(result.__trigger.regions).to.deep.equal(['us-east1']); expect(result.__trigger.availableMemoryMb).to.deep.equal(256); expect(result.__trigger.timeout).to.deep.equal('90s'); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + timeZone: 'America/New_York', + }); + expect(result.__endpoint.region).to.deep.equal(['us-east1']); + expect(result.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(result.__endpoint.timeoutSeconds).to.deep.equal(90); }); - it('should return an appropriate trigger when called with region, options and retryConfig', () => { + it('should return an appropriate trigger/endpoint when called with region, options and retryConfig', () => { const retryConfig = { retryCount: 3, maxRetryDuration: '10 minutes', @@ -274,9 +332,17 @@ describe('Pubsub Functions', () => { expect(result.__trigger.regions).to.deep.equal(['us-east1']); expect(result.__trigger.availableMemoryMb).to.deep.equal(256); expect(result.__trigger.timeout).to.deep.equal('90s'); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + retryConfig, + }); + expect(result.__endpoint.region).to.deep.equal(['us-east1']); + expect(result.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(result.__endpoint.timeoutSeconds).to.deep.equal(90); }); - it('should return an appropriate trigger when called with region, options, retryConfig, and timeZone', () => { + it('should return an appropriate trigger/endpoint when called with region, options, retryConfig, and timeZone', () => { const retryConfig = { retryCount: 3, maxRetryDuration: '10 minutes', @@ -305,6 +371,15 @@ describe('Pubsub Functions', () => { expect(result.__trigger.regions).to.deep.equal(['us-east1']); expect(result.__trigger.availableMemoryMb).to.deep.equal(256); expect(result.__trigger.timeout).to.deep.equal('90s'); + + expect(result.__endpoint.scheduleTrigger).to.deep.equal({ + schedule: 'every 5 minutes', + timeZone: 'America/New_York', + retryConfig, + }); + expect(result.__endpoint.region).to.deep.equal(['us-east1']); + expect(result.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(result.__endpoint.timeoutSeconds).to.deep.equal(90); }); }); }); @@ -315,6 +390,7 @@ describe('Pubsub Functions', () => { it('should return an empty trigger', () => { const result = functions.handler.pubsub.topic.onPublish(() => null); expect(result.__trigger).to.deep.equal({}); + expect(result.__endpoint).to.be.undefined; }); it('should properly handle a new-style event', () => { @@ -406,6 +482,12 @@ describe('Pubsub Functions', () => { ).to.throw(Error); }); + it('should throw when endpoint is accessed', () => { + expect( + () => pubsub.topic('toppy').onPublish(() => null).__endpoint + ).to.throw(Error); + }); + it('should not throw when #run is called', () => { const cf = pubsub.topic('toppy').onPublish(() => null); expect(cf.run).to.not.throw(Error); diff --git a/spec/v1/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts index f7221cf99..f3fde2043 100644 --- a/spec/v1/providers/remoteConfig.spec.ts +++ b/spec/v1/providers/remoteConfig.spec.ts @@ -20,13 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. import { expect } from 'chai'; -import * as _ from 'lodash'; import { CloudFunction, Event, EventContext, - TriggerAnnotated, } from '../../../src/cloud-functions'; import * as functions from '../../../src/index'; import * as remoteConfig from '../../../src/providers/remoteConfig'; @@ -47,18 +45,6 @@ describe('RemoteConfig Functions', () => { } describe('#onUpdate', () => { - function expectedTrigger(): TriggerAnnotated { - return { - __trigger: { - eventTrigger: { - resource: 'projects/project1', - eventType: 'google.firebase.remoteconfig.update', - service: 'firebaseremoteconfig.googleapis.com', - }, - }, - }; - } - before(() => { process.env.GCLOUD_PROJECT = 'project1'; }); @@ -69,9 +55,26 @@ describe('RemoteConfig Functions', () => { it('should have the correct trigger', () => { const cloudFunction = remoteConfig.onUpdate(() => null); - expect(cloudFunction.__trigger).to.deep.equal( - expectedTrigger().__trigger - ); + + expect(cloudFunction.__trigger).to.deep.equal({ + eventTrigger: { + resource: 'projects/project1', + eventType: 'google.firebase.remoteconfig.update', + service: 'firebaseremoteconfig.googleapis.com', + }, + }); + + expect(cloudFunction.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'google.firebase.remoteconfig.update', + eventFilters: { + resource: 'projects/project1', + }, + retry: false, + }, + labels: {}, + }); }); it('should allow both region and runtime options to be set', () => { @@ -86,6 +89,10 @@ describe('RemoteConfig Functions', () => { expect(cloudFunction.__trigger.regions).to.deep.equal(['us-east1']); expect(cloudFunction.__trigger.availableMemoryMb).to.deep.equal(256); expect(cloudFunction.__trigger.timeout).to.deep.equal('90s'); + + expect(cloudFunction.__endpoint.region).to.deep.equal(['us-east1']); + expect(cloudFunction.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(cloudFunction.__endpoint.timeoutSeconds).to.deep.equal(90); }); }); @@ -135,7 +142,9 @@ describe('RemoteConfig Functions', () => { const cloudFunction = functions.handler.remoteConfig.onUpdate( () => null ); + expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should correctly unwrap the event', () => { diff --git a/spec/v1/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts index 02762630d..d96b131b9 100644 --- a/spec/v1/providers/storage.spec.ts +++ b/spec/v1/providers/storage.spec.ts @@ -28,9 +28,35 @@ import * as storage from '../../../src/providers/storage'; describe('Storage Functions', () => { describe('ObjectBuilder', () => { + function expectedTrigger(bucket: string, eventType: string) { + return { + eventTrigger: { + resource: `projects/_/buckets/${bucket}`, + eventType: `google.storage.object.${eventType}`, + service: 'storage.googleapis.com', + }, + }; + } + + function expectedEndpoint(bucket: string, eventType: string) { + return { + platform: 'gcfv1', + eventTrigger: { + eventFilters: { + resource: `projects/_/buckets/${bucket}`, + }, + eventType: `google.storage.object.${eventType}`, + retry: false, + }, + labels: {}, + }; + } + + const defaultBucket = 'bucket'; + before(() => { (config as any).firebaseConfigCache = { - storageBucket: 'bucket', + storageBucket: defaultBucket, }; }); @@ -51,6 +77,10 @@ describe('Storage Functions', () => { expect(fn.__trigger.regions).to.deep.equal(['us-east1']); expect(fn.__trigger.availableMemoryMb).to.deep.equal(256); expect(fn.__trigger.timeout).to.deep.equal('90s'); + + expect(fn.__endpoint.region).to.deep.equal(['us-east1']); + expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256); + expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90); }); describe('#onArchive', () => { @@ -59,24 +89,26 @@ describe('Storage Functions', () => { .bucket('bucky') .object() .onArchive(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.archive', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger('bucky', 'archive') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'archive') + ); }); it('should use the default bucket when none is provided', () => { const cloudFunction = storage.object().onArchive(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.archive', - resource: 'projects/_/buckets/bucket', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(defaultBucket, 'archive') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(defaultBucket, 'archive') + ); }); it('should allow fully qualified bucket names', () => { @@ -85,13 +117,14 @@ describe('Storage Functions', () => { {} ); const result = subjectQualified.onArchive(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.archive', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(result.__trigger).to.deep.equal( + expectedTrigger('bucky', 'archive') + ); + + expect(result.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'archive') + ); }); it('should throw with improperly formatted buckets', () => { @@ -102,6 +135,14 @@ describe('Storage Functions', () => { .object() .onArchive(() => null).__trigger ).to.throw(Error); + + expect( + () => + storage + .bucket('bad/bucket/format') + .object() + .onArchive(() => null).__endpoint + ).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -139,24 +180,26 @@ describe('Storage Functions', () => { .bucket('bucky') .object() .onDelete(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.delete', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger('bucky', 'delete') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'delete') + ); }); it('should use the default bucket when none is provided', () => { const cloudFunction = storage.object().onDelete(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.delete', - resource: 'projects/_/buckets/bucket', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(defaultBucket, 'delete') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(defaultBucket, 'delete') + ); }); it('should allow fully qualified bucket names', () => { @@ -165,23 +208,25 @@ describe('Storage Functions', () => { {} ); const result = subjectQualified.onDelete(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.delete', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(result.__trigger).to.deep.equal( + expectedTrigger('bucky', 'delete') + ); + + expect(result.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'delete') + ); }); it('should throw with improperly formatted buckets', () => { - expect( - () => - storage - .bucket('bad/bucket/format') - .object() - .onDelete(() => null).__trigger - ).to.throw(Error); + const fn = storage + .bucket('bad/bucket/format') + .object() + .onDelete(() => null); + + expect(() => fn.__trigger).to.throw(Error); + + expect(() => fn.__endpoint).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -219,24 +264,26 @@ describe('Storage Functions', () => { .bucket('bucky') .object() .onFinalize(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.finalize', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger('bucky', 'finalize') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'finalize') + ); }); it('should use the default bucket when none is provided', () => { const cloudFunction = storage.object().onFinalize(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.finalize', - resource: 'projects/_/buckets/bucket', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(defaultBucket, 'finalize') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(defaultBucket, 'finalize') + ); }); it('should allow fully qualified bucket names', () => { @@ -245,23 +292,25 @@ describe('Storage Functions', () => { {} ); const result = subjectQualified.onFinalize(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.finalize', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(result.__trigger).to.deep.equal( + expectedTrigger('bucky', 'finalize') + ); + + expect(result.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'finalize') + ); }); it('should throw with improperly formatted buckets', () => { - expect( - () => - storage - .bucket('bad/bucket/format') - .object() - .onFinalize(() => null).__trigger - ).to.throw(Error); + const fn = storage + .bucket('bad/bucket/format') + .object() + .onFinalize(() => null); + + expect(() => fn.__trigger).to.throw(Error); + + expect(() => fn.__endpoint).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -299,24 +348,26 @@ describe('Storage Functions', () => { .bucket('bucky') .object() .onMetadataUpdate(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.metadataUpdate', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger('bucky', 'metadataUpdate') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'metadataUpdate') + ); }); it('should use the default bucket when none is provided', () => { const cloudFunction = storage.object().onMetadataUpdate(() => null); - expect(cloudFunction.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.metadataUpdate', - resource: 'projects/_/buckets/bucket', - service: 'storage.googleapis.com', - }, - }); + + expect(cloudFunction.__trigger).to.deep.equal( + expectedTrigger(defaultBucket, 'metadataUpdate') + ); + + expect(cloudFunction.__endpoint).to.deep.equal( + expectedEndpoint(defaultBucket, 'metadataUpdate') + ); }); it('should allow fully qualified bucket names', () => { @@ -325,23 +376,24 @@ describe('Storage Functions', () => { {} ); const result = subjectQualified.onMetadataUpdate(() => null); - expect(result.__trigger).to.deep.equal({ - eventTrigger: { - eventType: 'google.storage.object.metadataUpdate', - resource: 'projects/_/buckets/bucky', - service: 'storage.googleapis.com', - }, - }); + + expect(result.__trigger).to.deep.equal( + expectedTrigger('bucky', 'metadataUpdate') + ); + + expect(result.__endpoint).to.deep.equal( + expectedEndpoint('bucky', 'metadataUpdate') + ); }); it('should throw with improperly formatted buckets', () => { - expect( - () => - storage - .bucket('bad/bucket/format') - .object() - .onMetadataUpdate(() => null).__trigger - ).to.throw(Error); + const fn = storage + .bucket('bad/bucket/format') + .object() + .onMetadataUpdate(() => null); + + expect(() => fn.__trigger).to.throw(Error); + expect(() => fn.__endpoint).to.throw(Error); }); it('should not mess with media links using non-literal slashes', () => { @@ -390,7 +442,9 @@ describe('Storage Functions', () => { const cloudFunction = functions.handler.storage.bucket.onArchive( () => null ); + expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should not mess with media links using non-literal slashes', () => { @@ -429,7 +483,9 @@ describe('Storage Functions', () => { const cloudFunction = functions.handler.storage.bucket.onDelete( () => null ); + expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should not mess with media links using non-literal slashes', () => { @@ -468,7 +524,9 @@ describe('Storage Functions', () => { const cloudFunction = functions.handler.storage.bucket.onFinalize( () => null ); + expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should not mess with media links using non-literal slashes', () => { @@ -507,7 +565,9 @@ describe('Storage Functions', () => { const cloudFunction = functions.handler.storage.bucket.onMetadataUpdate( () => null ); + expect(cloudFunction.__trigger).to.deep.equal({}); + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should not mess with media links using non-literal slashes', () => { @@ -558,6 +618,12 @@ describe('Storage Functions', () => { ); }); + it('should throw when endpoint is accessed', () => { + expect(() => storage.object().onArchive(() => null).__endpoint).to.throw( + Error + ); + }); + it('should not throw when #run is called', () => { const cf = storage.object().onArchive(() => null); expect(cf.run).to.not.throw(Error); diff --git a/spec/v1/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts index 3dbe8c0f5..b3ba22d7f 100644 --- a/spec/v1/providers/testLab.spec.ts +++ b/spec/v1/providers/testLab.spec.ts @@ -35,8 +35,9 @@ describe('Test Lab Functions', () => { delete process.env.GCLOUD_PROJECT; }); - it('should return a TriggerDefinition with appropriate values', () => { + it('should return a trigger/endpoint with appropriate values', () => { const func = testLab.testMatrix().onComplete(() => null); + expect(func.__trigger).to.deep.equal({ eventTrigger: { service: 'testing.googleapis.com', @@ -44,6 +45,18 @@ describe('Test Lab Functions', () => { resource: 'projects/project1/testMatrices/{matrix}', }, }); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv1', + eventTrigger: { + eventType: 'google.testing.testMatrix.complete', + eventFilters: { + resource: 'projects/project1/testMatrices/{matrix}', + }, + retry: false, + }, + labels: {}, + }); }); it('should parse TestMatrix in "INVALID" state', () => { @@ -155,6 +168,12 @@ describe('Test Lab Functions', () => { () => testLab.testMatrix().onComplete(() => null).__trigger ).to.throw(Error); }); + + it('should throw when endpoint is accessed', () => { + expect( + () => testLab.testMatrix().onComplete(() => null).__endpoint + ).to.throw(Error); + }); }); }); diff --git a/spec/v2/providers/helpers.ts b/spec/v2/providers/helpers.ts index a654a4944..a499be69a 100644 --- a/spec/v2/providers/helpers.ts +++ b/spec/v2/providers/helpers.ts @@ -33,3 +33,22 @@ export const FULL_TRIGGER = { hello: 'world', }, }; + +export const FULL_ENDPOINT = { + platform: 'gcfv2', + region: ['us-west1'], + availableMemoryMb: 512, + timeoutSeconds: 60, + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpc: { + connector: 'aConnector', + egressSettings: 'ALL_TRAFFIC', + }, + serviceAccountEmail: 'root@', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, +}; diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index ef9efbc29..5f0f7eb74 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -7,7 +7,7 @@ import { expectedResponseHeaders, MockRequest, } from '../../fixtures/mockrequest'; -import { FULL_OPTIONS, FULL_TRIGGER } from './helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './helpers'; /** * RunHandlerResult contains the data from an express.Response. @@ -82,10 +82,11 @@ describe('onRequest', () => { delete process.env.GCLOUD_PROJECT; }); - it('should return a minimal trigger with appropriate values', () => { + it('should return a minimal trigger/endpoint with appropriate values', () => { const result = https.onRequest((req, res) => { res.send(200); }); + expect(result.__trigger).to.deep.equal({ apiVersion: 2, platform: 'gcfv2', @@ -94,9 +95,15 @@ describe('onRequest', () => { }, labels: {}, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + httpsTrigger: {}, + labels: {}, + }); }); - it('should create a complex trigger with appropriate values', () => { + it('should create a complex trigger/endpoint with appropriate values', () => { const result = https.onRequest( { ...FULL_OPTIONS, @@ -107,6 +114,7 @@ describe('onRequest', () => { res.send(200); } ); + expect(result.__trigger).to.deep.equal({ ...FULL_TRIGGER, httpsTrigger: { @@ -115,6 +123,14 @@ describe('onRequest', () => { }, regions: ['us-west1', 'us-central1'], }); + + expect(result.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + httpsTrigger: { + invoker: ['service-account1@', 'service-account2@'], + }, + region: ['us-west1', 'us-central1'], + }); }); it('should merge options and globalOptions', () => { @@ -148,6 +164,17 @@ describe('onRequest', () => { regions: ['us-west1', 'us-central1'], labels: {}, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + httpsTrigger: { + invoker: ['private'], + }, + concurrency: 20, + minInstances: 3, + region: ['us-west1', 'us-central1'], + labels: {}, + }); }); it('should be an express handler', async () => { @@ -209,8 +236,9 @@ describe('onCall', () => { delete process.env.GCLOUD_PROJECT; }); - it('should return a minimal trigger with appropriate values', () => { + it('should return a minimal trigger/endpoint with appropriate values', () => { const result = https.onCall((request) => 42); + expect(result.__trigger).to.deep.equal({ apiVersion: 2, platform: 'gcfv2', @@ -221,10 +249,17 @@ describe('onCall', () => { 'deployment-callable': 'true', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + callableTrigger: {}, + labels: {}, + }); }); - it('should create a complex trigger with appropriate values', () => { + it('should create a complex trigger/endpoint with appropriate values', () => { const result = https.onCall(FULL_OPTIONS, (request) => 42); + expect(result.__trigger).to.deep.equal({ ...FULL_TRIGGER, httpsTrigger: { @@ -235,6 +270,11 @@ describe('onCall', () => { 'deployment-callable': 'true', }, }); + + expect(result.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + callableTrigger: {}, + }); }); it('should merge options and globalOptions', () => { @@ -265,6 +305,15 @@ describe('onCall', () => { 'deployment-callable': 'true', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + callableTrigger: {}, + concurrency: 20, + minInstances: 3, + region: ['us-west1', 'us-central1'], + labels: {}, + }); }); it('has a .run method', () => { diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index 4fc338614..f48e10f72 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -3,13 +3,21 @@ import { expect } from 'chai'; import { CloudEvent } from '../../../src/v2/core'; import * as options from '../../../src/v2/options'; import * as pubsub from '../../../src/v2/providers/pubsub'; -import { FULL_OPTIONS, FULL_TRIGGER } from './helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './helpers'; const EVENT_TRIGGER = { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', resource: 'projects/aProject/topics/topic', }; +const ENDPOINT_EVENT_TRIGGER = { + eventType: 'google.cloud.pubsub.topic.v1.messagePublished', + eventFilters: { + topic: 'topic', + }, + retry: false, +}; + describe('onMessagePublished', () => { beforeEach(() => { options.setGlobalOptions({}); @@ -20,25 +28,38 @@ describe('onMessagePublished', () => { delete process.env.GCLOUD_PROJECT; }); - it('should return a minimal trigger with appropriate values', () => { + it('should return a minimal trigger/endpoint with appropriate values', () => { const result = pubsub.onMessagePublished('topic', () => 42); + expect(result.__trigger).to.deep.equal({ apiVersion: 2, platform: 'gcfv2', eventTrigger: EVENT_TRIGGER, labels: {}, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + eventTrigger: ENDPOINT_EVENT_TRIGGER, + labels: {}, + }); }); - it('should create a complex trigger with appropriate values', () => { + it('should create a complex trigger/endpoint with appropriate values', () => { const result = pubsub.onMessagePublished( { ...FULL_OPTIONS, topic: 'topic' }, () => 42 ); + expect(result.__trigger).to.deep.equal({ ...FULL_TRIGGER, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); }); it('should merge options and globalOptions', () => { @@ -66,6 +87,45 @@ describe('onMessagePublished', () => { labels: {}, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + concurrency: 20, + minInstances: 3, + region: ['us-west1'], + labels: {}, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); + }); + + it('should convert retry option if appropriate', () => { + const result = pubsub.onMessagePublished( + { + topic: 'topic', + region: 'us-west1', + minInstances: 3, + retry: true, + }, + () => 42 + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + minInstances: 3, + regions: ['us-west1'], + labels: {}, + eventTrigger: EVENT_TRIGGER, + failurePolicy: { retry: true }, + }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + minInstances: 3, + region: ['us-west1'], + labels: {}, + eventTrigger: { ...ENDPOINT_EVENT_TRIGGER, retry: true }, + }); }); it('should have a .run method', () => { diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts index 601b5c024..8c2e25576 100644 --- a/spec/v2/providers/storage.spec.ts +++ b/spec/v2/providers/storage.spec.ts @@ -10,6 +10,14 @@ const EVENT_TRIGGER = { resource: 'some-bucket', }; +const ENDPOINT_EVENT_TRIGGER = { + eventType: 'event-type', + eventFilters: { + bucket: 'some-bucket', + }, + retry: false, +}; + describe('v2/storage', () => { describe('getOptsAndBucket', () => { it('should return the default bucket with empty opts', () => { @@ -68,7 +76,7 @@ describe('v2/storage', () => { configStub.restore(); }); - it('should create a minimal trigger with bucket', () => { + it('should create a minimal trigger/endpoint with bucket', () => { const result = storage.onOperation('event-type', 'some-bucket', () => 42); expect(result.__trigger).to.deep.equal({ @@ -76,9 +84,15 @@ describe('v2/storage', () => { labels: {}, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); }); - it('should create a minimal trigger with opts', () => { + it('should create a minimal trigger/endpoint with opts', () => { configStub.returns({ storageBucket: 'default-bucket' }); const result = storage.onOperation( @@ -96,6 +110,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + region: ['us-west1'], + }); }); it('should create a minimal trigger with bucket with opts and bucket', () => { @@ -110,9 +136,15 @@ describe('v2/storage', () => { labels: {}, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); }); - it('should create a complex trigger with appropriate values', () => { + it('should create a complex trigger/endpoint with appropriate values', () => { const result = storage.onOperation( 'event-type', { @@ -139,6 +171,26 @@ describe('v2/storage', () => { }, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + region: ['us-west1'], + availableMemoryMb: 512, + timeoutSeconds: 60, + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpc: { + connector: 'aConnector', + egressSettings: 'ALL_TRAFFIC', + }, + serviceAccountEmail: 'root@', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); }); it('should merge options and globalOptions', () => { @@ -166,6 +218,15 @@ describe('v2/storage', () => { labels: {}, eventTrigger: EVENT_TRIGGER, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + concurrency: 20, + minInstances: 3, + region: ['us-west1'], + labels: {}, + eventTrigger: ENDPOINT_EVENT_TRIGGER, + }); }); }); @@ -174,6 +235,10 @@ describe('v2/storage', () => { ...EVENT_TRIGGER, eventType: storage.archivedEvent, }; + const ENDPOINT_ARCHIVED_TRIGGER = { + ...ENDPOINT_EVENT_TRIGGER, + eventType: storage.archivedEvent, + }; let configStub: sinon.SinonStub; beforeEach(() => { @@ -197,6 +262,17 @@ describe('v2/storage', () => { resource: 'default-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_ARCHIVED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + }); }); it('should accept bucket and handler', () => { @@ -210,6 +286,17 @@ describe('v2/storage', () => { resource: 'my-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_ARCHIVED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + }); }); it('should accept opts and handler', () => { @@ -227,6 +314,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_ARCHIVED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + region: ['us-west1'], + }); }); it('should accept opts and handler, default bucket', () => { @@ -243,6 +342,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_ARCHIVED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + region: ['us-west1'], + }); }); }); @@ -251,6 +362,10 @@ describe('v2/storage', () => { ...EVENT_TRIGGER, eventType: storage.finalizedEvent, }; + const ENDPOINT_FINALIZED_TRIGGER = { + ...ENDPOINT_EVENT_TRIGGER, + eventType: storage.finalizedEvent, + }; let configStub: sinon.SinonStub; beforeEach(() => { @@ -274,6 +389,17 @@ describe('v2/storage', () => { resource: 'default-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_FINALIZED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + }); }); it('should accept bucket and handler', () => { @@ -287,6 +413,17 @@ describe('v2/storage', () => { resource: 'my-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_FINALIZED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + }); }); it('should accept opts and handler', () => { @@ -304,6 +441,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_FINALIZED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + region: ['us-west1'], + }); }); it('should accept opts and handler, default bucket', () => { @@ -323,6 +472,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_FINALIZED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + region: ['us-west1'], + }); }); }); @@ -331,6 +492,10 @@ describe('v2/storage', () => { ...EVENT_TRIGGER, eventType: storage.deletedEvent, }; + const ENDPOINT_DELETED_TRIGGER = { + ...ENDPOINT_EVENT_TRIGGER, + eventType: storage.deletedEvent, + }; let configStub: sinon.SinonStub; beforeEach(() => { @@ -355,6 +520,17 @@ describe('v2/storage', () => { }, }); + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_DELETED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + }); + configStub.restore(); }); @@ -369,6 +545,17 @@ describe('v2/storage', () => { resource: 'my-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_DELETED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + }); }); it('should accept opts and handler', () => { @@ -386,6 +573,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_DELETED_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + region: ['us-west1'], + }); }); it('should accept opts and handler, default bucket', () => { @@ -402,6 +601,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_DELETED_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + region: ['us-west1'], + }); }); }); @@ -410,6 +621,10 @@ describe('v2/storage', () => { ...EVENT_TRIGGER, eventType: storage.metadataUpdatedEvent, }; + const ENDPOINT_METADATA_TRIGGER = { + ...ENDPOINT_EVENT_TRIGGER, + eventType: storage.metadataUpdatedEvent, + }; let configStub: sinon.SinonStub; beforeEach(() => { @@ -434,6 +649,17 @@ describe('v2/storage', () => { }, }); + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_METADATA_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + }); + configStub.restore(); }); @@ -448,6 +674,17 @@ describe('v2/storage', () => { resource: 'my-bucket', }, }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_METADATA_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + }); }); it('should accept opts and handler', () => { @@ -465,6 +702,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_METADATA_TRIGGER, + eventFilters: { + bucket: 'my-bucket', + }, + }, + region: ['us-west1'], + }); }); it('should accept opts and handler, default bucket', () => { @@ -484,6 +733,18 @@ describe('v2/storage', () => { }, regions: ['us-west1'], }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_METADATA_TRIGGER, + eventFilters: { + bucket: 'default-bucket', + }, + }, + region: ['us-west1'], + }); }); }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 688c4eb78..d2de0504c 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -37,6 +37,7 @@ import { durationFromSeconds, serviceAccountFromShorthand, } from './common/encoding'; +import { ManifestEndpoint, ManifestRequiredAPI } from './common/manifest'; /** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); @@ -283,6 +284,15 @@ export interface TriggerAnnotated { }; } +/** + * @hidden + * EndpointAnnotated is used to generate the manifest that conforms to the container contract. + */ +export interface EndpointAnnotated { + __endpoint: ManifestEndpoint; + __requiredAPIs?: ManifestRequiredAPI[]; +} + /** * A Runnable has a `run` method which directly invokes the user-defined * function - useful for unit testing. @@ -301,6 +311,7 @@ export interface Runnable { * arguments. */ export type HttpsFunction = TriggerAnnotated & + EndpointAnnotated & ((req: Request, resp: Response) => void | Promise); /** @@ -312,6 +323,7 @@ export type HttpsFunction = TriggerAnnotated & */ export type CloudFunction = Runnable & TriggerAnnotated & + EndpointAnnotated & ((input: any, context?: any) => PromiseLike | any); /** @hidden */ @@ -322,9 +334,9 @@ export interface MakeCloudFunctionArgs { dataConstructor?: (raw: Event) => EventData; eventType: string; handler?: (data: EventData, context: EventContext) => PromiseLike | any; - labels?: { [key: string]: any }; + labels?: Record; legacyEventType?: string; - options?: { [key: string]: any }; + options?: DeploymentOptions; /* * TODO: should remove `provider` and require a fully qualified `eventType` * once all providers have migrated to new format. @@ -432,6 +444,47 @@ export function makeCloudFunction({ }, }); + Object.defineProperty(cloudFunction, '__endpoint', { + get: () => { + if (triggerResource() == null) { + return undefined; + } + + const endpoint: ManifestEndpoint = { + platform: 'gcfv1', + ...optionsToEndpoint(options), + }; + + if (options.schedule) { + endpoint.scheduleTrigger = options.schedule; + } else { + endpoint.eventTrigger = { + eventType: legacyEventType || provider + '.' + eventType, + eventFilters: { + resource: triggerResource(), + }, + retry: !!options.failurePolicy, + }; + } + + // Note: We intentionally don't make use of labels args here. + // labels is used to pass SDK-defined labels to the trigger, which isn't + // something we will do in the container contract world. + endpoint.labels = { ...endpoint.labels }; + + return endpoint; + }, + }); + + if (options.schedule) { + cloudFunction.__requiredAPIs = [ + { + api: 'cloudscheduler.googleapis.com', + reason: 'Needed for scheduled functions.', + }, + ]; + } + cloudFunction.run = handler || contextOnlyHandler; return cloudFunction; } @@ -545,3 +598,48 @@ export function optionsToTrigger(options: DeploymentOptions) { return trigger; } + +export function optionsToEndpoint( + options: DeploymentOptions +): ManifestEndpoint { + const endpoint: ManifestEndpoint = {}; + copyIfPresent( + endpoint, + options, + 'minInstances', + 'maxInstances', + 'ingressSettings', + 'labels', + 'timeoutSeconds' + ); + convertIfPresent(endpoint, options, 'region', 'regions'); + convertIfPresent( + endpoint, + options, + 'serviceAccountEmail', + 'serviceAccount', + (sa) => sa + ); + if (options?.vpcConnector) { + endpoint.vpc = { connector: options.vpcConnector }; + convertIfPresent( + endpoint.vpc, + options, + 'egressSettings', + 'vpcConnectorEgressSettings' + ); + } + convertIfPresent(endpoint, options, 'availableMemoryMb', 'memory', (mem) => { + const memoryLookup = { + '128MB': 128, + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, + '4GB': 4096, + '8GB': 8192, + }; + return memoryLookup[mem]; + }); + return endpoint; +} diff --git a/src/common/manifest.ts b/src/common/manifest.ts new file mode 100644 index 000000000..379e61a4f --- /dev/null +++ b/src/common/manifest.ts @@ -0,0 +1,85 @@ +// 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. +/** + * @internal + * An definition of a function as appears in the Manifest. + */ +export interface ManifestEndpoint { + entryPoint?: string; + region?: string[]; + platform?: string; + availableMemoryMb?: number; + maxInstances?: number; + minInstances?: number; + concurrency?: number; + serviceAccountEmail?: string; + timeoutSeconds?: number; + vpc?: { + connector: string; + egressSettings?: string; + }; + labels?: Record; + ingressSettings?: string; + environmentVariables?: Record; + + httpsTrigger?: { + invoker?: string[]; + }; + + callableTrigger?: {}; + + eventTrigger?: { + eventFilters: Record; + eventType: string; + retry: boolean; + region?: string; + serviceAccountEmail?: string; + }; + + scheduleTrigger?: { + schedule?: string; + timezone?: string; + retryConfig?: { + retryCount?: number; + maxRetryDuration?: string; + minBackoffDuration?: string; + maxBackoffDuration?: string; + maxDoublings?: number; + }; + }; +} + +/* @internal */ +export interface ManifestRequiredAPI { + api: string; + reason: string; +} + +/** + * @internal + * An definition of a function deployment as appears in the Manifest. + **/ +export interface ManifestStack { + specVersion: 'v1alpha1'; + requiredAPIs: ManifestRequiredAPI[]; + endpoints: Record; +} diff --git a/src/handler-builder.ts b/src/handler-builder.ts index 7ebf78f15..c89f3c936 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -48,16 +48,16 @@ export class HandlerBuilder { /** * Create a handler for HTTPS events. - + * `onRequest` handles an HTTPS request and has the same signature as an Express app. * * @example * ```javascript * exports.myFunction = functions.handler.https.onRequest((req, res) => { ... }) * ``` - * + * * `onCall` declares a callable function for clients to call using a Firebase SDK. - * + * * @example * ```javascript * exports.myFunction = functions.handler.https.onCall((data, context) => { ... }) @@ -70,6 +70,8 @@ export class HandlerBuilder { ): HttpsFunction => { const func = https._onRequestWithOptions(handler, {}); func.__trigger = {}; + func.__endpoint = undefined; + func.__requiredAPIs = undefined; return func; }, onCall: ( @@ -80,6 +82,8 @@ export class HandlerBuilder { ): HttpsFunction => { const func = https._onCallWithOptions(handler, {}); func.__trigger = {}; + func.__endpoint = undefined; + func.__requiredAPIs = undefined; return func; }, /** @hidden */ @@ -94,6 +98,8 @@ export class HandlerBuilder { const builder = new https.TaskQueueBuilder(); const func = builder.onDispatch(handler); func.__trigger = {}; + func.__endpoint = undefined; + func.__requiredAPIs = undefined; return func; }, }; @@ -103,21 +109,21 @@ export class HandlerBuilder { /** * Create a handler for Firebase Realtime Database events. - * + * * `ref.onCreate` handles the creation of new data. - * + * * @example * ```javascript * exports.myFunction = functions.handler.database.ref.onCreate((snap, context) => { ... }) * ``` - * + * * `ref.onUpdate` handles updates to existing data. - * + * * @example * ```javascript * exports.myFunction = functions.handler.database.ref.onUpdate((change, context) => { ... }) * ``` - + * `ref.onDelete` handles the deletion of existing data. * * @example @@ -150,21 +156,21 @@ export class HandlerBuilder { /** * Create a handler for Cloud Firestore events. - * + * * `document.onCreate` handles the creation of new documents. - * + * * @example * ```javascript * exports.myFunction = functions.handler.firestore.document.onCreate((snap, context) => { ... }) * ``` - + * `document.onUpdate` handles updates to existing documents. * * @example * ```javascript * exports.myFunction = functions.handler.firestore.document.onUpdate((change, context) => { ... }) * ``` - + * `document.onDelete` handles the deletion of existing documents. * * @example @@ -172,7 +178,7 @@ export class HandlerBuilder { * exports.myFunction = functions.handler.firestore.document.onDelete((snap, context) => * { ... }) * ``` - + * `document.onWrite` handles the creation, update, or deletion of documents. * * @example @@ -201,7 +207,7 @@ export class HandlerBuilder { * Create a handler for Firebase Remote Config events. * `remoteConfig.onUpdate` handles events that update a Remote Config template. - + * @example * ```javascript * exports.myFunction = functions.handler.remoteConfig.onUpdate() => { ... }) @@ -222,9 +228,9 @@ export class HandlerBuilder { /** * Create a handler for Google Analytics events. - + * `event.onLog` handles the logging of Analytics conversion events. - + * @example * ```javascript * exports.myFunction = functions.handler.analytics.event.onLog((event) => { ... }) @@ -240,21 +246,21 @@ export class HandlerBuilder { /** * Create a handler for Cloud Storage for Firebase events. - * + * * `object.onArchive` handles the archiving of Storage objects. - * + * * @example * ```javascript * exports.myFunction = functions.handler.storage.object.onArchive((object) => { ... }) * ``` - + * `object.onDelete` handles the deletion of Storage objects. * * @example * ```javascript * exports.myFunction = functions.handler.storage.object.onDelete((object) => { ... }) * ``` - + * `object.onFinalize` handles the creation of Storage objects. * * @example @@ -262,7 +268,7 @@ export class HandlerBuilder { * exports.myFunction = functions.handler.storage.object.onFinalize((object) => * { ... }) * ``` - + * `object.onMetadataUpdate` handles changes to the metadata of existing Storage objects. * * @example @@ -285,16 +291,16 @@ export class HandlerBuilder { /** * Create a handler for Cloud Pub/Sub events. - * - * `topic.onPublish` handles messages published to a Pub/Sub topic from SDKs, Cloud Console, or gcloud CLI. - * + * + * `topic.onPublish` handles messages published to a Pub/Sub topic from SDKs, Cloud Console, or gcloud CLI. + * * @example * ```javascript * exports.myFunction = functions.handler.pubsub.topic.onPublish((message) => { ... }) * ``` - + * `schedule.onPublish` handles messages published to a Pub/Sub topic on a schedule. - * + * * @example * ```javascript * exports.myFunction = functions.handler.pubsub.schedule.onPublish((message) => { ... }) @@ -313,21 +319,21 @@ export class HandlerBuilder { /** * Create a handler for Firebase Authentication events. - * + * * `user.onCreate` handles the creation of users. - * + * * @example * ```javascript * exports.myFunction = functions.handler.auth.user.onCreate((user) => { ... }) * ``` - + * `user.onDelete` handles the deletion of users. * * @example * ```javascript * exports.myFunction = functions.handler.auth.user.onDelete((user => { ... }) * ``` - + */ get auth() { return { @@ -341,7 +347,7 @@ export class HandlerBuilder { * Create a handler for Firebase Test Lab events. * `testMatrix.onComplete` handles the completion of a test matrix. - + * @example * ```javascript * exports.myFunction = functions.handler.testLab.testMatrix.onComplete((testMatrix) => { ... }) diff --git a/src/providers/https.ts b/src/providers/https.ts index ecefd6c29..8ab072e78 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -22,12 +22,18 @@ import * as express from 'express'; -import { HttpsFunction, optionsToTrigger, Runnable } from '../cloud-functions'; +import { + HttpsFunction, + optionsToEndpoint, + optionsToTrigger, + Runnable, +} from '../cloud-functions'; import { convertIfPresent, convertInvoker, copyIfPresent, } from '../common/encoding'; +import { ManifestEndpoint, ManifestRequiredAPI } from '../common/manifest'; import { CallableContext, FunctionsErrorCode, @@ -96,6 +102,8 @@ export interface TaskQueueOptions { export interface TaskQueueFunction { (req: Request, res: express.Response): Promise; __trigger: unknown; + __endpoint: ManifestEndpoint; + __requiredAPIs?: ManifestRequiredAPI[]; run(data: any, context: TaskContext): void | Promise; } @@ -131,6 +139,28 @@ export class TaskQueueBuilder { convertInvoker ); + func.__endpoint = { + platform: 'gcfv1', + ...optionsToEndpoint(this.depOpts), + taskQueueTrigger: {}, + }; + copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig'); + copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits'); + convertIfPresent( + func.__endpoint.taskQueueTrigger, + this.tqOpts, + 'invoker', + 'invoker', + convertInvoker + ); + + func.__requiredAPIs = [ + { + api: 'cloudtasks.googleapis.com', + reason: 'Needed for v1 task queue functions', + }, + ]; + func.run = handler; return func; @@ -167,6 +197,19 @@ export function _onRequestWithOptions( convertInvoker ); // TODO parse the options + + cloudFunction.__endpoint = { + platform: 'gcfv1', + ...optionsToEndpoint(options), + httpsTrigger: {}, + }; + convertIfPresent( + cloudFunction.__endpoint.httpsTrigger, + options, + 'invoker', + 'invoker', + convertInvoker + ); return cloudFunction; } @@ -195,6 +238,13 @@ export function _onCallWithOptions( }; func.__trigger.labels['deployment-callable'] = 'true'; + func.__endpoint = { + platform: 'gcfv1', + labels: {}, + ...optionsToEndpoint(options), + callableTrigger: {}, + }; + func.run = handler; return func; diff --git a/src/v2/core.ts b/src/v2/core.ts index d471c107b..c790be7a8 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -20,6 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { ManifestEndpoint } from '../common/manifest'; + /** @internal */ export interface TriggerAnnotation { concurrency?: number; @@ -91,7 +93,8 @@ export interface CloudEvent { export interface CloudFunction { (raw: CloudEvent): any | Promise; - __trigger: unknown; + __trigger?: unknown; + __endpoint: ManifestEndpoint; run(event: CloudEvent): any | Promise; } diff --git a/src/v2/options.ts b/src/v2/options.ts index 0b2238a9f..7db01167e 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -21,14 +21,16 @@ // SOFTWARE. import { + convertIfPresent, + copyIfPresent, durationFromSeconds, serviceAccountFromShorthand, } from '../common/encoding'; -import { convertIfPresent, copyIfPresent } from '../common/encoding'; import * as logger from '../logger'; import { TriggerAnnotation } from './core'; import { declaredParams } from './params'; import { ParamSpec } from './params/types'; +import { ManifestEndpoint } from '../common/manifest'; /** * List of all regions supported by Cloud Functions v2 @@ -284,6 +286,52 @@ export function optionsToTriggerAnnotations( return annotation; } +/** + * Apply GlobalOptions to endpoint manifest. + * @internal + */ +export function optionsToEndpoint( + opts: GlobalOptions | EventHandlerOptions +): ManifestEndpoint { + const endpoint: ManifestEndpoint = {}; + copyIfPresent( + endpoint, + opts, + 'concurrency', + 'minInstances', + 'maxInstances', + 'ingressSettings', + 'labels', + 'timeoutSeconds' + ); + convertIfPresent(endpoint, opts, 'serviceAccountEmail', 'serviceAccount'); + if (opts.vpcConnector) { + const vpc: ManifestEndpoint['vpc'] = { connector: opts.vpcConnector }; + convertIfPresent(vpc, opts, 'egressSettings', 'vpcConnectorEgressSettings'); + endpoint.vpc = vpc; + } + convertIfPresent(endpoint, opts, 'availableMemoryMb', 'memory', (mem) => { + const memoryLookup = { + '128MB': 128, + '256MB': 256, + '512MB': 512, + '1GB': 1024, + '2GB': 2048, + '4GB': 4096, + '8GB': 8192, + }; + return memoryLookup[mem]; + }); + convertIfPresent(endpoint, opts, 'region', 'region', (region) => { + if (typeof region === 'string') { + return [region]; + } + return region; + }); + + return endpoint; +} + /** * @hidden */ diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 43556a1ba..292c7cf0e 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -28,6 +28,7 @@ import { copyIfPresent, } from '../../common/encoding'; +import * as options from '../options'; import { CallableRequest, FunctionsErrorCode, @@ -39,7 +40,7 @@ import { TaskRequest, TaskRetryConfig, } from '../../common/providers/https'; -import * as options from '../options'; +import { ManifestEndpoint } from '../../common/manifest'; export { Request, @@ -74,7 +75,10 @@ export interface TaskQueueOptions extends options.GlobalOptions { export type HttpsFunction = (( req: Request, res: express.Response -) => void | Promise) & { __trigger: unknown }; +) => void | Promise) & { + __trigger?: unknown; + __endpoint: ManifestEndpoint; +}; export interface CallableFunction extends HttpsFunction { run(data: CallableRequest): Return; } @@ -126,6 +130,7 @@ export function onRequest( }); }; } + Object.defineProperty(handler, '__trigger', { get: () => { const baseOpts = options.optionsToTriggerAnnotations( @@ -161,6 +166,30 @@ export function onRequest( return trigger; }, }); + + 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 as options.GlobalOptions); + const endpoint: Partial = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + httpsTrigger: {}, + }; + convertIfPresent( + endpoint.httpsTrigger, + opts, + 'invoker', + 'invoker', + convertInvoker + ); + (handler as HttpsFunction).__endpoint = endpoint; + return handler as HttpsFunction; } @@ -222,6 +251,21 @@ export function onCall>( }, }); + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + // global options calls region a scalar and https allows it to be an array, + // but optionsToManifestEndpoint handles both cases. + const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions); + func.__endpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + callableTrigger: {}, + }; + func.run = handler; return func; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index cca25b294..a751f0cd2 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -1,5 +1,7 @@ -import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +import { CloudEvent, CloudFunction } from '../core'; +import { copyIfPresent } from '../../common/encoding'; +import { ManifestEndpoint } from '../../common/manifest'; /** * Interface representing a Google Cloud Pub/Sub message. @@ -133,11 +135,6 @@ export function onMessagePublished( func.run = handler; - // TypeScript doesn't recongize defineProperty as adding a property and complains - // that __trigger doesn't exist. We can either cast to any and lose all type safety - // or we can just assign a meaningless value before calling defineProperty. - func.__trigger = 'silence the transpiler'; - Object.defineProperty(func, '__trigger', { get: () => { const baseOpts = options.optionsToTriggerAnnotations( @@ -164,5 +161,25 @@ export function onMessagePublished( }, }); + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + const specificOpts = options.optionsToEndpoint(opts); + + const endpoint: ManifestEndpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType: 'google.cloud.pubsub.topic.v1.messagePublished', + eventFilters: { topic }, + retry: false, + }, + }; + copyIfPresent(endpoint.eventTrigger, opts, 'retry', 'retry'); + func.__endpoint = endpoint; + return func; } diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index e58405820..e03115df0 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -20,9 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import * as options from '../options'; import { firebaseConfig } from '../../config'; import { CloudEvent, CloudFunction } from '../core'; -import * as options from '../options'; +import { copyIfPresent } from '../../common/encoding'; +import { ManifestEndpoint } from '../../common/manifest'; /** * An object within Google Cloud Storage. @@ -313,11 +315,6 @@ export function onOperation( func.run = handler; - // TypeScript doesn't recongize defineProperty as adding a property and complains - // that __trigger doesn't exist. We can either cast to any and lose all type safety - // or we can just assign a meaningless value before calling defineProperty. - func.__trigger = 'silence the transpiler'; - Object.defineProperty(func, '__trigger', { get: () => { const baseOpts = options.optionsToTriggerAnnotations( @@ -341,6 +338,39 @@ export function onOperation( }, }); + // TypeScript doesn't recognize defineProperty as adding a property and complains + // that __endpoint doesn't exist. We can either cast to any and lose all type safety + // or we can just assign a meaningless value before calling defineProperty. + func.__endpoint = {} as ManifestEndpoint; + + // SDK may attempt to read FIREBASE_CONFIG env var to fetch the default bucket name. + // To prevent runtime errors when FIREBASE_CONFIG env var is missing, we use getters. + Object.defineProperty(func, '__endpoint', { + get: () => { + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + const specificOpts = options.optionsToEndpoint(opts); + + const endpoint: ManifestEndpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType: eventType, + eventFilters: { + bucket, + }, + retry: false, + }, + }; + copyIfPresent(endpoint.eventTrigger, opts, 'retry', 'retry'); + return endpoint; + }, + }); + return func; } From 7645a69ce120af0b6827a1ed89cdac606385ad33 Mon Sep 17 00:00:00 2001 From: Andrew Hopkins Date: Fri, 21 Jan 2022 01:36:01 +1000 Subject: [PATCH 378/705] Check for missing options / databaseURL on emulator start (#1016) When using firebase emulators Realtime Database throws an error due to app.options not existing. I've found adding an extra check to the database constructor stops this error, and results in the emulator starting up correctly. --- CHANGELOG.md | 1 + src/providers/database.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d6230214..2c8c9b14f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Parallelizes network calls that occur when validating authorization for onCall handlers. - Adds new regions to V2 API +- Fixes bug where the emulator crashed when given app without an `options` property. diff --git a/src/providers/database.ts b/src/providers/database.ts index 76252d515..53eb9ba12 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -369,7 +369,7 @@ export class DataSnapshot { private app?: firebase.app.App, instance?: string ) { - if (app && app.options.databaseURL.startsWith('http:')) { + if (app?.options?.databaseURL?.startsWith('http:')) { // In this case we're dealing with an emulator this.instance = app.options.databaseURL; } else if (instance) { From 8e21f77a3d5022963f0d83adf6a97fb55fa3c95d Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Mon, 31 Jan 2022 16:28:11 -0500 Subject: [PATCH 379/705] Generic interface for provider enhancement (#1020) (#1024) * breaking out general interface * cleaning up exports * removing comments & references to specific interfaces * format * jsdoc comments * address pr comments * added param comment * addressing comments * Specific interface for provider enhancement (1/3) (#1021) * adding in app distro changes * removing comments & addings package refs * jsdoc comments * fix comments * adding periods to doc strings * fix wording * adding import/export statement * Specific interface for provider enhancement (2/3) (#1022) * adding in billing changes * removing comments & adding package refs * jsdoc comments * addressing pr comments * change handler doc string * changing to BillingEventHandler type * remove BillingEventHandler type * Specific interface for provider enhancement (3/3) (#1023) * adding in crashlytics changes * comments & adding package refs * address comments and make doc strings better * add opts.retry to event trigger --- CHANGELOG.md | 1 + package.json | 18 +- spec/v2/providers/alerts/alerts.spec.ts | 183 ++++++ .../providers/alerts/appDistribution.spec.ts | 127 ++++ spec/v2/providers/alerts/billing.spec.ts | 126 ++++ spec/v2/providers/alerts/crashlytics.spec.ts | 562 ++++++++++++++++++ src/v2/core.ts | 8 +- src/v2/index.ts | 3 +- src/v2/providers/alerts/alerts.ts | 127 ++++ src/v2/providers/alerts/appDistribution.ts | 107 ++++ src/v2/providers/alerts/billing.ts | 110 ++++ src/v2/providers/alerts/crashlytics.ts | 360 +++++++++++ src/v2/providers/alerts/index.ts | 6 + src/v2/providers/storage.ts | 2 +- v2/alerts/appDistribution.js | 26 + v2/alerts/billing.js | 26 + v2/alerts/crashlytics.js | 26 + v2/alerts/index.js | 26 + 18 files changed, 1839 insertions(+), 5 deletions(-) create mode 100644 spec/v2/providers/alerts/alerts.spec.ts create mode 100644 spec/v2/providers/alerts/appDistribution.spec.ts create mode 100644 spec/v2/providers/alerts/billing.spec.ts create mode 100644 spec/v2/providers/alerts/crashlytics.spec.ts create mode 100644 src/v2/providers/alerts/alerts.ts create mode 100644 src/v2/providers/alerts/appDistribution.ts create mode 100644 src/v2/providers/alerts/billing.ts create mode 100644 src/v2/providers/alerts/crashlytics.ts create mode 100644 src/v2/providers/alerts/index.ts create mode 100644 v2/alerts/appDistribution.js create mode 100644 v2/alerts/billing.js create mode 100644 v2/alerts/crashlytics.js create mode 100644 v2/alerts/index.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c8c9b14f..a909dbdbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ - Parallelizes network calls that occur when validating authorization for onCall handlers. - Adds new regions to V2 API - Fixes bug where the emulator crashed when given app without an `options` property. +- Adds new alerting providers diff --git a/package.json b/package.json index 50637bb74..0be8d9ef9 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,11 @@ "./v2/https": "./lib/v2/providers/https.js", "./v2/params": "./lib/v2/params/index.js", "./v2/pubsub": "./lib/v2/providers/pubsub.js", - "./v2/storage": "./lib/v2/providers/storage.js" + "./v2/storage": "./lib/v2/providers/storage.js", + "./v2/alerts": "./lib/v2/providers/alerts/index.js", + "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js", + "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", + "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js" }, "typesVersions": { "*": { @@ -114,6 +118,18 @@ ], "v2/storage": [ "lib/v2/providers/storage" + ], + "v2/alerts": [ + "lib/v2/providers/alerts" + ], + "v2/alerts/appDistribution": [ + "lib/v2/providers/alerts/appDistribution" + ], + "v2/alerts/billing": [ + "lib/v2/providers/alerts/billing" + ], + "v2/alerts/crashlytics": [ + "lib/v2/providers/alerts/crashlytics" ] } }, diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts new file mode 100644 index 000000000..b63f567aa --- /dev/null +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -0,0 +1,183 @@ +import { expect } from 'chai'; +import * as options from '../../../../src/v2/options'; +import * as alerts from '../../../../src/v2/providers/alerts'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; + +const ALERT_TYPE = 'new-alert-type'; +const APPID = '123456789'; + +describe('alerts', () => { + describe('onAlertPublished', () => { + it('should create the function without opts', () => { + const result = alerts.onAlertPublished(ALERT_TYPE, () => 42); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should create the function with opts', () => { + const result = alerts.onAlertPublished( + { + ...FULL_OPTIONS, + alertType: ALERT_TYPE, + appId: APPID, + }, + () => 42 + ); + + expect(result.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should have a .run method', () => { + const func = alerts.onAlertPublished(ALERT_TYPE, (event) => event); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); + + describe('getEndpointAnnotation', () => { + beforeEach(() => { + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + options.setGlobalOptions({}); + delete process.env.GCLOUD_PROJECT; + }); + + it('should define the endpoint without appId and opts', () => { + expect(alerts.getEndpointAnnotation({}, ALERT_TYPE)).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should define a complex endpoint without appId', () => { + expect( + alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE) + ).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should define a complex endpoint', () => { + expect( + alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE, APPID) + ).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should merge global & specific opts', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + const specificOpts = { + region: 'us-west1', + minInstances: 3, + }; + + expect( + alerts.getEndpointAnnotation(specificOpts, ALERT_TYPE, APPID) + ).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + concurrency: 20, + region: ['us-west1'], + minInstances: 3, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('getOptsAndAlertTypeAndApp', () => { + it('should parse a string', () => { + const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp( + ALERT_TYPE + ); + + expect(opts).to.deep.equal({}); + expect(alertType).to.equal(ALERT_TYPE); + expect(appId).to.be.undefined; + }); + + it('should parse an options object without appId', () => { + const myOpts: alerts.FirebaseAlertOptions = { + alertType: ALERT_TYPE, + region: 'us-west1', + }; + + const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(alertType).to.equal(myOpts.alertType); + expect(appId).to.be.undefined; + }); + + it('should parse an options object with appId', () => { + const myOpts: alerts.FirebaseAlertOptions = { + alertType: ALERT_TYPE, + appId: APPID, + region: 'us-west1', + }; + + const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(alertType).to.equal(myOpts.alertType); + expect(appId).to.be.equal(myOpts.appId); + }); + }); +}); diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts new file mode 100644 index 000000000..52fdfd3b9 --- /dev/null +++ b/spec/v2/providers/alerts/appDistribution.spec.ts @@ -0,0 +1,127 @@ +import { expect } from 'chai'; +import * as alerts from '../../../../src/v2/providers/alerts'; +import * as appDistribution from '../../../../src/v2/providers/alerts/appDistribution'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; + +const APPID = '123456789'; +const myHandler = () => 42; + +describe('appDistribution', () => { + describe('onNewTesterIosDevicePublished', () => { + it('should create a function with alertType & appId', () => { + const func = appDistribution.onNewTesterIosDevicePublished( + APPID, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: appDistribution.newTesterIosDeviceAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = appDistribution.onNewTesterIosDevicePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: appDistribution.newTesterIosDeviceAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appid in opts', () => { + const func = appDistribution.onNewTesterIosDevicePublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: appDistribution.newTesterIosDeviceAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function without opts or appId', () => { + const func = appDistribution.onNewTesterIosDevicePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: appDistribution.newTesterIosDeviceAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with a run method', () => { + const func = appDistribution.onNewTesterIosDevicePublished( + APPID, + (event) => event + ); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); + + describe('getOptsAndApp', () => { + it('should parse a string', () => { + const [opts, appId] = appDistribution.getOptsAndApp(APPID); + + expect(opts).to.deep.equal({}); + expect(appId).to.equal(APPID); + }); + + it('should parse an options object without appId', () => { + const myOpts: appDistribution.AppDistributionOptions = { + region: 'us-west1', + }; + + const [opts, appId] = appDistribution.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.be.undefined; + }); + + it('should parse an options object with appId', () => { + const myOpts: appDistribution.AppDistributionOptions = { + appId: APPID, + region: 'us-west1', + }; + + const [opts, appId] = appDistribution.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.equal(APPID); + }); + }); +}); diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts new file mode 100644 index 000000000..a9e4e173d --- /dev/null +++ b/spec/v2/providers/alerts/billing.spec.ts @@ -0,0 +1,126 @@ +import { expect } from 'chai'; +import * as alerts from '../../../../src/v2/providers/alerts'; +import * as billing from '../../../../src/v2/providers/alerts/billing'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; + +const ALERT_TYPE = 'new-alert-type'; +const myHandler = () => 42; + +describe('billing', () => { + describe('onPlanUpdatePublished', () => { + it('should create a function with only handler', () => { + const func = billing.onPlanUpdatePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: billing.planUpdateAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts & handler', () => { + const func = billing.onPlanUpdatePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: billing.planUpdateAlert, + }, + retry: false, + }, + }); + }); + }); + + describe('onAutomatedPlanUpdatePublished', () => { + it('should create a function with only handler', () => { + const func = billing.onAutomatedPlanUpdatePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: billing.automatedPlanUpdateAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts & handler', () => { + const func = billing.onAutomatedPlanUpdatePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: billing.automatedPlanUpdateAlert, + }, + retry: false, + }, + }); + }); + }); + + describe('onOperation', () => { + it('should create a function with alertType only', () => { + const func = billing.onOperation(ALERT_TYPE, myHandler, undefined); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = billing.onOperation( + ALERT_TYPE, + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should create a function with a run method', () => { + const func = billing.onOperation(ALERT_TYPE, (event) => event, undefined); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); +}); diff --git a/spec/v2/providers/alerts/crashlytics.spec.ts b/spec/v2/providers/alerts/crashlytics.spec.ts new file mode 100644 index 000000000..1d5c1a8b6 --- /dev/null +++ b/spec/v2/providers/alerts/crashlytics.spec.ts @@ -0,0 +1,562 @@ +import { expect } from 'chai'; +import * as alerts from '../../../../src/v2/providers/alerts'; +import * as crashlytics from '../../../../src/v2/providers/alerts/crashlytics'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; + +const ALERT_TYPE = 'new-alert-type'; +const APPID = '123456789'; +const myHandler = () => 42; + +describe('crashlytics', () => { + describe('onNewFatalIssuePublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onNewFatalIssuePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newFatalIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onNewFatalIssuePublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newFatalIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onNewFatalIssuePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newFatalIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onNewFatalIssuePublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newFatalIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onNewNonfatalIssuePublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onNewNonfatalIssuePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newNonfatalIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onNewNonfatalIssuePublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newNonfatalIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onNewNonfatalIssuePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newNonfatalIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onNewNonfatalIssuePublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newNonfatalIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onRegressionAlertPublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onRegressionAlertPublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.regressionAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onRegressionAlertPublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.regressionAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onRegressionAlertPublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.regressionAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onRegressionAlertPublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.regressionAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onStabilityDigestPublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onStabilityDigestPublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.stabilityDigestAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onStabilityDigestPublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.stabilityDigestAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onStabilityDigestPublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.stabilityDigestAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onStabilityDigestPublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.stabilityDigestAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onVelocityAlertPublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onVelocityAlertPublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.velocityAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onVelocityAlertPublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.velocityAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onVelocityAlertPublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.velocityAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onVelocityAlertPublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.velocityAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onNewAnrIssuePublished', () => { + it('should create a function only handler', () => { + const func = crashlytics.onNewAnrIssuePublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newAnrIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appId', () => { + const func = crashlytics.onNewAnrIssuePublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newAnrIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onNewAnrIssuePublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newAnrIssueAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = crashlytics.onNewAnrIssuePublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: crashlytics.newAnrIssueAlert, + appId: APPID, + }, + retry: false, + }, + }); + }); + }); + + describe('onOperation', () => { + it('should create a function with alertType only', () => { + const func = crashlytics.onOperation(ALERT_TYPE, myHandler, undefined); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should create a function with alertType & appId', () => { + const func = crashlytics.onOperation(ALERT_TYPE, APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with base opts', () => { + const func = crashlytics.onOperation( + ALERT_TYPE, + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + }, + retry: false, + }, + }); + }); + + it('should create a function with appid in opts', () => { + const func = crashlytics.onOperation( + ALERT_TYPE, + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alertType: ALERT_TYPE, + appId: APPID, + }, + retry: false, + }, + }); + }); + + it('should create a function with a run method', () => { + const func = crashlytics.onOperation( + ALERT_TYPE, + (event) => event, + undefined + ); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); + + describe('getOptsAndApp', () => { + it('should parse a string', () => { + const APPID = '123456789'; + + const [opts, appId] = crashlytics.getOptsAndApp(APPID); + + expect(opts).to.deep.equal({}); + expect(appId).to.equal(APPID); + }); + + it('should parse an options object without appId', () => { + const myOpts: crashlytics.CrashlyticsOptions = { + region: 'us-west1', + }; + + const [opts, appId] = crashlytics.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.be.undefined; + }); + + it('should parse an options object with appId', () => { + const myOpts: crashlytics.CrashlyticsOptions = { + appId: '123456789', + region: 'us-west1', + }; + + const [opts, appId] = crashlytics.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.equal(myOpts.appId); + }); + }); +}); diff --git a/src/v2/core.ts b/src/v2/core.ts index c790be7a8..845cf2990 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -49,10 +49,10 @@ export interface TriggerAnnotation { } /** - * A CloudEvent is a cross-platform format for encoding a serverless event. + * 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 */ -export interface CloudEvent { +interface CloudEventBase { /** Version of the CloudEvents spec for this event. */ readonly specversion: '1.0'; @@ -89,6 +89,10 @@ export interface CloudEvent { params?: Record; } +/** + * A CloudEvent with custom extension attributes + */ +export type CloudEvent = CloudEventBase & Ext; /** A handler for CloudEvents. */ export interface CloudFunction { (raw: CloudEvent): any | Promise; diff --git a/src/v2/index.ts b/src/v2/index.ts index 5c99a4678..3de9b749f 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -22,11 +22,12 @@ import * as logger from '../logger'; import * as params from './params'; +import * as alerts from './providers/alerts'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; -export { https, pubsub, storage, logger, params }; +export { https, pubsub, storage, logger, params, alerts }; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts new file mode 100644 index 000000000..4b7f0b952 --- /dev/null +++ b/src/v2/providers/alerts/alerts.ts @@ -0,0 +1,127 @@ +import { ManifestEndpoint } from '../../../common/manifest'; +import { CloudEvent, CloudFunction } from '../../core'; +import * as options from '../../options'; + +/** + * The CloudEvent data emitted by Firebase Alerts. + */ +export interface FirebaseAlertData { + createTime: string; + endTime: string; + payload: T; +} + +interface WithAlertTypeAndApp { + alertType: string; + appId?: string; +} +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export type AlertEvent = CloudEvent< + FirebaseAlertData, + WithAlertTypeAndApp +>; + +/** @internal */ +export const eventType = 'firebase.firebasealerts.alerts.v1.published'; + +/** The underlying alert type of the Firebase Alerts provider. */ +export type AlertType = + | 'crashlytics.newFatalIssue' + | 'crashlytics.newNonfatalIssue' + | 'crashlytics.regression' + | 'crashlytics.stabilityDigest' + | 'crashlytics.velocity' + | 'crashlytics.newAnrIssue' + | 'billing.planUpdate' + | 'billing.automatedPlanUpdate' + | 'appDistribution.newTesterIosDevice' + | string; + +/** + * Configuration for Firebase Alert functions. + */ +export interface FirebaseAlertOptions extends options.EventHandlerOptions { + alertType: AlertType; + appId?: string; +} + +/** + * Declares a function that can handle Firebase Alerts from CloudEvents. + * @param alertTypeOrOpts the alert type or Firebase Alert function configuration. + * @param handler a function that can handle the Firebase Alert inside a CloudEvent. + */ +export function onAlertPublished( + alertTypeOrOpts: AlertType | FirebaseAlertOptions, + handler: (event: AlertEvent) => any | Promise +): CloudFunction> { + const [opts, alertType, appId] = getOptsAndAlertTypeAndApp(alertTypeOrOpts); + + const func = (raw: CloudEvent) => { + return handler( + raw as CloudEvent, WithAlertTypeAndApp> + ); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(opts, alertType, appId); + + return func; +} + +/** + * @internal + * Helper function for getting the endpoint annotation used in alert handling functions. + */ +export function getEndpointAnnotation( + opts: options.EventHandlerOptions, + alertType: string, + appId?: string +): ManifestEndpoint { + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + const specificOpts = options.optionsToEndpoint(opts); + const endpoint: ManifestEndpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType, + eventFilters: { + alertType, + }, + retry: !!opts.retry, + }, + }; + if (appId) { + endpoint.eventTrigger.eventFilters.appId = appId; + } + return endpoint; +} + +/** + * @internal + * Helper function to parse the function opts, alert type, and appId. + */ +export function getOptsAndAlertTypeAndApp( + alertTypeOrOpts: AlertType | FirebaseAlertOptions +): [options.EventHandlerOptions, string, string | undefined] { + let opts: options.EventHandlerOptions; + let alertType: AlertType; + let appId: string | undefined; + if (typeof alertTypeOrOpts === 'string') { + alertType = alertTypeOrOpts; + opts = {}; + } else { + alertType = alertTypeOrOpts.alertType; + appId = alertTypeOrOpts.appId; + opts = { ...alertTypeOrOpts }; + delete (opts as any).alertType; + delete (opts as any).appId; + } + return [opts, alertType, appId]; +} diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts new file mode 100644 index 000000000..58b54e9b6 --- /dev/null +++ b/src/v2/providers/alerts/appDistribution.ts @@ -0,0 +1,107 @@ +import { getEndpointAnnotation, FirebaseAlertData } from './alerts'; +import { CloudEvent, CloudFunction } from '../../core'; +import * as options from '../../options'; + +/** + * The internal payload object for adding a new tester device to app distribution. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface NewTesterDevicePayload { + ['@type']: 'com.google.firebase.firebasealerts.NewTesterDevicePayload'; + testerName: string; + testerEmail: string; + testerDeviceModelName: string; + testerDeviceIdentifier: string; +} + +interface WithAlertTypeAndApp { + alertType: string; + appId: string; +} +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export type AppDistributionEvent = CloudEvent< + FirebaseAlertData, + WithAlertTypeAndApp +>; + +/** @internal */ +export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice'; + +/** + * Configuration for app distribution functions. + */ +export interface AppDistributionOptions extends options.EventHandlerOptions { + appId?: string; +} + +/** + * Declares a function that can handle adding a new tester iOS device. + */ +export function onNewTesterIosDevicePublished( + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; +export function onNewTesterIosDevicePublished( + appId: string, + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; +export function onNewTesterIosDevicePublished( + opts: AppDistributionOptions, + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; +export function onNewTesterIosDevicePublished( + appIdOrOptsOrHandler: + | string + | AppDistributionOptions + | (( + event: AppDistributionEvent + ) => any | Promise), + handler?: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction> { + if (typeof appIdOrOptsOrHandler === 'function') { + handler = appIdOrOptsOrHandler as ( + event: AppDistributionEvent + ) => any | Promise; + appIdOrOptsOrHandler = {}; + } + + const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); + + const func = (raw: CloudEvent) => { + return handler(raw as AppDistributionEvent); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(opts, newTesterIosDeviceAlert, appId); + + return func; +} + +/** + * @internal + * Helper function to parse the function opts and appId. + */ +export function getOptsAndApp( + appIdOrOpts: string | AppDistributionOptions +): [options.EventHandlerOptions, string | undefined] { + let opts: options.EventHandlerOptions; + let appId: string | undefined; + if (typeof appIdOrOpts === 'string') { + opts = {}; + appId = appIdOrOpts; + } else { + appId = appIdOrOpts.appId; + opts = { ...appIdOrOpts }; + delete (opts as any).appId; + } + return [opts, appId]; +} diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts new file mode 100644 index 000000000..f2ecd4289 --- /dev/null +++ b/src/v2/providers/alerts/billing.ts @@ -0,0 +1,110 @@ +import { getEndpointAnnotation, FirebaseAlertData } from '.'; +import { CloudEvent, CloudFunction } from '../../core'; +import * as options from '../../options'; + +/** + * The internal payload object for billing plan updates. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface PlanUpdatePayload { + ['@type']: 'com.google.firebase.firebasealerts.PlanUpdatePayload'; + billingPlan: string; + principalEmail: string; +} + +/** + * The internal payload object for billing plan automated updates. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface PlanAutomatedUpdatePayload { + ['@type']: 'com.google.firebase.firebasealerts.PlanAutomatedUpdatePayload'; + billingPlan: string; +} + +interface WithAlertType { + alertType: string; +} +/** + * A custom CloudEvent for billing Firebase Alerts (with custom extension attributes). + */ +export type BillingEvent = CloudEvent, WithAlertType>; + +/** @internal */ +export const planUpdateAlert = 'billing.planUpdate'; +/** @internal */ +export const automatedPlanUpdateAlert = 'billing.automatedPlanUpdate'; + +/** + * Declares a function that can handle a billing plan update event. + */ +export function onPlanUpdatePublished( + handler: (event: BillingEvent) => any | Promise +): CloudFunction>; +export function onPlanUpdatePublished( + opts: options.EventHandlerOptions, + handler: (event: BillingEvent) => any | Promise +): CloudFunction>; +export function onPlanUpdatePublished( + optsOrHandler: + | options.EventHandlerOptions + | ((event: BillingEvent) => any | Promise), + handler?: (event: BillingEvent) => any | Promise +): CloudFunction> { + return onOperation( + planUpdateAlert, + optsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle an automated billing plan update event. + */ +export function onAutomatedPlanUpdatePublished( + handler: ( + event: BillingEvent + ) => any | Promise +): CloudFunction>; +export function onAutomatedPlanUpdatePublished( + opts: options.EventHandlerOptions, + handler: ( + event: BillingEvent + ) => any | Promise +): CloudFunction>; +export function onAutomatedPlanUpdatePublished( + optsOrHandler: + | options.EventHandlerOptions + | ((event: BillingEvent) => any | Promise), + handler?: ( + event: BillingEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + automatedPlanUpdateAlert, + optsOrHandler, + handler + ); +} + +/** @internal */ +export function onOperation( + alertType: string, + optsOrHandler: + | options.EventHandlerOptions + | ((event: BillingEvent) => any | Promise), + handler: (event: BillingEvent) => any | Promise +): CloudFunction> { + if (typeof optsOrHandler === 'function') { + handler = optsOrHandler as (event: BillingEvent) => any | Promise; + optsOrHandler = {}; + } + + const func = (raw: CloudEvent) => { + return handler(raw as BillingEvent); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(optsOrHandler, alertType); + + return func; +} diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts new file mode 100644 index 000000000..d9cece913 --- /dev/null +++ b/src/v2/providers/alerts/crashlytics.ts @@ -0,0 +1,360 @@ +import { getEndpointAnnotation, FirebaseAlertData } from '.'; +import { CloudEvent, CloudFunction } from '../../core'; +import * as options from '../../options'; + +/** Generic crashlytics issue interface */ +interface Issue { + id: string; + title: string; + subtitle: string; + appVersion: string; +} + +/** + * The internal payload object for a new fatal issue. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface NewFatalIssuePayload { + ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsNewFatalIssuePayload'; + issue: Issue; +} + +/** + * The internal payload object for a new non-fatal issue. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface NewNonfatalIssuePayload { + ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsNewNonfatalIssuePayload'; + issue: Issue; +} + +/** + * The internal payload object for a regression alert. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface RegressionAlertPayload { + ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsRegressionAlertPayload'; + type: string; + issue: Issue; + resolveTime: string; +} + +/** Generic crashlytics trending issue interface */ +interface TrendingIssueDetails { + type: string; + issue: Issue; + eventCount: number; + userCount: number; +} + +/** + * The internal payload object for a stability digest. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface StabilityDigestPayload { + ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsStabilityDigestPayload'; + digestDate: string; + trendingIssues: TrendingIssueDetails[]; +} + +/** + * The internal payload object for a velocity alert. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface VelocityAlertPayload { + ['@type']: 'com.google.firebase.firebasealerts.VelocityAlertPayload'; + issue: Issue; + createTime: string; + crashCount: number; + crashPercentage: number; + firstVersion: string; +} + +/** + * The internal payload object for a new Application Not Responding issue. + * Payload is wrapped inside a FirebaseAlertData object. + */ +export interface NewAnrIssuePayload { + ['@type']: 'com.google.firebase.firebasealerts.NewAnrIssuePayload'; + issue: Issue; +} + +interface WithAlertTypeAndApp { + alertType: string; + appId: string; +} +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export type CrashlyticsEvent = CloudEvent< + FirebaseAlertData, + WithAlertTypeAndApp +>; + +/** @internal */ +export const newFatalIssueAlert = 'crashlytics.newFatalIssue'; +/** @internal */ +export const newNonfatalIssueAlert = 'crashlytics.newNonfatalIssue'; +/** @internal */ +export const regressionAlert = 'crashlytics.regression'; +/** @internal */ +export const stabilityDigestAlert = 'crashlytics.stabilityDigest'; +/** @internal */ +export const velocityAlert = 'crashlytics.velocity'; +/** @internal */ +export const newAnrIssueAlert = 'crashlytics.newAnrIssue'; + +/** + * Configuration for crashlytics functions. + */ +export interface CrashlyticsOptions extends options.EventHandlerOptions { + appId?: string; +} + +/** + * Declares a function that can handle a new fatal issue published to crashlytics. + */ +export function onNewFatalIssuePublished( + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewFatalIssuePublished( + appId: string, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewFatalIssuePublished( + opts: CrashlyticsOptions, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewFatalIssuePublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler?: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + newFatalIssueAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle aa new non-fatal issue published to crashlytics. + */ +export function onNewNonfatalIssuePublished( + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onNewNonfatalIssuePublished( + appId: string, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onNewNonfatalIssuePublished( + opts: CrashlyticsOptions, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onNewNonfatalIssuePublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | (( + event: CrashlyticsEvent + ) => any | Promise), + handler?: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + newNonfatalIssueAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle a regression alert published to crashlytics. + */ +export function onRegressionAlertPublished( + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onRegressionAlertPublished( + appId: string, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onRegressionAlertPublished( + opts: CrashlyticsOptions, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onRegressionAlertPublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler?: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + regressionAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle a stability digest published to crashlytics. + */ +export function onStabilityDigestPublished( + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onStabilityDigestPublished( + appId: string, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onStabilityDigestPublished( + opts: CrashlyticsOptions, + handler: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction>; +export function onStabilityDigestPublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler?: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + stabilityDigestAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle a velocity alert published to crashlytics. + */ +export function onVelocityAlertPublished( + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onVelocityAlertPublished( + appId: string, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onVelocityAlertPublished( + opts: CrashlyticsOptions, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onVelocityAlertPublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler?: ( + event: CrashlyticsEvent + ) => any | Promise +): CloudFunction> { + return onOperation( + velocityAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** + * Declares a function that can handle a new Application Not Responding issue published to crashlytics. + */ +export function onNewAnrIssuePublished( + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewAnrIssuePublished( + appId: string, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewAnrIssuePublished( + opts: CrashlyticsOptions, + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction>; +export function onNewAnrIssuePublished( + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler?: (event: CrashlyticsEvent) => any | Promise +): CloudFunction> { + return onOperation( + newAnrIssueAlert, + appIdOrOptsOrHandler, + handler + ); +} + +/** @internal */ +export function onOperation( + alertType: string, + appIdOrOptsOrHandler: + | string + | CrashlyticsOptions + | ((event: CrashlyticsEvent) => any | Promise), + handler: (event: CrashlyticsEvent) => any | Promise +): CloudFunction> { + if (typeof appIdOrOptsOrHandler === 'function') { + handler = appIdOrOptsOrHandler as ( + event: CrashlyticsEvent + ) => any | Promise; + appIdOrOptsOrHandler = {}; + } + + const [opts, appId] = getOptsAndApp( + appIdOrOptsOrHandler as string | CrashlyticsOptions + ); + + const func = (raw: CloudEvent) => { + return handler(raw as CrashlyticsEvent); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(opts, alertType, appId); + + return func; +} + +/** + * @internal + * Helper function to parse the function opts and appId. + */ +export function getOptsAndApp( + appIdOrOpts: string | CrashlyticsOptions +): [options.EventHandlerOptions, string | undefined] { + let opts: options.EventHandlerOptions; + let appId: string | undefined; + if (typeof appIdOrOpts === 'string') { + opts = {}; + appId = appIdOrOpts; + } else { + appId = appIdOrOpts.appId; + opts = { ...appIdOrOpts }; + delete (opts as any).appId; + } + return [opts, appId]; +} diff --git a/src/v2/providers/alerts/index.ts b/src/v2/providers/alerts/index.ts new file mode 100644 index 000000000..ecf90a422 --- /dev/null +++ b/src/v2/providers/alerts/index.ts @@ -0,0 +1,6 @@ +import * as appDistribution from './appDistribution'; +import * as billing from './billing'; +import * as crashlytics from './crashlytics'; + +export { appDistribution, billing, crashlytics }; +export * from './alerts'; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index e03115df0..d07e1955a 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -359,7 +359,7 @@ export function onOperation( ...specificOpts?.labels, }, eventTrigger: { - eventType: eventType, + eventType, eventFilters: { bucket, }, diff --git a/v2/alerts/appDistribution.js b/v2/alerts/appDistribution.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/alerts/appDistribution.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/alerts/billing.js b/v2/alerts/billing.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/alerts/billing.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/alerts/crashlytics.js b/v2/alerts/crashlytics.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/alerts/crashlytics.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/alerts/index.js b/v2/alerts/index.js new file mode 100644 index 000000000..7d725acc3 --- /dev/null +++ b/v2/alerts/index.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From f3ed26169030cf35331da870d7d204c770cf5875 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 2 Feb 2022 05:21:05 -0800 Subject: [PATCH 380/705] Firebase Functions ships with a binary (#1003) We introduce a bin associated with the firebase-functions SDK! The binary exposes a simple server on localhost that describes the Firebase Functions defined in the current directory: ``` $ STACK_CONTROL_API_PORT=8181 npx firebase-functions # Optionally can pass in a FUNCTIONS_DIR as first arg Serving at port 8181 $ curl localhost:8181/__/stack.yaml | jq { "endpoints": { "onreqv2": { "platform": "gcfv2", "labels": {}, "httpsTrigger": {}, "entryPoint": "onreqv2" }, "onRequest": { "platform": "gcfv1", "httpsTrigger": {}, "entryPoint": "onRequest" } }, "specVersion": "v1alpha1", "requiredAPIs": [] } ``` --- .github/workflows/test.yaml | 2 +- package-lock.json | 109 +++++- package.json | 4 + spec/fixtures/sources/commonjs-grouped/g1.js | 9 + .../sources/commonjs-grouped/index.js | 20 + .../sources/commonjs-grouped/package.json | 3 + .../sources/commonjs-main/functions.js | 18 + .../sources/commonjs-main/package.json | 4 + spec/fixtures/sources/commonjs/index.js | 18 + spec/fixtures/sources/commonjs/package.json | 3 + spec/fixtures/sources/esm-ext/index.mjs | 18 + spec/fixtures/sources/esm-ext/package.json | 4 + spec/fixtures/sources/esm-main/functions.js | 18 + spec/fixtures/sources/esm-main/package.json | 5 + spec/fixtures/sources/esm/index.js | 18 + spec/fixtures/sources/esm/package.json | 4 + spec/runtime/loader.spec.ts | 348 ++++++++++++++++++ spec/v1/providers/analytics.spec.ts | 2 +- src/bin/firebase-functions.ts | 56 +++ src/providers/https.ts | 2 +- src/runtime/loader.ts | 119 ++++++ src/runtime/manifest.ts | 85 +++++ src/v2/core.ts | 2 +- src/v2/options.ts | 2 +- src/v2/params/types.ts | 8 +- src/v2/providers/https.ts | 2 +- src/v2/providers/pubsub.ts | 2 +- src/v2/providers/storage.ts | 2 +- tsconfig.release.json | 3 +- 29 files changed, 872 insertions(+), 18 deletions(-) create mode 100644 spec/fixtures/sources/commonjs-grouped/g1.js create mode 100644 spec/fixtures/sources/commonjs-grouped/index.js create mode 100644 spec/fixtures/sources/commonjs-grouped/package.json create mode 100644 spec/fixtures/sources/commonjs-main/functions.js create mode 100644 spec/fixtures/sources/commonjs-main/package.json create mode 100644 spec/fixtures/sources/commonjs/index.js create mode 100644 spec/fixtures/sources/commonjs/package.json create mode 100644 spec/fixtures/sources/esm-ext/index.mjs create mode 100644 spec/fixtures/sources/esm-ext/package.json create mode 100644 spec/fixtures/sources/esm-main/functions.js create mode 100644 spec/fixtures/sources/esm-main/package.json create mode 100644 spec/fixtures/sources/esm/index.js create mode 100644 spec/fixtures/sources/esm/package.json create mode 100644 spec/runtime/loader.spec.ts create mode 100644 src/bin/firebase-functions.ts create mode 100644 src/runtime/loader.ts create mode 100644 src/runtime/manifest.ts diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c56d65e12..4160a1eb3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -31,4 +31,4 @@ jobs: - run: npm install - run: npm run lint - run: npm run format - - run: npm run test + - run: npm run build && npm run test diff --git a/package-lock.json b/package-lock.json index 45768bc71..05b89532d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,9 @@ "express": "^4.17.1", "lodash": "^4.17.14" }, + "bin": { + "firebase-functions": "lib/bin/firebase-functions.js" + }, "devDependencies": { "@types/chai": "^4.1.7", "@types/chai-as-promised": "^7.1.0", @@ -37,6 +40,7 @@ "mz": "^2.7.0", "nock": "^10.0.6", "prettier": "^1.18.2", + "semver": "^7.3.5", "sinon": "^7.3.2", "ts-node": "^8.3.0", "tslint": "^5.18.0", @@ -2994,6 +2998,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -3723,6 +3736,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/nock/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/node-environment-flags": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", @@ -4439,14 +4461,38 @@ } }, "node_modules/semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { - "semver": "bin/semver" + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -4946,6 +4992,15 @@ "path-parse": "^1.0.6" } }, + "node_modules/tslint/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/tsutils": { "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", @@ -8231,6 +8286,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, @@ -8872,6 +8933,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, @@ -9460,10 +9527,30 @@ } }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha1-fnQlb7qknHWqfHogXMInmcrIAAQ=", - "dev": true + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } }, "send": { "version": "0.17.1", @@ -9848,6 +9935,12 @@ "requires": { "path-parse": "^1.0.6" } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, diff --git a/package.json b/package.json index 0be8d9ef9..25f8d8d7f 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "lib" ], "main": "lib/index.js", + "bin": { + "firebase-functions": "./lib/bin/firebase-functions.js" + }, "types": "lib/index.d.ts", "exports": { ".": "./lib/index.js", @@ -178,6 +181,7 @@ "mz": "^2.7.0", "nock": "^10.0.6", "prettier": "^1.18.2", + "semver": "^7.3.5", "sinon": "^7.3.2", "ts-node": "^8.3.0", "tslint": "^5.18.0", diff --git a/spec/fixtures/sources/commonjs-grouped/g1.js b/spec/fixtures/sources/commonjs-grouped/g1.js new file mode 100644 index 000000000..7250c863d --- /dev/null +++ b/spec/fixtures/sources/commonjs-grouped/g1.js @@ -0,0 +1,9 @@ +const functions = require("../../../../src/index"); + +exports.groupedhttp = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.groupedcallable = functions.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/commonjs-grouped/index.js b/spec/fixtures/sources/commonjs-grouped/index.js new file mode 100644 index 000000000..aafcf8145 --- /dev/null +++ b/spec/fixtures/sources/commonjs-grouped/index.js @@ -0,0 +1,20 @@ +const functions = require("../../../../src/index"); +const functionsv2 = require("../../../../src/v2/index"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); + +exports.g1 = require("./g1"); diff --git a/spec/fixtures/sources/commonjs-grouped/package.json b/spec/fixtures/sources/commonjs-grouped/package.json new file mode 100644 index 000000000..1ec99f52f --- /dev/null +++ b/spec/fixtures/sources/commonjs-grouped/package.json @@ -0,0 +1,3 @@ +{ + "name": "commonjs-grouped" +} diff --git a/spec/fixtures/sources/commonjs-main/functions.js b/spec/fixtures/sources/commonjs-main/functions.js new file mode 100644 index 000000000..526599142 --- /dev/null +++ b/spec/fixtures/sources/commonjs-main/functions.js @@ -0,0 +1,18 @@ +const functions = require("../../../../src/index"); +const functionsv2 = require("../../../../src/v2/index"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/commonjs-main/package.json b/spec/fixtures/sources/commonjs-main/package.json new file mode 100644 index 000000000..a781259f8 --- /dev/null +++ b/spec/fixtures/sources/commonjs-main/package.json @@ -0,0 +1,4 @@ +{ + "name": "commonjs-main", + "main": "functions.js" +} diff --git a/spec/fixtures/sources/commonjs/index.js b/spec/fixtures/sources/commonjs/index.js new file mode 100644 index 000000000..526599142 --- /dev/null +++ b/spec/fixtures/sources/commonjs/index.js @@ -0,0 +1,18 @@ +const functions = require("../../../../src/index"); +const functionsv2 = require("../../../../src/v2/index"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/commonjs/package.json b/spec/fixtures/sources/commonjs/package.json new file mode 100644 index 000000000..30e1b1b27 --- /dev/null +++ b/spec/fixtures/sources/commonjs/package.json @@ -0,0 +1,3 @@ +{ + "name": "commonjs" +} diff --git a/spec/fixtures/sources/esm-ext/index.mjs b/spec/fixtures/sources/esm-ext/index.mjs new file mode 100644 index 000000000..28d538e3b --- /dev/null +++ b/spec/fixtures/sources/esm-ext/index.mjs @@ -0,0 +1,18 @@ +import * as functions from '../../../../lib/index.js'; +import * as functionsv2 from "../../../../lib/v2/index.js"; + +export const v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +export const v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/esm-ext/package.json b/spec/fixtures/sources/esm-ext/package.json new file mode 100644 index 000000000..facb175c2 --- /dev/null +++ b/spec/fixtures/sources/esm-ext/package.json @@ -0,0 +1,4 @@ +{ + "name": "esm-ext", + "main": "index.mjs" +} diff --git a/spec/fixtures/sources/esm-main/functions.js b/spec/fixtures/sources/esm-main/functions.js new file mode 100644 index 000000000..d1f98b49a --- /dev/null +++ b/spec/fixtures/sources/esm-main/functions.js @@ -0,0 +1,18 @@ +import * as functions from "../../../../lib/index.js"; +import * as functionsv2 from "../../../../lib/v2/index.js"; + +export const v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +export const v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/esm-main/package.json b/spec/fixtures/sources/esm-main/package.json new file mode 100644 index 000000000..6c0840b1d --- /dev/null +++ b/spec/fixtures/sources/esm-main/package.json @@ -0,0 +1,5 @@ +{ + "name": "esm-main", + "main": "functions.js", + "type": "module" +} diff --git a/spec/fixtures/sources/esm/index.js b/spec/fixtures/sources/esm/index.js new file mode 100644 index 000000000..d1f98b49a --- /dev/null +++ b/spec/fixtures/sources/esm/index.js @@ -0,0 +1,18 @@ +import * as functions from "../../../../lib/index.js"; +import * as functionsv2 from "../../../../lib/v2/index.js"; + +export const v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +export const v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +export const v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/esm/package.json b/spec/fixtures/sources/esm/package.json new file mode 100644 index 000000000..9cb65cb9f --- /dev/null +++ b/spec/fixtures/sources/esm/package.json @@ -0,0 +1,4 @@ +{ + "name": "esm", + "type": "module" +} diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts new file mode 100644 index 000000000..1dab77c43 --- /dev/null +++ b/spec/runtime/loader.spec.ts @@ -0,0 +1,348 @@ +import * as path from 'path'; +import * as semver from 'semver'; +import { expect } from 'chai'; + +import * as loader from '../../src/runtime/loader'; +import * as functions from '../../src/index'; +import { + ManifestStack, + ManifestEndpoint, + ManifestRequiredAPI, +} from '../../src/runtime/manifest'; + +describe('extractStack', () => { + const httpFn = functions.https.onRequest(() => {}); + const httpEndpoint = { + platform: 'gcfv1', + httpsTrigger: {}, + }; + + const callableFn = functions.https.onCall(() => {}); + const callableEndpoint = { + platform: 'gcfv1', + labels: {}, // TODO: empty labels? + callableTrigger: {}, + }; + + it('extracts stack from a simple module', () => { + const module = { + http: httpFn, + callable: callableFn, + }; + + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + + loader.extractStack(module, endpoints, requiredAPIs); + + expect(endpoints).to.be.deep.equal({ + http: { entryPoint: 'http', ...httpEndpoint }, + callable: { entryPoint: 'callable', ...callableEndpoint }, + }); + + expect(requiredAPIs).to.be.empty; + }); + + it('extracts stack with required APIs', () => { + const module = { + taskq: functions.https.taskQueue().onDispatch(() => {}), + }; + + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + + loader.extractStack(module, endpoints, requiredAPIs); + + expect(endpoints).to.be.deep.equal({ + taskq: { + entryPoint: 'taskq', + platform: 'gcfv1', + taskQueueTrigger: {}, + }, + }); + + expect(requiredAPIs).to.be.deep.equal([ + { + api: 'cloudtasks.googleapis.com', + reason: 'Needed for task queue functions', + }, + ]); + }); + + it('extracts stack from a module with group functions', () => { + const module = { + fn1: httpFn, + g1: { + fn2: httpFn, + }, + }; + + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + + loader.extractStack(module, endpoints, requiredAPIs); + + expect(endpoints).to.be.deep.equal({ + fn1: { + entryPoint: 'fn1', + ...httpEndpoint, + }, + 'g1-fn2': { + entryPoint: 'g1.fn2', + ...httpEndpoint, + }, + }); + }); + + describe('with GCLOUD_PROJECT env var', () => { + const project = 'my-project'; + let prev; + + beforeEach(() => { + prev = process.env.GCLOUD_PROJECT; + process.env.GCLOUD_PROJECT = project; + }); + + afterEach(() => { + process.env.GCLOUD_PROJECT = prev; + }); + + it('extracts stack from a simple module', () => { + const module = { + fn: functions.pubsub.topic('my-topic').onPublish(() => {}), + }; + + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + + loader.extractStack(module, endpoints, requiredAPIs); + + expect(endpoints).to.be.deep.equal({ + fn: { + entryPoint: 'fn', + platform: 'gcfv1', + eventTrigger: { + eventType: 'google.pubsub.topic.publish', + eventFilters: { resource: 'projects/my-project/topics/my-topic' }, + retry: false, + }, + labels: {}, + }, + }); + }); + + it('extracts stack with required APIs', () => { + const module = { + scheduled: functions.pubsub.schedule('every 5 minutes').onRun(() => {}), + }; + + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + + loader.extractStack(module, endpoints, requiredAPIs); + + expect(endpoints).to.be.deep.equal({ + scheduled: { + entryPoint: 'scheduled', + platform: 'gcfv1', + // TODO: This label should not exist? + labels: {}, + scheduleTrigger: { schedule: 'every 5 minutes' }, + }, + }); + + expect(requiredAPIs).to.be.deep.equal([ + { + api: 'cloudscheduler.googleapis.com', + reason: 'Needed for scheduled functions.', + }, + ]); + }); + }); +}); + +describe('mergedRequiredAPIs', () => { + it('leaves required APIs unchanged if nothing to merge', () => { + expect( + loader.mergeRequiredAPIs([ + { api: 'example1.com', reason: 'example1' }, + { api: 'example2.com', reason: 'example2' }, + ]) + ).to.be.deep.equal([ + { api: 'example1.com', reason: 'example1' }, + { api: 'example2.com', reason: 'example2' }, + ]); + }); + + it('merges reasons given overlapping required api', () => { + expect( + loader.mergeRequiredAPIs([ + { api: 'example1.com', reason: 'example1a' }, + { api: 'example1.com', reason: 'example1b' }, + { api: 'example2.com', reason: 'example2' }, + ]) + ).to.be.deep.equal([ + { api: 'example1.com', reason: 'example1a example1b' }, + { api: 'example2.com', reason: 'example2' }, + ]); + }); + + it('merges reasons given overlapping required api', () => { + expect( + loader.mergeRequiredAPIs([ + { api: 'example1.com', reason: 'example1a' }, + { api: 'example1.com', reason: 'example1b' }, + { api: 'example2.com', reason: 'example2' }, + ]) + ).to.be.deep.equal([ + { api: 'example1.com', reason: 'example1a example1b' }, + { api: 'example2.com', reason: 'example2' }, + ]); + }); + + it('does not repeat the same reason', () => { + expect( + loader.mergeRequiredAPIs([ + { api: 'example1.com', reason: 'example1a' }, + { api: 'example1.com', reason: 'example1a' }, + { api: 'example2.com', reason: 'example2' }, + ]) + ).to.be.deep.equal([ + { api: 'example1.com', reason: 'example1a' }, + { api: 'example2.com', reason: 'example2' }, + ]); + }); +}); + +describe('loadStack', () => { + const expected: ManifestStack = { + endpoints: { + v1http: { + platform: 'gcfv1', + entryPoint: 'v1http', + httpsTrigger: {}, + }, + v1callable: { + platform: 'gcfv1', + entryPoint: 'v1callable', + labels: {}, + callableTrigger: {}, + }, + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + }, + v2callable: { + platform: 'gcfv2', + entryPoint: 'v2callable', + labels: {}, + callableTrigger: {}, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', + }; + + type Testcase = { + name: string; + modulePath: string; + expected: ManifestStack; + }; + function runTests(tc: Testcase) { + it('loads backend given relative path', async () => { + await expect(loader.loadStack(tc.modulePath)).to.eventually.deep.equal( + tc.expected + ); + }); + + it('loads backend given absolute path', async () => { + await expect( + loader.loadStack(path.join(process.cwd(), tc.modulePath)) + ).to.eventually.deep.equal(tc.expected); + }); + } + + let prev; + + beforeEach(() => { + // TODO: When __trigger annotation is removed and GCLOUD_PROJECT is not required at runtime, remove this. + prev = process.env.GCLOUD_PROJECT; + process.env.GCLOUD_PROJECT = 'test-project'; + }); + + afterEach(() => { + process.env.GCLOUD_PROJECT = prev; + }); + + describe('commonjs', () => { + const testcases: Testcase[] = [ + { + name: 'basic', + modulePath: './spec/fixtures/sources/commonjs', + expected, + }, + { + name: 'has main', + modulePath: './spec/fixtures/sources/commonjs-main', + expected, + }, + { + name: 'grouped', + modulePath: './spec/fixtures/sources/commonjs-grouped', + expected: { + ...expected, + endpoints: { + ...expected.endpoints, + 'g1-groupedhttp': { + platform: 'gcfv1', + entryPoint: 'g1.groupedhttp', + httpsTrigger: {}, + }, + 'g1-groupedcallable': { + platform: 'gcfv1', + entryPoint: 'g1.groupedcallable', + labels: {}, + callableTrigger: {}, + }, + }, + }, + }, + ]; + + for (const tc of testcases) { + describe(tc.name, () => { + runTests(tc); + }); + } + }); + + if (semver.gt(process.versions.node, '13.2.0')) { + describe('esm', () => { + const testcases: Testcase[] = [ + { + name: 'basic', + modulePath: './spec/fixtures/sources/esm', + expected, + }, + { + name: 'with main', + modulePath: './spec/fixtures/sources/esm-main', + expected, + }, + { + name: 'with .m extension', + modulePath: './spec/fixtures/sources/esm-ext', + expected, + }, + ]; + + for (const tc of testcases) { + describe(tc.name, () => { + runTests(tc); + }); + } + }); + } +}); diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts index 24eb0a008..ead39554f 100644 --- a/spec/v1/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -327,7 +327,7 @@ describe('Analytics Functions', () => { () => null ); expect(cloudFunction.__trigger).to.deep.equal({}); - expect(cloudFunction.__endpoint).to.undefined; + expect(cloudFunction.__endpoint).to.be.undefined; }); it('should handle an event with the appropriate fields', () => { diff --git a/src/bin/firebase-functions.ts b/src/bin/firebase-functions.ts new file mode 100644 index 000000000..597819658 --- /dev/null +++ b/src/bin/firebase-functions.ts @@ -0,0 +1,56 @@ +#!/usr/bin/env node + +import * as express from 'express'; +import { loadStack } from '../runtime/loader'; + +function printUsageAndExit() { + console.error( + ` +Usage: firebase-functions [functionsDir] + +Arguments: + - functionsDir: Directory containing source code for Firebase Functions. +` + ); + process.exit(1); +} + +let functionsDir = '.'; + +const args = process.argv.slice(2); +if (args.length > 1) { + if (args[0] === '-h' || args[0] === '--help') { + printUsageAndExit(); + } + functionsDir = args[0]; +} + +let server; +const app = express(); + +async function handleQuitquitquit(req: express.Request, res: express.Response) { + res.send('ok'); + server.close(() => console.log('shutdown requested via /__/quitquitquit')); +} + +app.get('/__/quitquitquit', handleQuitquitquit); +app.post('/__/quitquitquit', handleQuitquitquit); +app.get('/__/stack.yaml', async (req, res) => { + try { + const stack = await loadStack(functionsDir); + res.setHeader('content-type', 'text/yaml'); + res.send(JSON.stringify(stack)); + } catch (e) { + res + .status(400) + .send(`Failed to generate manifest from function source: ${e}`); + } +}); + +let port = 8080; +if (process.env.STACK_CONTROL_API_PORT) { + port = Number.parseInt(process.env.STACK_CONTROL_API_PORT); +} + +console.log('Serving at port', port); +server = app.listen(port); diff --git a/src/providers/https.ts b/src/providers/https.ts index 8ab072e78..ae646fa02 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -157,7 +157,7 @@ export class TaskQueueBuilder { func.__requiredAPIs = [ { api: 'cloudtasks.googleapis.com', - reason: 'Needed for v1 task queue functions', + reason: 'Needed for task queue functions', }, ]; diff --git a/src/runtime/loader.ts b/src/runtime/loader.ts new file mode 100644 index 000000000..f9ba05652 --- /dev/null +++ b/src/runtime/loader.ts @@ -0,0 +1,119 @@ +// 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. +import * as url from 'url'; +import * as path from 'path'; + +import { + ManifestStack, + ManifestEndpoint, + ManifestRequiredAPI, +} from './manifest'; + +/** + * Dynamically load import function to prevent TypeScript from + * transpiling into a require. + * + * See https://github.com/microsoft/TypeScript/issues/43329. + */ +const dynamicImport = new Function( + 'modulePath', + 'return import(modulePath)' +) as (modulePath: string) => Promise; + +async function loadModule(functionsDir: string) { + const absolutePath = path.resolve(functionsDir); + try { + return require(path.resolve(absolutePath)); + } catch (e) { + if (e.code === 'ERR_REQUIRE_ESM') { + // This is an ESM package! + const modulePath = require.resolve(absolutePath); + // Resolve module path to file:// URL. Required for windows support. + // @ts-ignore pathToFileURL exists for Node.js v10 and up. Since ESM support exists for Node.js v13 and up, we + // can be sure that this function exists here. + const moduleURL = url.pathToFileURL(modulePath).href; + return await dynamicImport(moduleURL); + } + throw e; + } +} + +/* @internal */ +export function extractStack( + module, + endpoints: Record, + requiredAPIs: ManifestRequiredAPI[], + prefix = '' +) { + for (const [name, val] of Object.entries(module)) { + if ( + typeof val === 'function' && + val['__endpoint'] && + typeof val['__endpoint'] === 'object' + ) { + const funcName = prefix + name; + endpoints[funcName] = { + ...val['__endpoint'], + entryPoint: funcName.replace(/-/g, '.'), + }; + if (val['__requiredAPIs'] && Array.isArray(val['__requiredAPIs'])) { + requiredAPIs.push(...val['__requiredAPIs']); + } + } else if (typeof val === 'object' && val !== null) { + extractStack(val, endpoints, requiredAPIs, prefix + name + '-'); + } + } +} + +/* @internal */ +export function mergeRequiredAPIs( + requiredAPIs: ManifestRequiredAPI[] +): ManifestRequiredAPI[] { + const apiToReasons: Record> = {}; + for (const { api, reason } of requiredAPIs) { + const reasons = apiToReasons[api] || new Set(); + reasons.add(reason); + apiToReasons[api] = reasons; + } + + const merged: ManifestRequiredAPI[] = []; + for (const [api, reasons] of Object.entries(apiToReasons)) { + merged.push({ api, reason: Array.from(reasons).join(' ') }); + } + return merged; +} + +/* @internal */ +export async function loadStack(functionsDir: string): Promise { + const endpoints: Record = {}; + const requiredAPIs: ManifestRequiredAPI[] = []; + const mod = await loadModule(functionsDir); + + extractStack(mod, endpoints, requiredAPIs); + + const stack: ManifestStack = { + endpoints, + specVersion: 'v1alpha1', + requiredAPIs: mergeRequiredAPIs(requiredAPIs), + }; + return stack; +} diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts new file mode 100644 index 000000000..379e61a4f --- /dev/null +++ b/src/runtime/manifest.ts @@ -0,0 +1,85 @@ +// 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. +/** + * @internal + * An definition of a function as appears in the Manifest. + */ +export interface ManifestEndpoint { + entryPoint?: string; + region?: string[]; + platform?: string; + availableMemoryMb?: number; + maxInstances?: number; + minInstances?: number; + concurrency?: number; + serviceAccountEmail?: string; + timeoutSeconds?: number; + vpc?: { + connector: string; + egressSettings?: string; + }; + labels?: Record; + ingressSettings?: string; + environmentVariables?: Record; + + httpsTrigger?: { + invoker?: string[]; + }; + + callableTrigger?: {}; + + eventTrigger?: { + eventFilters: Record; + eventType: string; + retry: boolean; + region?: string; + serviceAccountEmail?: string; + }; + + scheduleTrigger?: { + schedule?: string; + timezone?: string; + retryConfig?: { + retryCount?: number; + maxRetryDuration?: string; + minBackoffDuration?: string; + maxBackoffDuration?: string; + maxDoublings?: number; + }; + }; +} + +/* @internal */ +export interface ManifestRequiredAPI { + api: string; + reason: string; +} + +/** + * @internal + * An definition of a function deployment as appears in the Manifest. + **/ +export interface ManifestStack { + specVersion: 'v1alpha1'; + requiredAPIs: ManifestRequiredAPI[]; + endpoints: Record; +} diff --git a/src/v2/core.ts b/src/v2/core.ts index 845cf2990..1160d09ed 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { ManifestEndpoint } from '../common/manifest'; +import { ManifestEndpoint } from '../runtime/manifest'; /** @internal */ export interface TriggerAnnotation { diff --git a/src/v2/options.ts b/src/v2/options.ts index 7db01167e..77919ab0b 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -30,7 +30,7 @@ import * as logger from '../logger'; import { TriggerAnnotation } from './core'; import { declaredParams } from './params'; import { ParamSpec } from './params/types'; -import { ManifestEndpoint } from '../common/manifest'; +import { ManifestEndpoint } from '../runtime/manifest'; /** * List of all regions supported by Cloud Functions v2 diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index 4bd80df4c..c345cf654 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -2,13 +2,17 @@ type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; export interface ParamSpec { + name: string; default?: T; label?: string; description?: string; valueType?: ParamValueType; } -export type ParamOptions = Omit, 'valueType'>; +export type ParamOptions = Omit< + ParamSpec, + 'name' | 'valueType' +>; export class Param { static valueType: ParamValueType = 'string'; @@ -33,6 +37,7 @@ export class Param { toSpec(): ParamSpec { const out: ParamSpec = { + name: this.name, ...this.options, valueType: (this.constructor as typeof Param).valueType, }; @@ -120,6 +125,7 @@ export class ListParam extends Param { toSpec(): ParamSpec { const out: ParamSpec = { + name: this.name, valueType: 'list', ...this.options, }; diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 292c7cf0e..f7b51e508 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -40,7 +40,7 @@ import { TaskRequest, TaskRetryConfig, } from '../../common/providers/https'; -import { ManifestEndpoint } from '../../common/manifest'; +import { ManifestEndpoint } from '../../runtime/manifest'; export { Request, diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index a751f0cd2..2964af42d 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -1,7 +1,7 @@ import * as options from '../options'; import { CloudEvent, CloudFunction } from '../core'; import { copyIfPresent } from '../../common/encoding'; -import { ManifestEndpoint } from '../../common/manifest'; +import { ManifestEndpoint } from '../../runtime/manifest'; /** * Interface representing a Google Cloud Pub/Sub message. diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index d07e1955a..d5490317d 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -24,7 +24,7 @@ import * as options from '../options'; import { firebaseConfig } from '../../config'; import { CloudEvent, CloudFunction } from '../core'; import { copyIfPresent } from '../../common/encoding'; -import { ManifestEndpoint } from '../../common/manifest'; +import { ManifestEndpoint } from '../../runtime/manifest'; /** * An object within Google Cloud Storage. diff --git a/tsconfig.release.json b/tsconfig.release.json index a53421f8f..5f19fe3eb 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -14,6 +14,7 @@ "./src/index.ts", "./src/logger/index.ts", "./src/logger/compat.ts", - "./src/v2/index.ts" + "./src/v2/index.ts", + "./src/bin/firebase-functions.ts" ] } From 297b15be245c0005bc8214414991002e241debc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 07:23:24 -0800 Subject: [PATCH 381/705] Bump node-fetch from 2.6.1 to 2.6.7 (#1025) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 140 ++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05b89532d..764655dc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2926,16 +2926,6 @@ "node": ">=4" } }, - "node_modules/jsdom/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/json-bigint": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", @@ -3403,12 +3393,6 @@ "mkdirp": "bin/cmd.js" } }, - "node_modules/mkdirp/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "node_modules/mocha": { "version": "6.2.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", @@ -3500,12 +3484,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/mocha/node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "node_modules/mocha/node_modules/mkdirp": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", @@ -3765,13 +3743,49 @@ } }, "node_modules/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dev": true, "optional": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, "engines": { "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true, + "optional": true + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true, + "optional": true + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, + "optional": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "node_modules/node-forge": { @@ -4626,15 +4640,6 @@ "source-map": "^0.6.0" } }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -8219,13 +8224,6 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true } } }, @@ -8638,14 +8636,6 @@ "dev": true, "requires": { "minimist": "^1.2.5" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - } } }, "mocha": { @@ -8716,12 +8706,6 @@ "esprima": "^4.0.0" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "mkdirp": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", @@ -8961,11 +8945,41 @@ } }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dev": true, - "optional": true + "optional": true, + "requires": { + "whatwg-url": "^5.0.0" + }, + "dependencies": { + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true, + "optional": true + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true, + "optional": true + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, + "optional": true, + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + } + } }, "node-forge": { "version": "0.10.0", @@ -9672,14 +9686,6 @@ "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } } }, "sprintf-js": { From af2c51652f3161036a0ce6b977765896bf93c365 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 2 Feb 2022 18:59:07 -0500 Subject: [PATCH 382/705] Move common auth items into common path (#1026) * moving common auth items to identity.ts and fixing UserRecord definitions * fixing copyright year and exporting old artifacts --- spec/common/providers/identity.spec.ts | 88 ++++++++++++++++++++ spec/v1/providers/auth.spec.ts | 77 ++--------------- src/common/providers/identity.ts | 111 +++++++++++++++++++++++++ src/providers/auth.ts | 94 +++------------------ 4 files changed, 215 insertions(+), 155 deletions(-) create mode 100644 spec/common/providers/identity.spec.ts create mode 100644 src/common/providers/identity.ts diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts new file mode 100644 index 000000000..fcb686102 --- /dev/null +++ b/spec/common/providers/identity.spec.ts @@ -0,0 +1,88 @@ +// 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. + +import { expect } from 'chai'; +import * as identity from '../../../src/common/providers/identity'; + +describe('identity', () => { + describe('userRecordConstructor', () => { + it('will provide falsey values for fields that are not in raw wire data', () => { + const record = identity.userRecordConstructor({ uid: '123' }); + expect(record.toJSON()).to.deep.equal({ + uid: '123', + email: null, + emailVerified: false, + displayName: null, + photoURL: null, + phoneNumber: null, + disabled: false, + providerData: [], + customClaims: {}, + passwordSalt: null, + passwordHash: null, + tokensValidAfterTime: null, + metadata: { + creationTime: null, + lastSignInTime: null, + }, + }); + }); + + it('will not interfere with fields that are in raw wire data', () => { + const raw: any = { + uid: '123', + email: 'email@gmail.com', + emailVerified: true, + displayName: 'User', + photoURL: 'url', + phoneNumber: '1233332222', + disabled: true, + providerData: [], + customClaims: {}, + passwordSalt: 'abc', + passwordHash: 'def', + tokensValidAfterTime: '2027-02-02T23:01:19.797Z', + metadata: { + creationTime: '2017-02-02T23:06:26.124Z', + lastSignInTime: '2017-02-02T23:01:19.797Z', + }, + }; + const record = identity.userRecordConstructor(raw); + expect(record.toJSON()).to.deep.equal(raw); + }); + + it('will convert raw wire fields createdAt and lastSignedInAt to creationTime and lastSignInTime', () => { + const raw: any = { + uid: '123', + metadata: { + createdAt: '2017-02-02T23:06:26.124Z', + lastSignedInAt: '2017-02-02T23:01:19.797Z', + }, + }; + const record = identity.userRecordConstructor(raw); + expect(record.metadata).to.deep.equal({ + creationTime: '2017-02-02T23:06:26.124Z', + lastSignInTime: '2017-02-02T23:01:19.797Z', + }); + }); + }); +}); diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index 6168cf767..8659a1967 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -21,13 +21,12 @@ // SOFTWARE. import { expect } from 'chai'; -import * as firebase from 'firebase-admin'; - import { CloudFunction, Event, EventContext, } from '../../../src/cloud-functions'; +import { UserRecord } from '../../../src/common/providers/identity'; import * as functions from '../../../src/index'; import * as auth from '../../../src/providers/auth'; @@ -75,7 +74,7 @@ describe('Auth Functions', () => { }; } - const handler = (user: firebase.auth.UserRecord) => { + const handler = (user: UserRecord) => { return Promise.resolve(); }; @@ -137,14 +136,12 @@ describe('Auth Functions', () => { }); describe('#_dataConstructor', () => { - let cloudFunctionDelete: CloudFunction; + let cloudFunctionDelete: CloudFunction; before(() => { cloudFunctionDelete = auth .user() - .onDelete( - (data: firebase.auth.UserRecord, context: EventContext) => data - ); + .onDelete((data: UserRecord, context: EventContext) => data); }); it('should handle wire format as of v5.0.0 of firebase-admin', () => { @@ -162,68 +159,6 @@ describe('Auth Functions', () => { }); }); - describe('userRecordConstructor', () => { - it('will provide falsey values for fields that are not in raw wire data', () => { - const record = auth.userRecordConstructor({ uid: '123' }); - expect(record.toJSON()).to.deep.equal({ - uid: '123', - email: null, - emailVerified: false, - displayName: null, - photoURL: null, - phoneNumber: null, - disabled: false, - providerData: [], - customClaims: {}, - passwordSalt: null, - passwordHash: null, - tokensValidAfterTime: null, - metadata: { - creationTime: null, - lastSignInTime: null, - }, - }); - }); - - it('will not interfere with fields that are in raw wire data', () => { - const raw: any = { - uid: '123', - email: 'email@gmail.com', - emailVerified: true, - displayName: 'User', - photoURL: 'url', - phoneNumber: '1233332222', - disabled: true, - providerData: [], - customClaims: {}, - passwordSalt: 'abc', - passwordHash: 'def', - tokensValidAfterTime: '2027-02-02T23:01:19.797Z', - metadata: { - creationTime: '2017-02-02T23:06:26.124Z', - lastSignInTime: '2017-02-02T23:01:19.797Z', - }, - }; - const record = auth.userRecordConstructor(raw); - expect(record.toJSON()).to.deep.equal(raw); - }); - - it('will convert raw wire fields createdAt and lastSignedInAt to creationTime and lastSignInTime', () => { - const raw: any = { - uid: '123', - metadata: { - createdAt: '2017-02-02T23:06:26.124Z', - lastSignedInAt: '2017-02-02T23:01:19.797Z', - }, - }; - const record = auth.userRecordConstructor(raw); - expect(record.metadata).to.deep.equal({ - creationTime: '2017-02-02T23:06:26.124Z', - lastSignInTime: '2017-02-02T23:01:19.797Z', - }); - }); - }); - describe('handler namespace', () => { describe('#onCreate', () => { it('should return an empty trigger', () => { @@ -238,8 +173,8 @@ describe('Auth Functions', () => { }); describe('#onDelete', () => { - const cloudFunctionDelete: CloudFunction = functions.handler.auth.user.onDelete( - (data: firebase.auth.UserRecord) => data + const cloudFunctionDelete: CloudFunction = functions.handler.auth.user.onDelete( + (data: UserRecord) => data ); it('should return an empty trigger', () => { diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts new file mode 100644 index 000000000..24a4e2c34 --- /dev/null +++ b/src/common/providers/identity.ts @@ -0,0 +1,111 @@ +// 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. + +import * as firebase from 'firebase-admin'; +import * as _ from 'lodash'; + +/** + * The UserRecord passed to Cloud Functions is the same UserRecord that is returned by the Firebase Admin + * SDK. + */ +export type UserRecord = firebase.auth.UserRecord; + +/** + * UserInfo that is part of the UserRecord + */ +export type UserInfo = firebase.auth.UserInfo; + +/** + * Helper class to create the user metadata in a UserRecord object + */ +export class UserRecordMetadata implements firebase.auth.UserMetadata { + constructor(public creationTime: string, public lastSignInTime: string) {} + + /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */ + toJSON() { + return { + creationTime: this.creationTime, + lastSignInTime: this.lastSignInTime, + }; + } +} + +/** + * Helper function that creates a UserRecord Class from data sent over the wire. + * @param wireData data sent over the wire + * @returns an instance of UserRecord with correct toJSON functions + */ +export function userRecordConstructor(wireData: Object): UserRecord { + // Falsey values from the wire format proto get lost when converted to JSON, this adds them back. + const falseyValues: any = { + email: null, + emailVerified: false, + displayName: null, + photoURL: null, + phoneNumber: null, + disabled: false, + providerData: [], + customClaims: {}, + passwordSalt: null, + passwordHash: null, + tokensValidAfterTime: null, + }; + const record = _.assign({}, falseyValues, wireData); + + const meta = _.get(record, 'metadata'); + if (meta) { + _.set( + record, + 'metadata', + new UserRecordMetadata( + meta.createdAt || meta.creationTime, + meta.lastSignedInAt || meta.lastSignInTime + ) + ); + } else { + _.set(record, 'metadata', new UserRecordMetadata(null, null)); + } + _.forEach(record.providerData, (entry) => { + _.set(entry, 'toJSON', () => { + return entry; + }); + }); + _.set(record, 'toJSON', () => { + const json: any = _.pick(record, [ + 'uid', + 'email', + 'emailVerified', + 'displayName', + 'photoURL', + 'phoneNumber', + 'disabled', + 'passwordHash', + 'passwordSalt', + 'tokensValidAfterTime', + ]); + json.metadata = _.get(record, 'metadata').toJSON(); + json.customClaims = _.cloneDeep(record.customClaims); + json.providerData = _.map(record.providerData, (entry) => entry.toJSON()); + return json; + }); + return record as UserRecord; +} diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 7274399b2..160de06c8 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -20,8 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as firebase from 'firebase-admin'; -import * as _ from 'lodash'; +import { + UserRecord, + UserInfo, + UserRecordMetadata, + userRecordConstructor, +} from '../common/providers/identity'; import { CloudFunction, Event, @@ -30,6 +34,9 @@ import { } from '../cloud-functions'; import { DeploymentOptions } from '../function-configuration'; +// TODO: yank in next breaking change release +export { UserRecord, UserInfo, UserRecordMetadata, userRecordConstructor }; + /** @hidden */ export const provider = 'google.firebase.auth'; /** @hidden */ @@ -52,21 +59,9 @@ export function _userWithOptions(options: DeploymentOptions) { }, options); } -export class UserRecordMetadata implements firebase.auth.UserMetadata { - constructor(public creationTime: string, public lastSignInTime: string) {} - - /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */ - toJSON() { - return { - creationTime: this.creationTime, - lastSignInTime: this.lastSignInTime, - }; - } -} - /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */ export class UserBuilder { - private static dataConstructor(raw: Event): firebase.auth.UserRecord { + private static dataConstructor(raw: Event): UserRecord { return userRecordConstructor(raw.data); } @@ -109,72 +104,3 @@ export class UserBuilder { }); } } - -/** - * The UserRecord passed to Cloud Functions is the same UserRecord that is returned by the Firebase Admin - * SDK. - */ -export type UserRecord = firebase.auth.UserRecord; - -/** - * UserInfo that is part of the UserRecord - */ -export type UserInfo = firebase.auth.UserInfo; - -export function userRecordConstructor( - wireData: Object -): firebase.auth.UserRecord { - // Falsey values from the wire format proto get lost when converted to JSON, this adds them back. - const falseyValues: any = { - email: null, - emailVerified: false, - displayName: null, - photoURL: null, - phoneNumber: null, - disabled: false, - providerData: [], - customClaims: {}, - passwordSalt: null, - passwordHash: null, - tokensValidAfterTime: null, - }; - const record = _.assign({}, falseyValues, wireData); - - const meta = _.get(record, 'metadata'); - if (meta) { - _.set( - record, - 'metadata', - new UserRecordMetadata( - meta.createdAt || meta.creationTime, - meta.lastSignedInAt || meta.lastSignInTime - ) - ); - } else { - _.set(record, 'metadata', new UserRecordMetadata(null, null)); - } - _.forEach(record.providerData, (entry) => { - _.set(entry, 'toJSON', () => { - return entry; - }); - }); - _.set(record, 'toJSON', () => { - const json: any = _.pick(record, [ - 'uid', - 'email', - 'emailVerified', - 'displayName', - 'photoURL', - 'phoneNumber', - 'disabled', - 'passwordHash', - 'passwordSalt', - 'tokensValidAfterTime', - ]); - json.metadata = _.get(record, 'metadata').toJSON(); - json.customClaims = _.cloneDeep(record.customClaims); - json.providerData = _.map(record.providerData, (entry) => entry.toJSON()); - return json; - }); - return record as firebase.auth.UserRecord; -} From 9e4ee8ad26b947d6698dcac1aa34cf1b8898008d Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 3 Feb 2022 17:16:17 -0500 Subject: [PATCH 383/705] fix event type (#1029) --- src/v2/providers/alerts/alerts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 4b7f0b952..8c2699795 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -24,7 +24,7 @@ export type AlertEvent = CloudEvent< >; /** @internal */ -export const eventType = 'firebase.firebasealerts.alerts.v1.published'; +export const eventType = 'google.firebase.firebasealerts.alerts.v1.published'; /** The underlying alert type of the Firebase Alerts provider. */ export type AlertType = From f057ec2e761d55a5d112b86dbebcec5c66341a41 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 3 Feb 2022 14:22:10 -0800 Subject: [PATCH 384/705] Add integration test for firebase-functions binary (#1028) Add integration test for firebase-functions binary. The integration setup is more robust than what we had before - it builds and installs the Functions SDK package at the branch commit and try to run the produced binary that ships with the Functions SDK. We also modify the github CI/release script setting to run the integration test as part of its workflow. --- .github/workflows/test.yaml | 25 +- .mocharc.yaml | 4 +- package.json | 7 +- scripts/bin-test/mocha-setup.ts | 4 + scripts/bin-test/run.sh | 20 ++ .../bin-test/sources/commonjs-grouped/g1.js | 9 + .../sources/commonjs-grouped/index.js | 20 ++ .../sources/commonjs-grouped/package.json | 3 + .../sources/commonjs-main/functions.js | 18 ++ .../sources/commonjs-main/package.json | 4 + scripts/bin-test/sources/commonjs/index.js | 18 ++ .../bin-test/sources/commonjs/package.json | 3 + .../bin-test}/sources/esm-ext/index.mjs | 4 +- .../bin-test}/sources/esm-ext/package.json | 0 .../bin-test}/sources/esm-main/functions.js | 4 +- .../bin-test}/sources/esm-main/package.json | 0 .../bin-test}/sources/esm/index.js | 4 +- .../bin-test}/sources/esm/package.json | 0 scripts/bin-test/test.ts | 233 ++++++++++++++++++ scripts/publish.sh | 1 + spec/runtime/loader.spec.ts | 33 +-- 21 files changed, 371 insertions(+), 43 deletions(-) create mode 100644 scripts/bin-test/mocha-setup.ts create mode 100755 scripts/bin-test/run.sh create mode 100644 scripts/bin-test/sources/commonjs-grouped/g1.js create mode 100644 scripts/bin-test/sources/commonjs-grouped/index.js create mode 100644 scripts/bin-test/sources/commonjs-grouped/package.json create mode 100644 scripts/bin-test/sources/commonjs-main/functions.js create mode 100644 scripts/bin-test/sources/commonjs-main/package.json create mode 100644 scripts/bin-test/sources/commonjs/index.js create mode 100644 scripts/bin-test/sources/commonjs/package.json rename {spec/fixtures => scripts/bin-test}/sources/esm-ext/index.mjs (76%) rename {spec/fixtures => scripts/bin-test}/sources/esm-ext/package.json (100%) rename {spec/fixtures => scripts/bin-test}/sources/esm-main/functions.js (76%) rename {spec/fixtures => scripts/bin-test}/sources/esm-main/package.json (100%) rename {spec/fixtures => scripts/bin-test}/sources/esm/index.js (76%) rename {spec/fixtures => scripts/bin-test}/sources/esm/package.json (100%) create mode 100644 scripts/bin-test/test.ts diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4160a1eb3..75cee99b0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,6 +16,7 @@ jobs: - 10.x - 12.x - 14.x + - 16.x steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 @@ -31,4 +32,26 @@ jobs: - run: npm install - run: npm run lint - run: npm run format - - run: npm run build && npm run test + - run: npm run test + integration: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: + - 12.x + - 14.x + - 16.x + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + + - name: Cache npm + uses: actions/cache@v1 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} + + - run: npm install + - run: npm run test:bin diff --git a/.mocharc.yaml b/.mocharc.yaml index 932144124..2bb78edfc 100644 --- a/.mocharc.yaml +++ b/.mocharc.yaml @@ -1,10 +1,8 @@ exit: true extension: - ts -file: - - mocha/setup.ts package: ./package.json reporter: spec require: - 'ts-node/register' -spec: spec/**/*.spec.ts + - 'source-map-support/register' diff --git a/package.json b/package.json index 25f8d8d7f..888085883 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,8 @@ "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", - "test": "mocha" + "test": "mocha --file ./mocha/setup.ts spec/**/*.spec.ts ", + "test:bin": "./scripts/bin-test/run.sh" }, "dependencies": { "@types/cors": "^2.8.5", @@ -180,10 +181,12 @@ "mock-require": "^3.0.3", "mz": "^2.7.0", "nock": "^10.0.6", + "node-fetch": "^2.6.7", + "portfinder": "^1.0.28", "prettier": "^1.18.2", "semver": "^7.3.5", "sinon": "^7.3.2", - "ts-node": "^8.3.0", + "ts-node": "^10.4.0", "tslint": "^5.18.0", "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", diff --git a/scripts/bin-test/mocha-setup.ts b/scripts/bin-test/mocha-setup.ts new file mode 100644 index 000000000..6dfdc7f9d --- /dev/null +++ b/scripts/bin-test/mocha-setup.ts @@ -0,0 +1,4 @@ +import * as chai from 'chai'; +import * as chaiAsPromised from 'chai-as-promised'; + +chai.use(chaiAsPromised); diff --git a/scripts/bin-test/run.sh b/scripts/bin-test/run.sh new file mode 100755 index 000000000..c3e3da673 --- /dev/null +++ b/scripts/bin-test/run.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -ex # Immediately exit on failure + +# Link the Functions SDK for the testing environment. +npm run build +npm link + +# Link local SDK to all test sources. +for f in scripts/bin-test/sources/*; do + if [ -d "$f" ]; then + (cd "$f" && npm link firebase-functions) + fi +done + +## DEBUG +ls -la scripts/bin-test/sources/commonjs/node_modules + +mocha \ + --file ./scripts/bin-test/mocha-setup.ts \ + ./scripts/bin-test/test.ts diff --git a/scripts/bin-test/sources/commonjs-grouped/g1.js b/scripts/bin-test/sources/commonjs-grouped/g1.js new file mode 100644 index 000000000..57766af02 --- /dev/null +++ b/scripts/bin-test/sources/commonjs-grouped/g1.js @@ -0,0 +1,9 @@ +const functions = require("firebase-functions"); + +exports.groupedhttp = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.groupedcallable = functions.https.onCall(() => { + return "PASS"; +}); diff --git a/scripts/bin-test/sources/commonjs-grouped/index.js b/scripts/bin-test/sources/commonjs-grouped/index.js new file mode 100644 index 000000000..b00828de0 --- /dev/null +++ b/scripts/bin-test/sources/commonjs-grouped/index.js @@ -0,0 +1,20 @@ +const functions = require("firebase-functions"); +const functionsv2 = require("firebase-functions/v2"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); + +exports.g1 = require("./g1"); diff --git a/scripts/bin-test/sources/commonjs-grouped/package.json b/scripts/bin-test/sources/commonjs-grouped/package.json new file mode 100644 index 000000000..1ec99f52f --- /dev/null +++ b/scripts/bin-test/sources/commonjs-grouped/package.json @@ -0,0 +1,3 @@ +{ + "name": "commonjs-grouped" +} diff --git a/scripts/bin-test/sources/commonjs-main/functions.js b/scripts/bin-test/sources/commonjs-main/functions.js new file mode 100644 index 000000000..9122f9223 --- /dev/null +++ b/scripts/bin-test/sources/commonjs-main/functions.js @@ -0,0 +1,18 @@ +const functions = require("firebase-functions"); +const functionsv2 = require("firebase-functions/v2"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/scripts/bin-test/sources/commonjs-main/package.json b/scripts/bin-test/sources/commonjs-main/package.json new file mode 100644 index 000000000..a781259f8 --- /dev/null +++ b/scripts/bin-test/sources/commonjs-main/package.json @@ -0,0 +1,4 @@ +{ + "name": "commonjs-main", + "main": "functions.js" +} diff --git a/scripts/bin-test/sources/commonjs/index.js b/scripts/bin-test/sources/commonjs/index.js new file mode 100644 index 000000000..9122f9223 --- /dev/null +++ b/scripts/bin-test/sources/commonjs/index.js @@ -0,0 +1,18 @@ +const functions = require("firebase-functions"); +const functionsv2 = require("firebase-functions/v2"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/scripts/bin-test/sources/commonjs/package.json b/scripts/bin-test/sources/commonjs/package.json new file mode 100644 index 000000000..30e1b1b27 --- /dev/null +++ b/scripts/bin-test/sources/commonjs/package.json @@ -0,0 +1,3 @@ +{ + "name": "commonjs" +} diff --git a/spec/fixtures/sources/esm-ext/index.mjs b/scripts/bin-test/sources/esm-ext/index.mjs similarity index 76% rename from spec/fixtures/sources/esm-ext/index.mjs rename to scripts/bin-test/sources/esm-ext/index.mjs index 28d538e3b..91e974d93 100644 --- a/spec/fixtures/sources/esm-ext/index.mjs +++ b/scripts/bin-test/sources/esm-ext/index.mjs @@ -1,5 +1,5 @@ -import * as functions from '../../../../lib/index.js'; -import * as functionsv2 from "../../../../lib/v2/index.js"; +import * as functions from "firebase-functions"; +import * as functionsv2 from "firebase-functions/v2"; export const v1http = functions.https.onRequest((req, resp) => { resp.status(200).send("PASS"); diff --git a/spec/fixtures/sources/esm-ext/package.json b/scripts/bin-test/sources/esm-ext/package.json similarity index 100% rename from spec/fixtures/sources/esm-ext/package.json rename to scripts/bin-test/sources/esm-ext/package.json diff --git a/spec/fixtures/sources/esm-main/functions.js b/scripts/bin-test/sources/esm-main/functions.js similarity index 76% rename from spec/fixtures/sources/esm-main/functions.js rename to scripts/bin-test/sources/esm-main/functions.js index d1f98b49a..b09186731 100644 --- a/spec/fixtures/sources/esm-main/functions.js +++ b/scripts/bin-test/sources/esm-main/functions.js @@ -1,5 +1,5 @@ -import * as functions from "../../../../lib/index.js"; -import * as functionsv2 from "../../../../lib/v2/index.js"; +import * as functions from "firebase-functions"; +import * as functionsv2 from "firebase-functions/v2"; export const v1http = functions.https.onRequest((req, resp) => { resp.status(200).send("PASS"); diff --git a/spec/fixtures/sources/esm-main/package.json b/scripts/bin-test/sources/esm-main/package.json similarity index 100% rename from spec/fixtures/sources/esm-main/package.json rename to scripts/bin-test/sources/esm-main/package.json diff --git a/spec/fixtures/sources/esm/index.js b/scripts/bin-test/sources/esm/index.js similarity index 76% rename from spec/fixtures/sources/esm/index.js rename to scripts/bin-test/sources/esm/index.js index d1f98b49a..b09186731 100644 --- a/spec/fixtures/sources/esm/index.js +++ b/scripts/bin-test/sources/esm/index.js @@ -1,5 +1,5 @@ -import * as functions from "../../../../lib/index.js"; -import * as functionsv2 from "../../../../lib/v2/index.js"; +import * as functions from "firebase-functions"; +import * as functionsv2 from "firebase-functions/v2"; export const v1http = functions.https.onRequest((req, resp) => { resp.status(200).send("PASS"); diff --git a/spec/fixtures/sources/esm/package.json b/scripts/bin-test/sources/esm/package.json similarity index 100% rename from spec/fixtures/sources/esm/package.json rename to scripts/bin-test/sources/esm/package.json diff --git a/scripts/bin-test/test.ts b/scripts/bin-test/test.ts new file mode 100644 index 000000000..1c6f1a24e --- /dev/null +++ b/scripts/bin-test/test.ts @@ -0,0 +1,233 @@ +import * as path from 'path'; +import * as subprocess from 'child_process'; +import { promisify } from 'util'; + +import fetch from 'node-fetch'; +import * as portfinder from 'portfinder'; +import * as yaml from 'js-yaml'; +import * as semver from 'semver'; +import { expect } from 'chai'; + +const TIMEOUT_XL = 20_000; +const TIMEOUT_L = 10_000; +const TIMEOUT_M = 5_000; +const TIMEOUT_S = 1_000; + +const BASE_STACK = { + endpoints: { + v1http: { + platform: 'gcfv1', + entryPoint: 'v1http', + httpsTrigger: {}, + }, + v1callable: { + platform: 'gcfv1', + entryPoint: 'v1callable', + labels: {}, + callableTrigger: {}, + }, + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + }, + v2callable: { + platform: 'gcfv2', + entryPoint: 'v2callable', + labels: {}, + callableTrigger: {}, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', +}; + +type Testcase = { + name: string; + modulePath: string; + expected: Record; +}; + +async function retryUntil( + fn: () => Promise, + timeoutMs: number, + sleepMs: number = TIMEOUT_S +) { + const sleep = () => { + return new Promise((resolve) => { + setTimeout(() => resolve(), sleepMs); + }); + }; + const timedOut = new Promise((resolve, reject) => { + setTimeout(() => { + reject(new Error('retry timeout')); + }, timeoutMs); + }); + const retry = (async () => { + while (true) { + if (await fn()) break; + await sleep(); + } + })(); + await Promise.race([retry, timedOut]); +} + +async function startBin( + tc: Testcase, + debug?: boolean +): Promise<{ port: number; cleanup: () => Promise }> { + const getPort = promisify(portfinder.getPort) as () => Promise; + const port = await getPort(); + + const proc = subprocess.spawn('./node_modules/.bin/firebase-functions', [], { + cwd: path.resolve(tc.modulePath), + env: { + PATH: process.env.PATH, + GLCOUD_PROJECT: 'test-project', + STACK_CONTROL_API_PORT: port, + }, + }); + + if (!proc) { + throw new Error('Failed to start firebase functions'); + } + + await retryUntil(async () => { + try { + await fetch(`http://localhost:${port}/__/stack.yaml`); + } catch (e) { + if (e?.code === 'ECONNREFUSED') { + return false; + } + throw e; + } + return true; + }, TIMEOUT_M); + + if (debug) { + proc.stdout?.on('data', (data: unknown) => { + console.log(`[${tc.name} stdout] ` + data); + }); + + proc.stderr?.on('data', (data: unknown) => { + console.log(`[${tc.name} stderr] ` + data); + }); + } + + return { + port, + cleanup: async () => { + process.kill(proc.pid); + await retryUntil(async () => { + try { + process.kill(proc.pid, 0); + } catch { + // process.kill w/ signal 0 will throw an error if the pid no longer exists. + return true; + } + return false; + }, TIMEOUT_M); + }, + }; +} + +describe('stack.yaml', () => { + async function runTests(tc: Testcase) { + let port: number; + let cleanup: () => Promise; + + before(async () => { + const r = await startBin(tc); + port = r.port; + cleanup = r.cleanup; + }); + + after(async () => { + await cleanup?.(); + }); + + it('stack.yaml returns expected Manifest', async () => { + const res = await fetch(`http://localhost:${port}/__/stack.yaml`); + const text = await res.text(); + let parsed: any; + try { + parsed = yaml.load(text); + } catch (err) { + throw new Error('Failed to parse stack.yaml ' + err); + } + expect(parsed).to.be.deep.equal(tc.expected); + }); + } + + describe('commonjs', () => { + const testcases: Testcase[] = [ + { + name: 'basic', + modulePath: './scripts/bin-test/sources/commonjs', + expected: BASE_STACK, + }, + { + name: 'has main', + modulePath: './scripts/bin-test/sources/commonjs-main', + expected: BASE_STACK, + }, + { + name: 'grouped', + modulePath: './scripts/bin-test/sources/commonjs-grouped', + expected: { + ...BASE_STACK, + endpoints: { + ...BASE_STACK.endpoints, + 'g1-groupedhttp': { + platform: 'gcfv1', + entryPoint: 'g1.groupedhttp', + httpsTrigger: {}, + }, + 'g1-groupedcallable': { + platform: 'gcfv1', + entryPoint: 'g1.groupedcallable', + labels: {}, + callableTrigger: {}, + }, + }, + }, + }, + ]; + + for (const tc of testcases) { + describe(tc.name, async () => { + await runTests(tc); + }); + } + }).timeout(TIMEOUT_L); + + if (semver.gt(process.versions.node, '13.2.0')) { + describe('esm', () => { + const testcases: Testcase[] = [ + { + name: 'basic', + modulePath: './scripts/bin-test/sources/esm', + expected: BASE_STACK, + }, + { + name: 'with main', + + modulePath: './scripts/bin-test/sources/esm-main', + expected: BASE_STACK, + }, + { + name: 'with .m extension', + modulePath: './scripts/bin-test/sources/esm-ext', + expected: BASE_STACK, + }, + ]; + + for (const tc of testcases) { + describe(tc.name, async () => { + await runTests(tc); + }); + } + }).timeout(TIMEOUT_L); + } +}).timeout(TIMEOUT_XL); diff --git a/scripts/publish.sh b/scripts/publish.sh index ea5acde68..a7574a15a 100644 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -80,6 +80,7 @@ echo "Ran npm ci." echo "Running tests..." npm test +npm run test:bin echo "Ran tests." echo "Running publish build..." diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index 1dab77c43..436d3ea62 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -1,5 +1,4 @@ import * as path from 'path'; -import * as semver from 'semver'; import { expect } from 'chai'; import * as loader from '../../src/runtime/loader'; @@ -251,13 +250,13 @@ describe('loadStack', () => { expected: ManifestStack; }; function runTests(tc: Testcase) { - it('loads backend given relative path', async () => { + it('loads stack given relative path', async () => { await expect(loader.loadStack(tc.modulePath)).to.eventually.deep.equal( tc.expected ); }); - it('loads backend given absolute path', async () => { + it('loads stack given absolute path', async () => { await expect( loader.loadStack(path.join(process.cwd(), tc.modulePath)) ).to.eventually.deep.equal(tc.expected); @@ -317,32 +316,4 @@ describe('loadStack', () => { }); } }); - - if (semver.gt(process.versions.node, '13.2.0')) { - describe('esm', () => { - const testcases: Testcase[] = [ - { - name: 'basic', - modulePath: './spec/fixtures/sources/esm', - expected, - }, - { - name: 'with main', - modulePath: './spec/fixtures/sources/esm-main', - expected, - }, - { - name: 'with .m extension', - modulePath: './spec/fixtures/sources/esm-ext', - expected, - }, - ]; - - for (const tc of testcases) { - describe(tc.name, () => { - runTests(tc); - }); - } - }); - } }); From 03a898ac31822ddb91daeb7c29b27d43e05414d5 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 3 Feb 2022 22:30:13 +0000 Subject: [PATCH 385/705] 3.17.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 764655dc9..7fee69ccb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.16.0", + "version": "3.17.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.16.0", + "version": "3.17.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 888085883..92ae3a5e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.16.0", + "version": "3.17.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 5da401538f42a626384415991647d12a0e6423a6 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 3 Feb 2022 22:30:18 +0000 Subject: [PATCH 386/705] [firebase-release] Removed change log and reset repo after 3.17.0 release --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a909dbdbd..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +0,0 @@ -- Parallelizes network calls that occur when validating authorization for onCall handlers. -- Adds new regions to V2 API -- Fixes bug where the emulator crashed when given app without an `options` property. -- Adds new alerting providers From 43fc63444b5453d6a322b691b1774102883e8321 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 4 Feb 2022 07:46:00 -0800 Subject: [PATCH 387/705] Unbreak TS users by removing internal annotations for non-internal type definitions. (#1032) Fixes https://github.com/firebase/firebase-functions/issues/1031 --- CHANGELOG.md | 1 + src/common/manifest.ts | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..e22defd51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix issue where TS users couldn't compile their code because of unexported types. (#1032) diff --git a/src/common/manifest.ts b/src/common/manifest.ts index 379e61a4f..e807cdc8f 100644 --- a/src/common/manifest.ts +++ b/src/common/manifest.ts @@ -20,7 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. /** - * @internal * An definition of a function as appears in the Manifest. */ export interface ManifestEndpoint { @@ -68,7 +67,6 @@ export interface ManifestEndpoint { }; } -/* @internal */ export interface ManifestRequiredAPI { api: string; reason: string; From 313680bae2152defdb8c61912672418c8866f4ce Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 4 Feb 2022 15:50:26 +0000 Subject: [PATCH 388/705] 3.17.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7fee69ccb..b6eec3999 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.17.0", + "version": "3.17.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.17.0", + "version": "3.17.1", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 92ae3a5e9..524bf88b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.17.0", + "version": "3.17.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 4b3b9b83c0129d23ac3d6fb9b7c602760b16d3ea Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 4 Feb 2022 15:50:31 +0000 Subject: [PATCH 389/705] [firebase-release] Removed change log and reset repo after 3.17.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e22defd51..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fix issue where TS users couldn't compile their code because of unexported types. (#1032) From 9da9a4eb10217b63774cfcc28b0190ef01c336c9 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 7 Feb 2022 10:23:24 -0800 Subject: [PATCH 390/705] Unbreak v2 TS users by safely removing duplicated manifest definition (#1033) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follows up https://github.com/firebase/firebase-functions/pull/1032 for V2 API to fix https://github.com/firebase/firebase-functions/issues/1031. While rebasing the branch that moved the location of manifest definition (https://github.com/firebase/firebase-functions/pull/1003), the original file was not removed and cleaned up. Having long-lasting PR is dangeroud 🤦🏼‍♂️ . --- CHANGELOG.md | 1 + src/cloud-functions.ts | 2 +- src/common/manifest.ts | 83 ------------------------------- src/providers/https.ts | 2 +- src/runtime/manifest.ts | 3 -- src/v2/providers/alerts/alerts.ts | 2 +- 6 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 src/common/manifest.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..693cef42b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix issue where v2 TS users couldn't compile their code because of unexported types. (#1033) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index d2de0504c..d07676432 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -37,7 +37,7 @@ import { durationFromSeconds, serviceAccountFromShorthand, } from './common/encoding'; -import { ManifestEndpoint, ManifestRequiredAPI } from './common/manifest'; +import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest'; /** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); diff --git a/src/common/manifest.ts b/src/common/manifest.ts deleted file mode 100644 index e807cdc8f..000000000 --- a/src/common/manifest.ts +++ /dev/null @@ -1,83 +0,0 @@ -// 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. -/** - * An definition of a function as appears in the Manifest. - */ -export interface ManifestEndpoint { - entryPoint?: string; - region?: string[]; - platform?: string; - availableMemoryMb?: number; - maxInstances?: number; - minInstances?: number; - concurrency?: number; - serviceAccountEmail?: string; - timeoutSeconds?: number; - vpc?: { - connector: string; - egressSettings?: string; - }; - labels?: Record; - ingressSettings?: string; - environmentVariables?: Record; - - httpsTrigger?: { - invoker?: string[]; - }; - - callableTrigger?: {}; - - eventTrigger?: { - eventFilters: Record; - eventType: string; - retry: boolean; - region?: string; - serviceAccountEmail?: string; - }; - - scheduleTrigger?: { - schedule?: string; - timezone?: string; - retryConfig?: { - retryCount?: number; - maxRetryDuration?: string; - minBackoffDuration?: string; - maxBackoffDuration?: string; - maxDoublings?: number; - }; - }; -} - -export interface ManifestRequiredAPI { - api: string; - reason: string; -} - -/** - * @internal - * An definition of a function deployment as appears in the Manifest. - **/ -export interface ManifestStack { - specVersion: 'v1alpha1'; - requiredAPIs: ManifestRequiredAPI[]; - endpoints: Record; -} diff --git a/src/providers/https.ts b/src/providers/https.ts index ae646fa02..dc62458a7 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -33,7 +33,7 @@ import { convertInvoker, copyIfPresent, } from '../common/encoding'; -import { ManifestEndpoint, ManifestRequiredAPI } from '../common/manifest'; +import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; import { CallableContext, FunctionsErrorCode, diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 379e61a4f..656a0c5d1 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -20,7 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. /** - * @internal * An definition of a function as appears in the Manifest. */ export interface ManifestEndpoint { @@ -68,14 +67,12 @@ export interface ManifestEndpoint { }; } -/* @internal */ export interface ManifestRequiredAPI { api: string; reason: string; } /** - * @internal * An definition of a function deployment as appears in the Manifest. **/ export interface ManifestStack { diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 8c2699795..b1501ed0e 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -1,4 +1,4 @@ -import { ManifestEndpoint } from '../../../common/manifest'; +import { ManifestEndpoint } from '../../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; From c34553aa399d7cae679f3c39e0fd87618ec17862 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 7 Feb 2022 18:47:37 +0000 Subject: [PATCH 391/705] 3.17.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6eec3999..e6b097d69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.17.1", + "version": "3.17.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.17.1", + "version": "3.17.2", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 524bf88b1..ddf21183b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.17.1", + "version": "3.17.2", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 8a515c7634258172a76fd819581217eb247b6772 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 7 Feb 2022 18:47:42 +0000 Subject: [PATCH 392/705] [firebase-release] Removed change log and reset repo after 3.17.2 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 693cef42b..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fix issue where v2 TS users couldn't compile their code because of unexported types. (#1033) From 2c897ea88d0c2397e5b9f1614cb3517f11988749 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 10 Feb 2022 15:18:16 -0800 Subject: [PATCH 393/705] Add runtime option to associate secrets to functions (#1018) Google Cloud Functions (GCF) now have support for loading secrets stored in Secret Manager to securely access application secrets (e.g. Third party API keys) on function executions. See the [documentations(https://cloud.google.com/functions/docs/configuring/secrets) for more details. We propose extending the function runtime option to associate secrets. Then, the secrets can be access as an environment once deployed to GCF. --- CHANGELOG.md | 1 + spec/v1/cloud-functions.spec.ts | 2 ++ spec/v1/function-builder.spec.ts | 36 +++++++++++++++++++++++++++++++- src/cloud-functions.ts | 11 +++++++++- src/common/manifest.ts | 0 src/function-builder.ts | 12 +++++++++++ src/function-configuration.ts | 5 +++++ src/runtime/manifest.ts | 1 + 8 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 src/common/manifest.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..ecd0a47c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Add new runtime option for setting secrets. diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index c894bfa23..5dd0a8941 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -107,6 +107,7 @@ describe('makeCloudFunction', () => { regions: ['us-central1'], memory: '128MB', serviceAccount: 'foo@google.com', + secrets: ['MY_SECRET'], }, }); @@ -123,6 +124,7 @@ describe('makeCloudFunction', () => { }, retry: false, }, + secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }], labels: {}, }); }); diff --git a/spec/v1/function-builder.spec.ts b/spec/v1/function-builder.spec.ts index 13d4daa06..8e01cd87a 100644 --- a/spec/v1/function-builder.spec.ts +++ b/spec/v1/function-builder.spec.ts @@ -472,11 +472,45 @@ describe('FunctionBuilder', () => { ).to.throw(); }); - it('', () => { + it('should throw an error if private identifier is in the invoker array', () => { expect(() => functions.runWith({ invoker: ['service-account1', 'private', 'service-account2'], }) ).to.throw(); }); + + it('should allow valid secret config expressed using short form', () => { + const secrets = ['API_KEY']; + const fn = functions + .runWith({ secrets }) + .auth.user() + .onCreate((user) => user); + + expect(fn.__trigger.secrets).to.deep.equal(secrets); + }); + + it('should throw error given secrets expressed with full resource name', () => { + expect(() => + functions.runWith({ + secrets: ['projects/my-project/secrets/API_KEY'], + }) + ).to.throw(); + }); + + it('should throw error given invalid secret config', () => { + expect(() => + functions.runWith({ + secrets: ['ABC/efg'], + }) + ).to.throw(); + }); + + it('should throw error given invalid secret with versions', () => { + expect(() => + functions.runWith({ + secrets: ['ABC@3'], + }) + ).to.throw(); + }); }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index d07676432..ffe94e031 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -281,6 +281,7 @@ export interface TriggerAnnotated { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; + secrets?: string[]; }; } @@ -552,7 +553,8 @@ export function optionsToTrigger(options: DeploymentOptions) { 'ingressSettings', 'vpcConnectorEgressSettings', 'vpcConnector', - 'labels' + 'labels', + 'secrets' ); convertIfPresent( trigger, @@ -620,6 +622,13 @@ export function optionsToEndpoint( 'serviceAccount', (sa) => sa ); + convertIfPresent( + endpoint, + options, + 'secretEnvironmentVariables', + 'secrets', + (secrets) => secrets.map((secret) => ({ secret, key: secret })) + ); if (options?.vpcConnector) { endpoint.vpc = { connector: options.vpcConnector }; convertIfPresent( diff --git a/src/common/manifest.ts b/src/common/manifest.ts new file mode 100644 index 000000000..e69de29bb diff --git a/src/function-builder.ts b/src/function-builder.ts index ef6f1ad16..cf52bfb56 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -229,6 +229,18 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean { } } + if (runtimeOptions.secrets !== undefined) { + const invalidSecrets = runtimeOptions.secrets.filter( + (s) => !/^[A-Za-z\d\-_]+$/.test(s) + ); + if (invalidSecrets.length > 0) { + throw new Error( + `Invalid secrets: ${invalidSecrets.join(',')}. ` + + 'Secret must be configured using the resource id (e.g. API_KEY)' + ); + } + } + return true; } diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 5aa6177fd..73cc64eac 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -165,6 +165,11 @@ export interface RuntimeOptions { * Allow requests with invalid App Check tokens on callable functions. */ allowInvalidAppCheckToken?: boolean; + + /* + * Secrets to bind to a function instance. + */ + secrets?: string[]; } export interface DeploymentOptions extends RuntimeOptions { diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 656a0c5d1..aaaf87761 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -39,6 +39,7 @@ export interface ManifestEndpoint { labels?: Record; ingressSettings?: string; environmentVariables?: Record; + secretEnvironmentVariables?: { key: string; secret?: string }[]; httpsTrigger?: { invoker?: string[]; From 388983a9e186a46a744598cbacc7a7f4eee9587c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 11 Feb 2022 00:22:06 +0000 Subject: [PATCH 394/705] 3.18.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6b097d69..0cd6dc48f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.17.2", + "version": "3.18.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.17.2", + "version": "3.18.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index ddf21183b..9a98a54f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.17.2", + "version": "3.18.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From f68e62922cb5a402cdd8290008e8eb08858c009c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 11 Feb 2022 00:22:10 +0000 Subject: [PATCH 395/705] [firebase-release] Removed change log and reset repo after 3.18.0 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd0a47c5..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Add new runtime option for setting secrets. From b3a549d3072a5ea8ec599076bd67177694ba8ab6 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 15 Feb 2022 11:40:39 -0800 Subject: [PATCH 396/705] Expose stack on functions.yaml instead of stack.yaml. (#1036) Some contractual changes to how we expose the container contract: * We will expose `__/functions.yaml` instead of `__/stack.yaml` in the control api * Environment variables for exposing the control api changes from `STACK_CONTROL_API_PORT` to `PORT` and `FUNCTIONS_CONTROL_API` (whose value should equal `true`). --- scripts/bin-test/test.ts | 13 +++++++------ src/bin/firebase-functions.ts | 29 ++++++++++++++++------------- src/runtime/loader.ts | 3 +-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/scripts/bin-test/test.ts b/scripts/bin-test/test.ts index 1c6f1a24e..0ce2f6518 100644 --- a/scripts/bin-test/test.ts +++ b/scripts/bin-test/test.ts @@ -85,7 +85,8 @@ async function startBin( env: { PATH: process.env.PATH, GLCOUD_PROJECT: 'test-project', - STACK_CONTROL_API_PORT: port, + PORT: port, + FUNCTIONS_CONTROL_API: 'true', }, }); @@ -95,7 +96,7 @@ async function startBin( await retryUntil(async () => { try { - await fetch(`http://localhost:${port}/__/stack.yaml`); + await fetch(`http://localhost:${port}/__/functions.yaml`); } catch (e) { if (e?.code === 'ECONNREFUSED') { return false; @@ -132,7 +133,7 @@ async function startBin( }; } -describe('stack.yaml', () => { +describe('functions.yaml', () => { async function runTests(tc: Testcase) { let port: number; let cleanup: () => Promise; @@ -147,14 +148,14 @@ describe('stack.yaml', () => { await cleanup?.(); }); - it('stack.yaml returns expected Manifest', async () => { - const res = await fetch(`http://localhost:${port}/__/stack.yaml`); + it('functions.yaml returns expected Manifest', async () => { + const res = await fetch(`http://localhost:${port}/__/functions.yaml`); const text = await res.text(); let parsed: any; try { parsed = yaml.load(text); } catch (err) { - throw new Error('Failed to parse stack.yaml ' + err); + throw new Error('Failed to parse functions.yaml ' + err); } expect(parsed).to.be.deep.equal(tc.expected); }); diff --git a/src/bin/firebase-functions.ts b/src/bin/firebase-functions.ts index 597819658..4b4eba900 100644 --- a/src/bin/firebase-functions.ts +++ b/src/bin/firebase-functions.ts @@ -35,21 +35,24 @@ async function handleQuitquitquit(req: express.Request, res: express.Response) { app.get('/__/quitquitquit', handleQuitquitquit); app.post('/__/quitquitquit', handleQuitquitquit); -app.get('/__/stack.yaml', async (req, res) => { - try { - const stack = await loadStack(functionsDir); - res.setHeader('content-type', 'text/yaml'); - res.send(JSON.stringify(stack)); - } catch (e) { - res - .status(400) - .send(`Failed to generate manifest from function source: ${e}`); - } -}); + +if (process.env.FUNCTIONS_CONTROL_API === 'true') { + app.get('/__/functions.yaml', async (req, res) => { + try { + const stack = await loadStack(functionsDir); + res.setHeader('content-type', 'text/yaml'); + res.send(JSON.stringify(stack)); + } catch (e) { + res + .status(400) + .send(`Failed to generate manifest from function source: ${e}`); + } + }); +} let port = 8080; -if (process.env.STACK_CONTROL_API_PORT) { - port = Number.parseInt(process.env.STACK_CONTROL_API_PORT); +if (process.env.PORT) { + port = Number.parseInt(process.env.PORT); } console.log('Serving at port', port); diff --git a/src/runtime/loader.ts b/src/runtime/loader.ts index f9ba05652..8d08138b9 100644 --- a/src/runtime/loader.ts +++ b/src/runtime/loader.ts @@ -110,10 +110,9 @@ export async function loadStack(functionsDir: string): Promise { extractStack(mod, endpoints, requiredAPIs); - const stack: ManifestStack = { + return { endpoints, specVersion: 'v1alpha1', requiredAPIs: mergeRequiredAPIs(requiredAPIs), }; - return stack; } From 069695b99c5eb8f2eb65324b89c5fdae791725ba Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 17 Feb 2022 10:41:38 -0800 Subject: [PATCH 397/705] Add missing changelog entry for #1036. (#1041) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..17c1c5d19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Expose stack YAML via \_\_/functions.yaml endpoint instead (#1036). From 0345715531913ea93c6c0b8cc5ef6fd0a2945f09 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 18 Feb 2022 18:23:16 +0000 Subject: [PATCH 398/705] 3.18.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cd6dc48f..50cc3bb62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.18.0", + "version": "3.18.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.18.0", + "version": "3.18.1", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 9a98a54f8..86163fc08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.18.0", + "version": "3.18.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 795a80500527f23723cdbca124bc7a7693cb14a7 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 18 Feb 2022 18:23:19 +0000 Subject: [PATCH 399/705] [firebase-release] Removed change log and reset repo after 3.18.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17c1c5d19..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Expose stack YAML via \_\_/functions.yaml endpoint instead (#1036). From 162979366c541b2c74d1a5d8d3d79bc4c2b6fe9e Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 23 Feb 2022 08:07:16 -0800 Subject: [PATCH 400/705] Update test command to run all tests, not a subset. (#1046) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86163fc08..07ee2ccf5 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'", "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", - "test": "mocha --file ./mocha/setup.ts spec/**/*.spec.ts ", + "test": "mocha --file ./mocha/setup.ts \"spec/**/*.spec.ts\"", "test:bin": "./scripts/bin-test/run.sh" }, "dependencies": { From 2b83e1d2531cbf6a88f8350aabeb1a50b16cd62a Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 23 Feb 2022 13:02:41 -0800 Subject: [PATCH 401/705] Add support for more instance sizes and regions (#1037) --- src/v2/options.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/v2/options.ts b/src/v2/options.ts index 77919ab0b..73eca40ac 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -36,10 +36,13 @@ import { ManifestEndpoint } from '../runtime/manifest'; * List of all regions supported by Cloud Functions v2 */ export const SUPPORTED_REGIONS = [ - 'us-west1', - 'us-central1', - 'europe-west4', 'asia-northeast1', + 'europe-north1', + 'europe-west1', + 'europe-west4', + 'us-central1', + 'us-east1', + 'us-west1', ] as const; /** @@ -71,21 +74,27 @@ export const MAX_CONCURRENCY = 1_000; * List of available memory options supported by Cloud Functions. */ export const SUPPORTED_MEMORY_OPTIONS = [ + '128MB', '256MB', '512MB', '1GB', '2GB', '4GB', '8GB', + '16GB', + '32GB', ] as const; const MemoryOptionToMB: Record = { + '128MB': 128, '256MB': 256, '512MB': 512, '1GB': 1024, '2GB': 2048, '4GB': 4096, '8GB': 8192, + '16GB': 16384, + '32GB': 32768, }; /** From c09761aa4517e7b1d1e7a4f9ae3199fe8379348c Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Fri, 4 Mar 2022 10:29:44 -0500 Subject: [PATCH 402/705] Fix handler typo in billing alerts (#1045) * fixing typo * changing var name & fixing describe title * updating alerttype --- spec/v2/providers/alerts/billing.spec.ts | 10 +++++----- src/v2/providers/alerts/billing.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts index a9e4e173d..71e695fc7 100644 --- a/spec/v2/providers/alerts/billing.spec.ts +++ b/spec/v2/providers/alerts/billing.spec.ts @@ -43,9 +43,9 @@ describe('billing', () => { }); }); - describe('onAutomatedPlanUpdatePublished', () => { + describe('onPlanAutomatedUpdatePublished', () => { it('should create a function with only handler', () => { - const func = billing.onAutomatedPlanUpdatePublished(myHandler); + const func = billing.onPlanAutomatedUpdatePublished(myHandler); expect(func.__endpoint).to.deep.equal({ platform: 'gcfv2', @@ -53,7 +53,7 @@ describe('billing', () => { eventTrigger: { eventType: alerts.eventType, eventFilters: { - alertType: billing.automatedPlanUpdateAlert, + alertType: billing.planAutomatedUpdateAlert, }, retry: false, }, @@ -61,7 +61,7 @@ describe('billing', () => { }); it('should create a function with opts & handler', () => { - const func = billing.onAutomatedPlanUpdatePublished( + const func = billing.onPlanAutomatedUpdatePublished( { ...FULL_OPTIONS }, myHandler ); @@ -71,7 +71,7 @@ describe('billing', () => { eventTrigger: { eventType: alerts.eventType, eventFilters: { - alertType: billing.automatedPlanUpdateAlert, + alertType: billing.planAutomatedUpdateAlert, }, retry: false, }, diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index f2ecd4289..dd8ccb2c5 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -32,7 +32,7 @@ export type BillingEvent = CloudEvent, WithAlertType>; /** @internal */ export const planUpdateAlert = 'billing.planUpdate'; /** @internal */ -export const automatedPlanUpdateAlert = 'billing.automatedPlanUpdate'; +export const planAutomatedUpdateAlert = 'billing.planAutomatedUpdate'; /** * Declares a function that can handle a billing plan update event. @@ -60,18 +60,18 @@ export function onPlanUpdatePublished( /** * Declares a function that can handle an automated billing plan update event. */ -export function onAutomatedPlanUpdatePublished( +export function onPlanAutomatedUpdatePublished( handler: ( event: BillingEvent ) => any | Promise ): CloudFunction>; -export function onAutomatedPlanUpdatePublished( +export function onPlanAutomatedUpdatePublished( opts: options.EventHandlerOptions, handler: ( event: BillingEvent ) => any | Promise ): CloudFunction>; -export function onAutomatedPlanUpdatePublished( +export function onPlanAutomatedUpdatePublished( optsOrHandler: | options.EventHandlerOptions | ((event: BillingEvent) => any | Promise), @@ -80,7 +80,7 @@ export function onAutomatedPlanUpdatePublished( ) => any | Promise ): CloudFunction> { return onOperation( - automatedPlanUpdateAlert, + planAutomatedUpdateAlert, optsOrHandler, handler ); From f45e45f28294f578c22f2e26f65c16cf1563720f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 7 Mar 2022 11:42:47 -0800 Subject: [PATCH 403/705] Migrate endpoint annotation eventTrigger.eventFilters to list of filters (#1052) Previously, `eventFilter` attribute was an object: ``` eventTrigger: { eventType: "an.event", eventFilter: { resource: "my-storage-bucket", appId: "12345", } } ``` We now prefer eventFilter as a list: ``` eventTrigger: { eventType: "an.event", eventFilter: [ { attribute: "resource", value: "my-storage-bucket", }. { attribute: "appId", value: "12345", }. ] } ``` Most of the change in this PR is in tests. Few other minor changes I've squeezed in here: 1. Added a changelog entry for https://github.com/firebase/firebase-functions/pull/1037 2. Deleted obsolete src/common/manifest.ts file 3. Small refactoring of alerts/crashlytics spec to make this migration easier. --- CHANGELOG.md | 1 + spec/runtime/loader.spec.ts | 7 +- spec/v1/cloud-functions.spec.ts | 36 +- spec/v1/providers/analytics.spec.ts | 9 +- spec/v1/providers/auth.spec.ts | 9 +- spec/v1/providers/database.spec.ts | 9 +- spec/v1/providers/firestore.spec.ts | 9 +- spec/v1/providers/pubsub.spec.ts | 9 +- spec/v1/providers/remoteConfig.spec.ts | 9 +- spec/v1/providers/storage.spec.ts | 9 +- spec/v1/providers/testLab.spec.ts | 9 +- spec/v2/providers/alerts/alerts.spec.ts | 69 ++- .../providers/alerts/appDistribution.spec.ts | 46 +- spec/v2/providers/alerts/billing.spec.ts | 54 +- spec/v2/providers/alerts/crashlytics.spec.ts | 568 +++++------------- spec/v2/providers/pubsub.spec.ts | 9 +- spec/v2/providers/storage.spec.ts | 162 +++-- src/cloud-functions.ts | 9 +- src/common/manifest.ts | 0 src/runtime/manifest.ts | 16 +- src/v2/providers/alerts/alerts.ts | 14 +- src/v2/providers/pubsub.ts | 2 +- src/v2/providers/storage.ts | 4 +- 23 files changed, 475 insertions(+), 594 deletions(-) delete mode 100644 src/common/manifest.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..c094d2168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Add support for more regions and memory for v2 functions (#1037). diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index 436d3ea62..11acb583f 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -122,7 +122,12 @@ describe('extractStack', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.pubsub.topic.publish', - eventFilters: { resource: 'projects/my-project/topics/my-topic' }, + eventFilters: [ + { + attribute: 'resource', + value: 'projects/my-project/topics/my-topic', + }, + ], retry: false, }, labels: {}, diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index 5dd0a8941..3405af695 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -62,9 +62,12 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: { - resource: 'resource', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'resource', + }, + ], retry: false, }, labels: {}, @@ -86,9 +89,12 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'providers/provider/eventTypes/event', - eventFilters: { - resource: 'resource', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'resource', + }, + ], retry: false, }, labels: {}, @@ -119,9 +125,12 @@ describe('makeCloudFunction', () => { serviceAccountEmail: 'foo@google.com', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: { - resource: 'resource', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'resource', + }, + ], retry: false, }, secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }], @@ -143,9 +152,12 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: { - resource: 'resource', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'resource', + }, + ], retry: true, }, labels: {}, diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts index ead39554f..1603fc280 100644 --- a/spec/v1/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -72,9 +72,12 @@ describe('Analytics Functions', () => { expect(cloudFunction.__endpoint).to.deep.equal({ platform: 'gcfv1', eventTrigger: { - eventFilters: { - resource: 'projects/project1/events/first_open', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'projects/project1/events/first_open', + }, + ], eventType: 'providers/google.firebase.analytics/eventTypes/event.log', retry: false, diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index 8659a1967..3f5913d2b 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -64,9 +64,12 @@ describe('Auth Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: { - resource: `projects/${project}`, - }, + eventFilters: [ + { + attribute: 'resource', + value: `projects/${project}`, + }, + ], eventType: `providers/firebase.auth/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index f932dd871..21706b2d5 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -45,9 +45,12 @@ describe('Database Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: { - resource, - }, + eventFilters: [ + { + attribute: 'resource', + value: resource, + }, + ], eventType: `providers/google.firebase.database/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts index 3f9f07fbe..0317e69f0 100644 --- a/spec/v1/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -107,9 +107,12 @@ describe('Firestore Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: { - resource, - }, + eventFilters: [ + { + attribute: 'resource', + value: resource, + }, + ], eventType: `providers/cloud.firestore/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts index 5547515ab..eddf6533c 100644 --- a/spec/v1/providers/pubsub.spec.ts +++ b/spec/v1/providers/pubsub.spec.ts @@ -108,9 +108,12 @@ describe('Pubsub Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.pubsub.topic.publish', - eventFilters: { - resource: 'projects/project1/topics/toppy', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'projects/project1/topics/toppy', + }, + ], retry: false, }, labels: {}, diff --git a/spec/v1/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts index f3fde2043..8dc310a7b 100644 --- a/spec/v1/providers/remoteConfig.spec.ts +++ b/spec/v1/providers/remoteConfig.spec.ts @@ -68,9 +68,12 @@ describe('RemoteConfig Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.firebase.remoteconfig.update', - eventFilters: { - resource: 'projects/project1', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'projects/project1', + }, + ], retry: false, }, labels: {}, diff --git a/spec/v1/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts index d96b131b9..d99a14baa 100644 --- a/spec/v1/providers/storage.spec.ts +++ b/spec/v1/providers/storage.spec.ts @@ -42,9 +42,12 @@ describe('Storage Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: { - resource: `projects/_/buckets/${bucket}`, - }, + eventFilters: [ + { + attribute: 'resource', + value: `projects/_/buckets/${bucket}`, + }, + ], eventType: `google.storage.object.${eventType}`, retry: false, }, diff --git a/spec/v1/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts index b3ba22d7f..968ccb079 100644 --- a/spec/v1/providers/testLab.spec.ts +++ b/spec/v1/providers/testLab.spec.ts @@ -50,9 +50,12 @@ describe('Test Lab Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.testing.testMatrix.complete', - eventFilters: { - resource: 'projects/project1/testMatrices/{matrix}', - }, + eventFilters: [ + { + attribute: 'resource', + value: 'projects/project1/testMatrices/{matrix}', + }, + ], retry: false, }, labels: {}, diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts index b63f567aa..4f53c41d2 100644 --- a/spec/v2/providers/alerts/alerts.spec.ts +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -16,9 +16,12 @@ describe('alerts', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -38,10 +41,16 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); @@ -72,9 +81,12 @@ describe('alerts', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -87,9 +99,12 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -102,10 +117,16 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); @@ -132,10 +153,16 @@ describe('alerts', () => { minInstances: 3, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts index 52fdfd3b9..2f8ea5c5a 100644 --- a/spec/v2/providers/alerts/appDistribution.spec.ts +++ b/spec/v2/providers/alerts/appDistribution.spec.ts @@ -19,10 +19,16 @@ describe('appDistribution', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: appDistribution.newTesterIosDeviceAlert, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: appDistribution.newTesterIosDeviceAlert, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); @@ -38,9 +44,12 @@ describe('appDistribution', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: appDistribution.newTesterIosDeviceAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: appDistribution.newTesterIosDeviceAlert, + }, + ], retry: false, }, }); @@ -56,10 +65,16 @@ describe('appDistribution', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: appDistribution.newTesterIosDeviceAlert, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: appDistribution.newTesterIosDeviceAlert, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); @@ -73,9 +88,12 @@ describe('appDistribution', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: appDistribution.newTesterIosDeviceAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: appDistribution.newTesterIosDeviceAlert, + }, + ], retry: false, }, }); diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts index 71e695fc7..bc3fa6a9a 100644 --- a/spec/v2/providers/alerts/billing.spec.ts +++ b/spec/v2/providers/alerts/billing.spec.ts @@ -16,9 +16,12 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: billing.planUpdateAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: billing.planUpdateAlert, + }, + ], retry: false, }, }); @@ -34,9 +37,12 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: billing.planUpdateAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: billing.planUpdateAlert, + }, + ], retry: false, }, }); @@ -52,9 +58,12 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: billing.planAutomatedUpdateAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: billing.planAutomatedUpdateAlert, + }, + ], retry: false, }, }); @@ -70,9 +79,12 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: billing.planAutomatedUpdateAlert, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: billing.planAutomatedUpdateAlert, + }, + ], retry: false, }, }); @@ -88,9 +100,12 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -107,9 +122,12 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); diff --git a/spec/v2/providers/alerts/crashlytics.spec.ts b/spec/v2/providers/alerts/crashlytics.spec.ts index 1d5c1a8b6..0ac00c5e0 100644 --- a/spec/v2/providers/alerts/crashlytics.spec.ts +++ b/spec/v2/providers/alerts/crashlytics.spec.ts @@ -8,437 +8,121 @@ const APPID = '123456789'; const myHandler = () => 42; describe('crashlytics', () => { - describe('onNewFatalIssuePublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onNewFatalIssuePublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newFatalIssueAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onNewFatalIssuePublished(APPID, myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newFatalIssueAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - - it('should create a function with base opts', () => { - const func = crashlytics.onNewFatalIssuePublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newFatalIssueAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onNewFatalIssuePublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newFatalIssueAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - }); - - describe('onNewNonfatalIssuePublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onNewNonfatalIssuePublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newNonfatalIssueAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onNewNonfatalIssuePublished(APPID, myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newNonfatalIssueAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - - it('should create a function with base opts', () => { - const func = crashlytics.onNewNonfatalIssuePublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newNonfatalIssueAlert, + const testcases = [ + { + method: 'onNewFatalIssuePublished', + event: crashlytics.newFatalIssueAlert, + }, + { + method: 'onNewNonfatalIssuePublished', + event: crashlytics.newNonfatalIssueAlert, + }, + { + method: 'onRegressionAlertPublished', + event: crashlytics.regressionAlert, + }, + { + method: 'onStabilityDigestPublished', + event: crashlytics.stabilityDigestAlert, + }, + { + method: 'onVelocityAlertPublished', + event: crashlytics.velocityAlert, + }, + { + method: 'onNewAnrIssuePublished', + event: crashlytics.newAnrIssueAlert, + }, + ]; + + for (const { method, event } of testcases) { + describe(method, () => { + it('should create a function only handler', () => { + const func = crashlytics[method](myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: [ + { + attribute: 'alerttype', + value: event, + }, + ], + retry: false, }, - retry: false, - }, + }); }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onNewNonfatalIssuePublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newNonfatalIssueAlert, - appId: APPID, + it('should create a function with appId', () => { + const func = crashlytics[method](APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: [ + { + attribute: 'alerttype', + value: event, + }, + { + attribute: 'appid', + value: APPID, + }, + ], + retry: false, }, - retry: false, - }, + }); }); - }); - }); - describe('onRegressionAlertPublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onRegressionAlertPublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.regressionAlert, + it('should create a function with base opts', () => { + const func = crashlytics[method]({ ...FULL_OPTIONS }, myHandler); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: [ + { + attribute: 'alerttype', + value: event, + }, + ], + retry: false, }, - retry: false, - }, + }); }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onRegressionAlertPublished(APPID, myHandler); - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.regressionAlert, - appId: APPID, + it('should create a function with opts', () => { + const func = crashlytics[method]( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: [ + { + attribute: 'alerttype', + value: event, + }, + { + attribute: 'appid', + value: APPID, + }, + ], + retry: false, }, - retry: false, - }, + }); }); }); - - it('should create a function with base opts', () => { - const func = crashlytics.onRegressionAlertPublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.regressionAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onRegressionAlertPublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.regressionAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - }); - - describe('onStabilityDigestPublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onStabilityDigestPublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.stabilityDigestAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onStabilityDigestPublished(APPID, myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.stabilityDigestAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - - it('should create a function with base opts', () => { - const func = crashlytics.onStabilityDigestPublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.stabilityDigestAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onStabilityDigestPublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.stabilityDigestAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - }); - - describe('onVelocityAlertPublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onVelocityAlertPublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.velocityAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onVelocityAlertPublished(APPID, myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.velocityAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - - it('should create a function with base opts', () => { - const func = crashlytics.onVelocityAlertPublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.velocityAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onVelocityAlertPublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.velocityAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - }); - - describe('onNewAnrIssuePublished', () => { - it('should create a function only handler', () => { - const func = crashlytics.onNewAnrIssuePublished(myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newAnrIssueAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with appId', () => { - const func = crashlytics.onNewAnrIssuePublished(APPID, myHandler); - - expect(func.__endpoint).to.deep.equal({ - platform: 'gcfv2', - labels: {}, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newAnrIssueAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - - it('should create a function with base opts', () => { - const func = crashlytics.onNewAnrIssuePublished( - { ...FULL_OPTIONS }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newAnrIssueAlert, - }, - retry: false, - }, - }); - }); - - it('should create a function with opts', () => { - const func = crashlytics.onNewAnrIssuePublished( - { ...FULL_OPTIONS, appId: APPID }, - myHandler - ); - - expect(func.__endpoint).to.deep.equal({ - ...FULL_ENDPOINT, - eventTrigger: { - eventType: alerts.eventType, - eventFilters: { - alertType: crashlytics.newAnrIssueAlert, - appId: APPID, - }, - retry: false, - }, - }); - }); - }); + } describe('onOperation', () => { it('should create a function with alertType only', () => { @@ -449,9 +133,12 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -465,10 +152,16 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); @@ -485,9 +178,12 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + ], retry: false, }, }); @@ -504,10 +200,16 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: { - alertType: ALERT_TYPE, - appId: APPID, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: ALERT_TYPE, + }, + { + attribute: 'appid', + value: APPID, + }, + ], retry: false, }, }); diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index f48e10f72..303ffa1d7 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -12,9 +12,12 @@ const EVENT_TRIGGER = { const ENDPOINT_EVENT_TRIGGER = { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', - eventFilters: { - topic: 'topic', - }, + eventFilters: [ + { + attribute: 'topic', + value: 'topic', + }, + ], retry: false, }; diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts index 8c2e25576..cb612e561 100644 --- a/spec/v2/providers/storage.spec.ts +++ b/spec/v2/providers/storage.spec.ts @@ -12,9 +12,12 @@ const EVENT_TRIGGER = { const ENDPOINT_EVENT_TRIGGER = { eventType: 'event-type', - eventFilters: { - bucket: 'some-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'some-bucket', + }, + ], retry: false, }; @@ -116,9 +119,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_EVENT_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, region: ['us-west1'], }); @@ -268,9 +274,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, }); }); @@ -292,9 +301,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, }); }); @@ -320,9 +332,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, region: ['us-west1'], }); @@ -348,9 +363,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, region: ['us-west1'], }); @@ -395,9 +413,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, }); }); @@ -419,9 +440,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, }); }); @@ -447,9 +471,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, region: ['us-west1'], }); @@ -478,9 +505,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, region: ['us-west1'], }); @@ -525,9 +555,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, }); @@ -551,9 +584,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, }); }); @@ -579,9 +615,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, region: ['us-west1'], }); @@ -607,9 +646,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, region: ['us-west1'], }); @@ -654,9 +696,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, }); @@ -680,9 +725,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, }); }); @@ -708,9 +756,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: { - bucket: 'my-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'my-bucket', + }, + ], }, region: ['us-west1'], }); @@ -739,9 +790,12 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: { - bucket: 'default-bucket', - }, + eventFilters: [ + { + attribute: 'bucket', + value: 'default-bucket', + }, + ], }, region: ['us-west1'], }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index ffe94e031..ab6fdb120 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -461,9 +461,12 @@ export function makeCloudFunction({ } else { endpoint.eventTrigger = { eventType: legacyEventType || provider + '.' + eventType, - eventFilters: { - resource: triggerResource(), - }, + eventFilters: [ + { + attribute: 'resource', + value: triggerResource(), + }, + ], retry: !!options.failurePolicy, }; } diff --git a/src/common/manifest.ts b/src/common/manifest.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index aaaf87761..2b08385d5 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -19,6 +19,16 @@ // 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. +/** + * One or more event filters restrict the set of events delivered to an EventTrigger. + */ +interface EventFilter { + attribute: string; + value: string; + // if left unspecified, equality is used. + operator?: string; +} + /** * An definition of a function as appears in the Manifest. */ @@ -39,7 +49,7 @@ export interface ManifestEndpoint { labels?: Record; ingressSettings?: string; environmentVariables?: Record; - secretEnvironmentVariables?: { key: string; secret?: string }[]; + secretEnvironmentVariables?: Array<{ key: string; secret?: string }>; httpsTrigger?: { invoker?: string[]; @@ -48,7 +58,7 @@ export interface ManifestEndpoint { callableTrigger?: {}; eventTrigger?: { - eventFilters: Record; + eventFilters: EventFilter[]; eventType: string; retry: boolean; region?: string; @@ -75,7 +85,7 @@ export interface ManifestRequiredAPI { /** * An definition of a function deployment as appears in the Manifest. - **/ + */ export interface ManifestStack { specVersion: 'v1alpha1'; requiredAPIs: ManifestRequiredAPI[]; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index b1501ed0e..902bd4232 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -91,14 +91,20 @@ export function getEndpointAnnotation( }, eventTrigger: { eventType, - eventFilters: { - alertType, - }, + eventFilters: [ + { + attribute: 'alerttype', + value: alertType, + }, + ], retry: !!opts.retry, }, }; if (appId) { - endpoint.eventTrigger.eventFilters.appId = appId; + endpoint.eventTrigger.eventFilters.push({ + attribute: 'appid', + value: appId, + }); } return endpoint; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 2964af42d..01b731ccb 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -174,7 +174,7 @@ export function onMessagePublished( }, eventTrigger: { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', - eventFilters: { topic }, + eventFilters: [{ attribute: 'topic', value: topic }], retry: false, }, }; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index d5490317d..8e63ea45e 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -360,9 +360,7 @@ export function onOperation( }, eventTrigger: { eventType, - eventFilters: { - bucket, - }, + eventFilters: [{ attribute: 'bucket', value: bucket }], retry: false, }, }; From 0a1c7ab54062a7f2413159e853130626380f5061 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Fri, 11 Mar 2022 15:14:00 +0000 Subject: [PATCH 404/705] Fix bug where RTDB trigger for instances w/ "ref" in the db name were incorrectly parsed. Fixes #1055 --- CHANGELOG.md | 1 + spec/v1/providers/database.spec.ts | 16 ++++++++++++++++ src/providers/database.ts | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c094d2168..939704fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Add support for more regions and memory for v2 functions (#1037). +- Fixes bug where some RTDB instance names were incorrectly parsed (#1056). diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index 21706b2d5..2ea1022e3 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -529,6 +529,22 @@ describe('Database Functions', () => { expect(path).to.equal('/bar'); }); + it('should return the correct instance and path strings if root path is /refs', () => { + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/refs' + ); + expect(instance).to.equal('https://foo.firebaseio.com'); + expect(path).to.equal('/refs'); + }); + + it('should return the correct instance and path strings if a child path contain /refs', () => { + const [instance, path] = database.extractInstanceAndPath( + 'projects/_/instances/foo/refs/root/refs' + ); + expect(instance).to.equal('https://foo.firebaseio.com'); + expect(path).to.equal('/root/refs'); + }); + it('should return the correct multi-region instance and path strings if domain is present', () => { const [instance, path] = database.extractInstanceAndPath( 'projects/_/instances/foo/refs/bar', diff --git a/src/providers/database.ts b/src/providers/database.ts index 53eb9ba12..e5f4d8ed3 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -307,6 +307,8 @@ export class RefBuilder { }; } +const resourceRegex = /^projects\/([^/]+)\/instances\/([a-zA-Z0-9-]+)\/refs(\/.+)?/; + /** * Utility function to extract database reference from resource string * @@ -320,7 +322,6 @@ export function extractInstanceAndPath( resource: string, domain = 'firebaseio.com' ) { - const resourceRegex = `projects/([^/]+)/instances/([a-zA-Z0-9\-^/]+)/refs(/.+)?`; const match = resource.match(new RegExp(resourceRegex)); if (!match) { throw new Error( From 307fe694cea998b4bfcd39a7bfcb19582814f29c Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 16 Mar 2022 18:16:07 +0000 Subject: [PATCH 405/705] 3.19.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50cc3bb62..94bf393fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "firebase-functions", - "version": "3.18.1", + "version": "3.19.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.18.1", + "version": "3.19.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 07ee2ccf5..a478a7a91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.18.1", + "version": "3.19.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 270605dcc884933a7356406ef504ccd7a54cfaca Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 16 Mar 2022 18:16:12 +0000 Subject: [PATCH 406/705] [firebase-release] Removed change log and reset repo after 3.19.0 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 939704fd0..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Add support for more regions and memory for v2 functions (#1037). -- Fixes bug where some RTDB instance names were incorrectly parsed (#1056). From 6d146aa5604c899f21b19a749b8e6663bddef697 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 28 Mar 2022 16:28:00 -0700 Subject: [PATCH 407/705] Update package-lock.json and use npm ci for CI. (#1064) --- .github/workflows/test.yaml | 2 +- package-lock.json | 597 ++++++++++++++++++++++++++++-------- 2 files changed, 464 insertions(+), 135 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 75cee99b0..33242e9b8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -29,7 +29,7 @@ jobs: path: ~/.npm key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }} - - run: npm install + - run: npm ci - run: npm run lint - run: npm run format - run: npm run test diff --git a/package-lock.json b/package-lock.json index 94bf393fb..0201ae801 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "firebase-functions", "version": "3.19.0", "license": "MIT", "dependencies": { @@ -39,10 +40,12 @@ "mock-require": "^3.0.3", "mz": "^2.7.0", "nock": "^10.0.6", + "node-fetch": "^2.6.7", + "portfinder": "^1.0.28", "prettier": "^1.18.2", "semver": "^7.3.5", "sinon": "^7.3.2", - "ts-node": "^8.3.0", + "ts-node": "^10.4.0", "tslint": "^5.18.0", "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", @@ -84,53 +87,33 @@ "js-tokens": "^4.0.0" } }, - "node_modules/@firebase/app": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.4.tgz", - "integrity": "sha512-XBrZb60m7N1XqmRhSJWADDD3J/0j9wM2VhxC5KUEtFA9SWfTn9Z3EWGtRGz7ahrMkgPJsmo0fXpvUh6cY8pQvQ==", + "node_modules/@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", "dev": true, - "peer": true, - "dependencies": { - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" + "engines": { + "node": ">= 12" } }, - "node_modules/@firebase/app-compat": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.5.tgz", - "integrity": "sha512-GJURp5Nn8dEm72/y13Z+XMvWmMomsYViNxw6VKYqVH9f9VKnJ46Q8zYtx2ePvOuj7pAqsfwNkvAdAFYcveTe9g==", + "node_modules/@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", "dev": true, - "peer": true, "dependencies": { - "@firebase/app": "0.7.4", - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" + "@cspotcode/source-map-consumer": "0.8.0" + }, + "engines": { + "node": ">=12" } }, - "node_modules/@firebase/app-compat/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true, - "peer": true - }, "node_modules/@firebase/app-types": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==", "dev": true }, - "node_modules/@firebase/app/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true, - "peer": true - }, "node_modules/@firebase/auth-interop-types": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", @@ -383,6 +366,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/@grpc/grpc-js": { @@ -446,6 +432,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/@grpc/proto-loader/node_modules/cliui": { @@ -538,6 +527,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/@grpc/proto-loader/node_modules/yargs": { @@ -698,6 +690,30 @@ "node": ">= 6" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "node_modules/@types/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", @@ -950,6 +966,11 @@ }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/agent-base/node_modules/ms": { @@ -969,6 +990,10 @@ "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, "node_modules/ansi-colors": { @@ -1082,6 +1107,15 @@ "node": "*" } }, + "node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "dependencies": { + "lodash": "^4.17.14" + } + }, "node_modules/async-retry": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", @@ -1124,6 +1158,20 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "optional": true }, "node_modules/bcrypt-pbkdf": { @@ -1205,12 +1253,6 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", "dev": true }, - "node_modules/buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", - "dev": true - }, "node_modules/builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -1267,6 +1309,9 @@ "dev": true, "dependencies": { "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 5" } }, "node_modules/chalk": { @@ -1500,6 +1545,12 @@ "node": ">= 0.10" } }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "node_modules/cross-spawn": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", @@ -1816,6 +1867,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/es-to-primitive": { @@ -1830,6 +1884,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/escalade": { @@ -1867,6 +1924,9 @@ }, "engines": { "node": ">=4.0.0" + }, + "peerDependencies": { + "prettier": ">= 0.11.0" } }, "node_modules/estraverse": { @@ -2064,6 +2124,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "deprecated": "Fixed a prototype pollution security issue in 4.1.0, please upgrade to ^4.1.1 or ^5.0.1.", "dev": true, "dependencies": { "is-buffer": "~2.0.3" @@ -2218,6 +2279,9 @@ "optional": true, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/getpass": { @@ -2441,6 +2505,7 @@ "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", "dev": true, "dependencies": { "ajv": "^6.12.3", @@ -2469,6 +2534,9 @@ "dev": true, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/hash-stream-validation": { @@ -2567,6 +2635,11 @@ }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/http-proxy-agent/node_modules/ms": { @@ -2616,6 +2689,11 @@ }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/https-proxy-agent/node_modules/ms": { @@ -2694,6 +2772,9 @@ "dev": true, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-date-object": { @@ -2703,6 +2784,9 @@ "dev": true, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-fullwidth-code-point": { @@ -2749,6 +2833,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-stream": { @@ -2778,6 +2865,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-typedarray": { @@ -2814,6 +2904,9 @@ }, "engines": { "node": ">=10.13.0 < 13 || >=13.7.0" + }, + "funding": { + "url": "https://github.com/sponsors/panva" } }, "node_modules/js-tokens": { @@ -2889,6 +2982,14 @@ }, "engines": { "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } } }, "node_modules/jsdom/node_modules/escodegen": { @@ -3066,6 +3167,11 @@ }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/jwks-rsa/node_modules/ms": { @@ -3260,6 +3366,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/make-dir/node_modules/semver": { @@ -3444,6 +3553,7 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", "dev": true, "dependencies": { "ms": "^2.1.1" @@ -3488,6 +3598,7 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", "dev": true, "dependencies": { "minimist": "^1.2.5" @@ -3689,6 +3800,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", "dev": true, "dependencies": { "ms": "^2.1.1" @@ -3706,6 +3818,9 @@ "object-is": "^1.0.1", "object-keys": "^1.1.1", "regexp.prototype.flags": "^1.2.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/nock/node_modules/ms": { @@ -3747,7 +3862,6 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dev": true, - "optional": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -3767,22 +3881,19 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true, - "optional": true + "dev": true }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true, - "optional": true + "dev": true }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", "dev": true, - "optional": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -3855,7 +3966,10 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/object-is": { "version": "1.1.2", @@ -3868,6 +3982,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object-keys": { @@ -3892,6 +4009,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.assign/node_modules/es-abstract": { @@ -3915,6 +4035,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.getownpropertydescriptors": { @@ -3928,6 +4051,9 @@ }, "engines": { "node": ">= 0.8" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/on-finished": { @@ -3961,6 +4087,9 @@ }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/onigasm": { @@ -4014,6 +4143,9 @@ }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { @@ -4095,6 +4227,35 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "node_modules/portfinder": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "dev": true, + "dependencies": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "engines": { + "node": ">= 0.12.0" + } + }, + "node_modules/portfinder/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/portfinder/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "node_modules/prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -4145,6 +4306,7 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", "dev": true, + "hasInstallScript": true, "optional": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -4285,6 +4447,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/remove-trailing-separator": { @@ -4297,6 +4462,7 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -4334,12 +4500,16 @@ }, "engines": { "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" } }, "node_modules/request-promise-native": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", "dev": true, "dependencies": { "request-promise-core": "1.1.4", @@ -4348,6 +4518,9 @@ }, "engines": { "node": ">=0.12.0" + }, + "peerDependencies": { + "request": "^2.34" } }, "node_modules/request-promise-native/node_modules/tough-cookie": { @@ -4389,6 +4562,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", "dev": true, "bin": { "uuid": "bin/uuid" @@ -4443,6 +4617,11 @@ }, "engines": { "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/retry-request/node_modules/ms": { @@ -4630,16 +4809,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -4662,6 +4831,11 @@ "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, "engines": { "node": ">=0.10.0" } @@ -4724,6 +4898,20 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "optional": true }, "node_modules/string-width": { @@ -4747,6 +4935,9 @@ "dependencies": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { @@ -4757,6 +4948,9 @@ "dependencies": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/strip-ansi": { @@ -4866,25 +5060,67 @@ } }, "node_modules/ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", - "dev": true, - "dependencies": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", + "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", + "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.0", "yn": "3.1.1" }, "bin": { "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", "ts-node-script": "dist/bin-script.js", "ts-node-transpile-only": "dist/bin-transpile.js", "ts-script": "dist/bin-script-deprecated.js" }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, "engines": { - "node": ">=6.0.0" + "node": ">=0.4.0" + } + }, + "node_modules/ts-node/node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" } }, "node_modules/ts-node/node_modules/diff": { @@ -4927,6 +5163,9 @@ }, "engines": { "node": ">=4.8.0" + }, + "peerDependencies": { + "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" } }, "node_modules/tslint-config-prettier": { @@ -4951,6 +5190,9 @@ }, "engines": { "node": ">=4" + }, + "peerDependencies": { + "tslint": ">=5.1.0" } }, "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { @@ -4963,6 +5205,9 @@ }, "engines": { "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, "node_modules/tslint-plugin-prettier": { @@ -4977,6 +5222,10 @@ }, "engines": { "node": ">= 4" + }, + "peerDependencies": { + "prettier": "^1.9.0 || ^2.0.0", + "tslint": "^5.0.0 || ^6.0.0" } }, "node_modules/tslint/node_modules/diff": { @@ -4995,6 +5244,9 @@ "dev": true, "dependencies": { "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/tslint/node_modules/semver": { @@ -5013,6 +5265,9 @@ "dev": true, "dependencies": { "tslib": "^1.8.1" + }, + "peerDependencies": { + "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" } }, "node_modules/tunnel-agent": { @@ -5097,6 +5352,9 @@ }, "engines": { "node": ">= 12.20.0" + }, + "peerDependencies": { + "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x" } }, "node_modules/typedoc-default-themes": { @@ -5123,6 +5381,9 @@ }, "engines": { "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/typescript": { @@ -5206,6 +5467,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", + "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "dev": true + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -5424,6 +5691,18 @@ "dev": true, "engines": { "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } }, "node_modules/xdg-basedir": { @@ -5589,6 +5868,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/yargs/node_modules/cliui": { @@ -5757,6 +6039,9 @@ "optional": true, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } } }, @@ -5787,49 +6072,19 @@ "js-tokens": "^4.0.0" } }, - "@firebase/app": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.4.tgz", - "integrity": "sha512-XBrZb60m7N1XqmRhSJWADDD3J/0j9wM2VhxC5KUEtFA9SWfTn9Z3EWGtRGz7ahrMkgPJsmo0fXpvUh6cY8pQvQ==", - "dev": true, - "peer": true, - "requires": { - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true, - "peer": true - } - } + "@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true }, - "@firebase/app-compat": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.5.tgz", - "integrity": "sha512-GJURp5Nn8dEm72/y13Z+XMvWmMomsYViNxw6VKYqVH9f9VKnJ46Q8zYtx2ePvOuj7pAqsfwNkvAdAFYcveTe9g==", + "@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", "dev": true, - "peer": true, "requires": { - "@firebase/app": "0.7.4", - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true, - "peer": true - } + "@cspotcode/source-map-consumer": "0.8.0" } }, "@firebase/app-types": { @@ -6348,6 +6603,30 @@ "dev": true, "optional": true }, + "@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "@types/body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", @@ -6695,6 +6974,15 @@ "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", "dev": true }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, "async-retry": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", @@ -6809,12 +7097,6 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", "dev": true }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=", - "dev": true - }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -7053,6 +7335,12 @@ "vary": "^1" } }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "cross-spawn": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", @@ -8949,7 +9237,6 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dev": true, - "optional": true, "requires": { "whatwg-url": "^5.0.0" }, @@ -8958,22 +9245,19 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true, - "optional": true + "dev": true }, "webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true, - "optional": true + "dev": true }, "whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", "dev": true, - "optional": true, "requires": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -9229,6 +9513,34 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "portfinder": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "dev": true, + "requires": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + } + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -9678,16 +9990,6 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -9880,18 +10182,38 @@ } }, "ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", - "dev": true, - "requires": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", + "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", + "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.0", "yn": "3.1.1" }, "dependencies": { + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "dev": true + }, + "acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -10140,6 +10462,12 @@ "dev": true, "optional": true }, + "v8-compile-cache-lib": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", + "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "dev": true + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -10321,7 +10649,8 @@ "version": "7.5.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", - "dev": true + "dev": true, + "requires": {} }, "xdg-basedir": { "version": "4.0.0", From e08a71dfe31a67685d2cb3787c53b6f3b42176a7 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 30 Mar 2022 15:39:18 -0700 Subject: [PATCH 408/705] Add identity common items for new functionality (#1027) * moving common auth items to identity.ts and fixing UserRecord definitions * fixing copyright year and exporting old artifacts * adding in common files only * breaking out parsing functions and adding a bunch of tests * clean up & formatter * adding jsdoc comments * cleaning up update mask and adding more tests * fixing projectId references * changing classes to interfaces, adding in a key cache, and more tests * formatter * decoupling decode & verify * added tests for setting the expiration time * cleaning up var names * adding in retry for key verification * format * address comments * add package-lock * change decoded JWT to decoded payload --- package-lock.json | 23 +- package.json | 4 +- spec/common/providers/identity.spec.ts | 1075 +++++++++++++++++++++++- src/common/providers/identity.ts | 1039 ++++++++++++++++++++++- 4 files changed, 2105 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0201ae801..cc67d00f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,8 @@ "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "lodash": "^4.17.14" + "lodash": "^4.17.14", + "node-fetch": "^2.6.7" }, "bin": { "firebase-functions": "lib/bin/firebase-functions.js" @@ -27,6 +28,7 @@ "@types/mock-require": "^2.0.0", "@types/nock": "^10.0.3", "@types/node": "^8.10.50", + "@types/node-fetch": "^3.0.3", "@types/sinon": "^7.0.13", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", @@ -855,6 +857,16 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" }, + "node_modules/@types/node-fetch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-3.0.3.tgz", + "integrity": "sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==", + "deprecated": "This is a stub types definition. node-fetch provides its own type definitions, so you do not need this installed.", + "dev": true, + "dependencies": { + "node-fetch": "*" + } + }, "node_modules/@types/qs": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", @@ -6768,6 +6780,15 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" }, + "@types/node-fetch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-3.0.3.tgz", + "integrity": "sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==", + "dev": true, + "requires": { + "node-fetch": "*" + } + }, "@types/qs": { "version": "6.9.4", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", diff --git a/package.json b/package.json index a478a7a91..099e5ec3f 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,8 @@ "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "lodash": "^4.17.14" + "lodash": "^4.17.14", + "node-fetch": "^2.6.7" }, "devDependencies": { "@types/chai": "^4.1.7", @@ -168,6 +169,7 @@ "@types/mock-require": "^2.0.0", "@types/nock": "^10.0.3", "@types/node": "^8.10.50", + "@types/node-fetch": "^3.0.3", "@types/sinon": "^7.0.13", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts index fcb686102..caa656e3e 100644 --- a/spec/common/providers/identity.spec.ts +++ b/spec/common/providers/identity.spec.ts @@ -20,10 +20,108 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { expect } from 'chai'; +import * as express from 'express'; +import * as jwt from 'jsonwebtoken'; +import * as sinon from 'sinon'; import * as identity from '../../../src/common/providers/identity'; +import { expect } from 'chai'; + +const PROJECT = 'my-project'; +const EVENT = 'EVENT_TYPE'; +const VALID_URL = `https://us-central1-${PROJECT}.cloudfunctions.net/function-1`; +const now = new Date(); describe('identity', () => { + describe('invalidPublicKeys', () => { + it('should return true if publicKeysExpireAt does not exist', () => { + expect( + identity.invalidPublicKeys({ + publicKeys: {}, + }) + ).to.be.true; + }); + + it('should return true if publicKeysExpireAt are less than equals Date.now() plus a buffer', () => { + const time = Date.now(); + expect( + identity.invalidPublicKeys( + { + publicKeys: {}, + publicKeysExpireAt: time, + }, + time + ) + ).to.be.true; + }); + + it('should return false if publicKeysExpireAt are greater than Date.now() plus a buffer', () => { + const time = Date.now(); + expect( + identity.invalidPublicKeys( + { + publicKeys: {}, + publicKeysExpireAt: time + identity.INVALID_TOKEN_BUFFER + 60000, + }, + time + ) + ).to.be.false; + }); + }); + + describe('setKeyExpirationTime', () => { + const time = Date.now(); + + it('should do nothing without cache-control', async () => { + const publicKeysCache = { + publicKeys: {}, + publicKeysExpireAt: undefined, + }; + const headers = new Map(); + const response = { + headers, + }; + + await identity.setKeyExpirationTime(response, publicKeysCache, time); + + expect(publicKeysCache.publicKeysExpireAt).to.be.undefined; + }); + + it('should do nothing with cache-control but without max-age', async () => { + const publicKeysCache = { + publicKeys: {}, + publicKeysExpireAt: undefined, + }; + const headers = new Map(); + headers.set('cache-control', 'item=val, item2=val2, item3=val3'); + const response = { + headers, + }; + + await identity.setKeyExpirationTime(response, publicKeysCache, time); + + expect(publicKeysCache.publicKeysExpireAt).to.be.undefined; + }); + + it('should set the correctly set the expiration time', async () => { + const publicKeysCache = { + publicKeys: {}, + publicKeysExpireAt: undefined, + }; + const headers = new Map(); + headers.set( + 'cache-control', + 'item=val, max-age=50, item2=val2, item3=val3' + ); + const response = { + headers, + }; + + await identity.setKeyExpirationTime(response, publicKeysCache, time); + + expect(publicKeysCache.publicKeysExpireAt).to.equal(time + 50 * 1000); + }); + }); + describe('userRecordConstructor', () => { it('will provide falsey values for fields that are not in raw wire data', () => { const record = identity.userRecordConstructor({ uid: '123' }); @@ -85,4 +183,979 @@ describe('identity', () => { }); }); }); + + describe('isValidRequest', () => { + it('should error on non-post', () => { + const req = ({ + method: 'GET', + header: { + 'Content-Type': 'application/json', + }, + body: { + data: { + jwt: '1.2.3', + }, + }, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.false; + }); + + it('should error on bad Content-Type', () => { + const req = ({ + method: 'POST', + header(val: string) { + return 'text/css'; + }, + body: { + data: { + jwt: '1.2.3', + }, + }, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.false; + }); + + it('should error without req body', () => { + const req = ({ + method: 'POST', + header(val: string) { + return 'application/json'; + }, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.false; + }); + + it('should error without req body data', () => { + const req = ({ + method: 'POST', + header(val: string) { + return 'application/json'; + }, + body: {}, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.false; + }); + + it('should error without req body', () => { + const req = ({ + method: 'POST', + header(val: string) { + return 'application/json'; + }, + body: { + data: {}, + }, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.false; + }); + + it('should not error on valid request', () => { + const req = ({ + method: 'POST', + header(val: string) { + return 'application/json'; + }, + body: { + data: { + jwt: '1.2.3', + }, + }, + } as unknown) as express.Request; + + expect(identity.isValidRequest(req)).to.be.true; + }); + }); + + describe('getPublicKeyFromHeader', () => { + it('should throw if header.alg is not expected', () => { + expect(() => + identity.getPublicKeyFromHeader({ alg: 'RS128' }, {}) + ).to.throw( + `Provided JWT has incorrect algorithm. Expected ${identity.JWT_ALG} but got RS128.` + ); + }); + + it('should throw if header.kid is undefined', () => { + expect(() => + identity.getPublicKeyFromHeader({ alg: identity.JWT_ALG }, {}) + ).to.throw('JWT header missing "kid" claim.'); + }); + + it('should throw if the public keys do not have a property that matches header.kid', () => { + expect(() => + identity.getPublicKeyFromHeader( + { + alg: identity.JWT_ALG, + kid: '123456', + }, + {} + ) + ).to.throw( + 'Provided JWT has "kid" claim which does not correspond to a known public key. Most likely the JWT is expired.' + ); + }); + + it('should return the correct public key', () => { + expect( + identity.getPublicKeyFromHeader( + { + alg: identity.JWT_ALG, + kid: '123456', + }, + { + '123456': '7890', + '2468': '1357', + } + ) + ).to.eq('7890'); + }); + }); + + describe('isAuthorizedCloudFunctionURL', () => { + it('should return false on a bad gcf location', () => { + expect( + identity.isAuthorizedCloudFunctionURL( + `https://us-central1-europe-${PROJECT}.cloudfunctions.net/function-1`, + PROJECT + ) + ).to.be.false; + }); + + it('should return false on a bad project', () => { + expect( + identity.isAuthorizedCloudFunctionURL( + `https://us-central1-${PROJECT}-old.cloudfunctions.net/function-1`, + PROJECT + ) + ).to.be.false; + }); + + it('should return true on a good url', () => { + expect(identity.isAuthorizedCloudFunctionURL(VALID_URL, PROJECT)).to.be + .true; + }); + }); + + describe('checkDecodedToken', () => { + it('should throw on mismatching event types', () => { + expect(() => + identity.checkDecodedToken( + { + event_type: EVENT, + } as identity.DecodedPayload, + 'newEvent', + PROJECT + ) + ).to.throw(`Expected "newEvent" but received "${EVENT}".`); + }); + it('should throw on unauthorized function url', () => { + expect(() => + identity.checkDecodedToken( + { + aud: `fake-region-${PROJECT}.cloudfunctions.net/fn1`, + event_type: EVENT, + } as identity.DecodedPayload, + EVENT, + PROJECT + ) + ).to.throw('Provided JWT has incorrect "aud" (audience) claim.'); + }); + + it('should throw on a bad iss property', () => { + expect(() => + identity.checkDecodedToken( + { + aud: VALID_URL, + iss: `https://someissuer.com/a-project`, + event_type: EVENT, + } as identity.DecodedPayload, + EVENT, + PROJECT + ) + ).to.throw( + `Provided JWT has incorrect "iss" (issuer) claim. Expected "${identity.JWT_ISSUER}${PROJECT}" but got "https://someissuer.com/a-project".` + ); + }); + + it('should throw if sub is not a string', () => { + expect(() => + identity.checkDecodedToken( + ({ + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + sub: { + key: 'val', + }, + event_type: EVENT, + } as unknown) as identity.DecodedPayload, + EVENT, + PROJECT + ) + ).to.throw('Provided JWT has no "sub" (subject) claim.'); + }); + + it('should throw if sub is empty', () => { + expect(() => + identity.checkDecodedToken( + { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + sub: '', + event_type: EVENT, + } as identity.DecodedPayload, + EVENT, + PROJECT + ) + ).to.throw('Provided JWT has no "sub" (subject) claim.'); + }); + + it('should throw if sub length is larger than 128 chars', () => { + const str = 'a'.repeat(129); + expect(() => + identity.checkDecodedToken( + { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + sub: str.toString(), + event_type: EVENT, + } as identity.DecodedPayload, + EVENT, + PROJECT + ) + ).to.throw( + 'Provided JWT has "sub" (subject) claim longer than 128 characters.' + ); + }); + + it('should not throw an error and set uid to sub', () => { + expect(() => { + const sub = '123456'; + const decoded = { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + sub: sub, + event_type: EVENT, + } as identity.DecodedPayload; + + identity.checkDecodedToken(decoded, EVENT, PROJECT); + + expect(decoded.uid).to.equal(sub); + }).to.not.throw(); + }); + }); + + describe('decodeJWT', () => { + let jwtDecodeStub: sinon.SinonStub; + + beforeEach(() => { + jwtDecodeStub = sinon + .stub(jwt, 'decode') + .throws('Unexpected call to jwt.decode'); + }); + + afterEach(() => { + sinon.verifyAndRestore(); + }); + + it('should throw HttpsError if jwt.decode errors', () => { + jwtDecodeStub.throws('An internal decode error occurred.'); + + expect(() => identity.decodeJWT('123456')).to.throw( + 'Failed to decode the JWT.' + ); + }); + + it('should error if jwt decoded returns undefined', () => { + jwtDecodeStub.returns(undefined); + + expect(() => identity.decodeJWT('123456')).to.throw( + 'The decoded JWT is not structured correctly.' + ); + }); + + it('should error if decoded jwt does not have a payload field', () => { + jwtDecodeStub.returns({ + header: { key: 'val' }, + }); + + expect(() => identity.decodeJWT('123456')).to.throw( + 'The decoded JWT is not structured correctly.' + ); + }); + + it('should return the raw decoded jwt', () => { + const decoded = { + header: { key: 'val' }, + payload: { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + event_type: EVENT, + }, + }; + jwtDecodeStub.returns(decoded); + + expect(identity.decodeJWT('123456')).to.deep.equal(decoded); + }); + }); + + describe('shouldVerifyJWT', () => { + /** Stub test that will fail when we eventually change the function */ + it('should return true', () => { + expect(identity.shouldVerifyJWT()).to.be.true; + }); + }); + + describe('verifyJWT', () => { + const time = Date.now(); + let jwtVerifyStub: sinon.SinonStub; + const keysCache = { + publicKeys: { + '123456': '7890', + '2468': '1357', + }, + publicKeysExpireAt: time + identity.INVALID_TOKEN_BUFFER + 10000, + }; + const rawDecodedJWT = { + header: { + alg: identity.JWT_ALG, + kid: '2468', + }, + payload: { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + event_type: EVENT, + }, + }; + + beforeEach(() => { + jwtVerifyStub = sinon + .stub(jwt, 'verify') + .throws('Unexpected call to jwt.verify'); + }); + + afterEach(() => { + sinon.verifyAndRestore(); + }); + + it('should error if header does not exist', () => { + const rawDecodedJwt = { payload: 'val' }; + + expect(() => + identity.verifyJWT('123456', rawDecodedJwt, keysCache, time) + ).to.throw( + 'Unable to verify JWT payload, the decoded JWT does not have a header property.' + ); + }); + + it('should return the decoded jwt', () => { + const decoded = { + aud: VALID_URL, + iss: `${identity.JWT_ISSUER}${PROJECT}`, + event_type: EVENT, + }; + jwtVerifyStub.returns(decoded); + + expect( + identity.verifyJWT('123456', rawDecodedJWT, keysCache, time) + ).to.deep.equal(decoded); + }); + }); + + describe('parseMetadata', () => { + const decodedMetadata = { + last_sign_in_time: 1476235905, + creation_time: 1476136676, + }; + const metadata = { + lastSignInTime: new Date(1476235905000).toUTCString(), + creationTime: new Date(1476136676000).toUTCString(), + }; + + it('should parse an undefined object', () => { + expect(identity.parseMetadata({})).to.deep.equal({ + creationTime: null, + lastSignInTime: null, + }); + }); + + it('should parse a decoded metadata object', () => { + const md = identity.parseMetadata(decodedMetadata); + + expect(md).to.deep.equal(metadata); + }); + }); + + describe('parseProviderData', () => { + const decodedUserInfo = { + provider_id: 'google.com', + display_name: 'John Doe', + photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + uid: '1234567890', + email: 'user@gmail.com', + }; + const userInfo = { + providerId: 'google.com', + displayName: 'John Doe', + photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + uid: '1234567890', + email: 'user@gmail.com', + phoneNumber: undefined, + }; + const decodedUserInfoPhone = { + provider_id: 'phone', + phone_number: '+11234567890', + uid: '+11234567890', + }; + const userInfoPhone = { + providerId: 'phone', + displayName: undefined, + photoURL: undefined, + uid: '+11234567890', + email: undefined, + phoneNumber: '+11234567890', + }; + + it('should parse the user info', () => { + expect(identity.parseProviderData([decodedUserInfo])).to.deep.equal([ + userInfo, + ]); + }); + + it('should parse the user info with phone', () => { + expect(identity.parseProviderData([decodedUserInfoPhone])).to.deep.equal([ + userInfoPhone, + ]); + }); + }); + + describe('parseDate', () => { + it('should return null if tokens undefined', () => { + expect(identity.parseDate()).to.be.null; + }); + + it('should parse the date', () => { + expect(identity.parseDate(1476136676)).to.equal( + new Date(1476136676000).toUTCString() + ); + }); + }); + + describe('parseMultiFactor', () => { + const decodedMultiFactors = { + enrolled_factors: [ + { + uid: 'enrollmentId1', + display_name: 'displayName1', + enrollment_time: now.toISOString(), + phone_number: '+16505551234', + }, + { + uid: 'enrollmentId2', + enrollment_time: now.toISOString(), + }, + ], + }; + const multiFactors = { + enrolledFactors: [ + { + uid: 'enrollmentId1', + displayName: 'displayName1', + enrollmentTime: now.toUTCString(), + phoneNumber: '+16505551234', + factorId: 'phone', + }, + { + uid: 'enrollmentId2', + displayName: undefined, + enrollmentTime: now.toUTCString(), + factorId: undefined, + phoneNumber: undefined, + }, + ], + }; + + it('should return null on undefined factor', () => { + expect(identity.parseMultiFactor()).to.be.null; + }); + + it('should return null without enrolled factors', () => { + expect(identity.parseMultiFactor({})).to.be.null; + }); + + it('should error on an invalid factor', () => { + const factors = { + enrolled_factors: [{} as identity.DecodedPayloadMfaInfo], + }; + + expect(() => identity.parseMultiFactor(factors)).to.throw( + 'INTERNAL ASSERT FAILED: Invalid multi-factor info response' + ); + }); + + it('should correctly parse factors', () => { + expect(identity.parseMultiFactor(decodedMultiFactors)).to.deep.equal( + multiFactors + ); + }); + }); + + describe('parseUserRecord', () => { + const decodedUserRecord = { + uid: 'abcdefghijklmnopqrstuvwxyz', + email: 'user@gmail.com', + email_verified: true, + display_name: 'John Doe', + phone_number: '+11234567890', + provider_data: [ + { + provider_id: 'google.com', + display_name: 'John Doe', + photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + email: 'user@gmail.com', + uid: '1234567890', + }, + { + provider_id: 'facebook.com', + display_name: 'John Smith', + photo_url: 'https://facebook.com/0987654321/photo.jpg', + email: 'user@facebook.com', + uid: '0987654321', + }, + { + provider_id: 'phone', + uid: '+11234567890', + phone_number: '+11234567890', + }, + { + provider_id: 'password', + email: 'user@gmail.com', + uid: 'user@gmail.com', + display_name: 'John Doe', + }, + ], + password_hash: 'passwordHash', + password_salt: 'passwordSalt', + photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + tokens_valid_after_time: 1476136676, + metadata: { + last_sign_in_time: 1476235905, + creation_time: 1476136676, + }, + custom_claims: { + admin: true, + group_id: 'group123', + }, + tenant_id: 'TENANT_ID', + multi_factor: { + enrolled_factors: [ + { + uid: 'enrollmentId1', + display_name: 'displayName1', + enrollment_time: now.toISOString(), + phone_number: '+16505551234', + factor_id: 'phone', + }, + { + uid: 'enrollmentId2', + enrollment_time: now.toISOString(), + phone_number: '+16505556789', + factor_id: 'phone', + }, + ], + }, + }; + + const userRecord = { + uid: 'abcdefghijklmnopqrstuvwxyz', + email: 'user@gmail.com', + phoneNumber: '+11234567890', + emailVerified: true, + disabled: false, + displayName: 'John Doe', + providerData: [ + { + providerId: 'google.com', + displayName: 'John Doe', + photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + email: 'user@gmail.com', + uid: '1234567890', + phoneNumber: undefined, + }, + { + providerId: 'facebook.com', + displayName: 'John Smith', + photoURL: 'https://facebook.com/0987654321/photo.jpg', + email: 'user@facebook.com', + uid: '0987654321', + phoneNumber: undefined, + }, + { + providerId: 'phone', + displayName: undefined, + photoURL: undefined, + email: undefined, + uid: '+11234567890', + phoneNumber: '+11234567890', + }, + { + providerId: 'password', + displayName: 'John Doe', + photoURL: undefined, + email: 'user@gmail.com', + uid: 'user@gmail.com', + phoneNumber: undefined, + }, + ], + passwordHash: 'passwordHash', + passwordSalt: 'passwordSalt', + photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + metadata: { + lastSignInTime: new Date(1476235905000).toUTCString(), + creationTime: new Date(1476136676000).toUTCString(), + }, + customClaims: { + admin: true, + group_id: 'group123', + }, + tokensValidAfterTime: new Date(1476136676000).toUTCString(), + tenantId: 'TENANT_ID', + multiFactor: { + enrolledFactors: [ + { + uid: 'enrollmentId1', + displayName: 'displayName1', + enrollmentTime: now.toUTCString(), + phoneNumber: '+16505551234', + factorId: 'phone', + }, + { + uid: 'enrollmentId2', + displayName: undefined, + enrollmentTime: now.toUTCString(), + phoneNumber: '+16505556789', + factorId: 'phone', + }, + ], + }, + }; + + it('should error if decoded does not have uid', () => { + expect(() => + identity.parseAuthUserRecord({} as identity.DecodedPayloadUserRecord) + ).to.throw('INTERNAL ASSERT FAILED: Invalid user response'); + }); + + it('should parse user record', () => { + const ur = identity.parseAuthUserRecord(decodedUserRecord); + + expect(ur).to.deep.equal(userRecord); + }); + }); + + describe('parseAuthEventContext', () => { + const rawUserInfo = { + name: 'John Doe', + granted_scopes: + 'openid https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile', + id: '123456789', + verified_email: true, + given_name: 'John', + locale: 'en', + family_name: 'Doe', + email: 'johndoe@gmail.com', + picture: 'https://lh3.googleusercontent.com/1233456789/mo/photo.jpg', + }; + + it('should parse an unknown event', () => { + const decodedJwt = { + aud: 'https://us-east1-project_id.cloudfunctions.net/function-1', + exp: 60 * 60 + 1, + iat: 1, + iss: 'https://securetoken.google.com/project_id', + sub: 'someUid', + uid: 'someUid', + event_id: 'EVENT_ID', + event_type: EVENT, + ip_address: '1.2.3.4', + user_agent: 'USER_AGENT', + locale: 'en', + raw_user_info: JSON.stringify(rawUserInfo), + }; + const context = { + locale: 'en', + ipAddress: '1.2.3.4', + userAgent: 'USER_AGENT', + eventId: 'EVENT_ID', + eventType: EVENT, + authType: 'UNAUTHENTICATED', + resource: { + service: 'identitytoolkit.googleapis.com', + name: 'projects/project-id', + }, + timestamp: new Date(1000).toUTCString(), + additionalUserInfo: { + providerId: undefined, + profile: rawUserInfo, + username: undefined, + isNewUser: false, + }, + credential: null, + params: {}, + }; + + expect( + identity.parseAuthEventContext(decodedJwt, 'project-id') + ).to.deep.equal(context); + }); + + it('should parse a beforeSignIn event', () => { + const time = now.getTime(); + const decodedJwt = { + aud: 'https://us-east1-project_id.cloudfunctions.net/function-1', + exp: 60 * 60 + 1, + iat: 1, + iss: 'https://securetoken.google.com/project_id', + sub: 'someUid', + uid: 'someUid', + event_id: 'EVENT_ID', + event_type: 'beforeSignIn', + ip_address: '1.2.3.4', + user_agent: 'USER_AGENT', + locale: 'en', + sign_in_method: 'password', + raw_user_info: JSON.stringify(rawUserInfo), + oauth_id_token: 'ID_TOKEN', + oauth_access_token: 'ACCESS_TOKEN', + oauth_refresh_token: 'REFRESH_TOKEN', + oauth_token_secret: 'OAUTH_TOKEN_SECRET', + oauth_expires_in: 3600, + }; + const context = { + locale: 'en', + ipAddress: '1.2.3.4', + userAgent: 'USER_AGENT', + eventId: 'EVENT_ID', + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn:password', + authType: 'UNAUTHENTICATED', + resource: { + service: 'identitytoolkit.googleapis.com', + name: 'projects/project-id', + }, + timestamp: new Date(1000).toUTCString(), + additionalUserInfo: { + providerId: 'password', + profile: rawUserInfo, + username: undefined, + isNewUser: false, + }, + credential: { + claims: undefined, + idToken: 'ID_TOKEN', + accessToken: 'ACCESS_TOKEN', + refreshToken: 'REFRESH_TOKEN', + expirationTime: new Date(time + 3600 * 1000).toUTCString(), + secret: 'OAUTH_TOKEN_SECRET', + providerId: 'password', + signInMethod: 'password', + }, + params: {}, + }; + + expect( + identity.parseAuthEventContext(decodedJwt, 'project-id', time) + ).to.deep.equal(context); + }); + + it('should parse a beforeCreate event', () => { + const time = now.getTime(); + // beforeCreate + const decodedJwt = { + aud: 'https://us-east1-project_id.cloudfunctions.net/beforeCreate', + exp: 60 * 60 + 1, + iat: 1, + iss: 'https://securetoken.google.com/project_id', + sub: 'abcdefghijklmnopqrstuvwxyz', + uid: 'abcdefghijklmnopqrstuvwxyz', + event_id: 'EVENT_ID', + event_type: 'beforeCreate', + ip_address: '1.2.3.4', + user_agent: 'USER_AGENT', + locale: 'en', + sign_in_method: 'oidc.provider', + tenant_id: 'TENANT_ID', + user_record: { + uid: 'abcdefghijklmnopqrstuvwxyz', + email: 'user@gmail.com', + email_verified: true, + display_name: 'John Doe', + phone_number: '+11234567890', + provider_data: [ + { + provider_id: 'oidc.provider', + email: 'user@gmail.com', + uid: 'user@gmail.com', + display_name: 'John Doe', + }, + ], + photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg', + tokens_valid_after_time: 1476136676, + metadata: { + last_sign_in_time: 1476235905, + creation_time: 1476136676, + }, + custom_claims: { + admin: true, + group_id: 'group123', + }, + tenant_id: 'TENANT_ID', + }, + oauth_id_token: 'ID_TOKEN', + oauth_access_token: 'ACCESS_TOKEN', + oauth_refresh_token: 'REFRESH_TOKEN', + oauth_token_secret: 'OAUTH_TOKEN_SECRET', + oauth_expires_in: 3600, + raw_user_info: JSON.stringify(rawUserInfo), + }; + const context = { + locale: 'en', + ipAddress: '1.2.3.4', + userAgent: 'USER_AGENT', + eventId: 'EVENT_ID', + eventType: + 'providers/cloud.auth/eventTypes/user.beforeCreate:oidc.provider', + authType: 'USER', + resource: { + service: 'identitytoolkit.googleapis.com', + name: 'projects/project-id/tenants/TENANT_ID', + }, + timestamp: new Date(1000).toUTCString(), + additionalUserInfo: { + username: undefined, + providerId: 'oidc.provider', + profile: rawUserInfo, + isNewUser: true, + }, + credential: { + claims: undefined, + accessToken: 'ACCESS_TOKEN', + expirationTime: new Date(time + 3600 * 1000).toUTCString(), + idToken: 'ID_TOKEN', + providerId: 'oidc.provider', + refreshToken: 'REFRESH_TOKEN', + secret: 'OAUTH_TOKEN_SECRET', + signInMethod: 'oidc.provider', + }, + params: {}, + }; + + expect( + identity.parseAuthEventContext(decodedJwt, 'project-id', time) + ).to.deep.equal(context); + }); + }); + + describe('validateAuthResponse', () => { + it('should not throw on undefined request', () => { + expect(() => identity.validateAuthResponse('event', undefined)).to.not + .throw; + }); + + it('should throw an error if customClaims have a blocked claim', () => { + expect(() => + identity.validateAuthResponse('beforeCreate', { + customClaims: { acr: 'something' }, + }) + ).to.throw( + 'The customClaims claims "acr" are reserved and cannot be specified.' + ); + }); + + it('should throw an error if customClaims size is too big', () => { + const str = 'x'.repeat(1000); + + expect(() => + identity.validateAuthResponse('beforeCreate', { + customClaims: { idk: str }, + }) + ).to.throw('The customClaims payload should not exceed 1000 characters.'); + }); + + it('should throw an error if sessionClaims have a blocked claim', () => { + expect(() => + identity.validateAuthResponse('beforeSignIn', { + sessionClaims: { acr: 'something' }, + }) + ).to.throw( + 'The sessionClaims claims "acr" are reserved and cannot be specified.' + ); + }); + + it('should throw an error if sessionClaims size is too big', () => { + const str = 'x'.repeat(1000); + + expect(() => + identity.validateAuthResponse('beforeSignIn', { + sessionClaims: { idk: str }, + }) + ).to.throw( + 'The sessionClaims payload should not exceed 1000 characters.' + ); + }); + + it('should throw an error if the combined customClaims & sessionClaims size is too big', () => { + const str = 'x'.repeat(501); + + expect(() => + identity.validateAuthResponse('beforeSignIn', { + customClaims: { cc: str }, + sessionClaims: { sc: str }, + }) + ).to.throw( + 'The customClaims and sessionClaims payloads should not exceed 1000 characters combined.' + ); + }); + }); + + describe('getUpdateMask', () => { + it('should return empty string on undefined response', () => { + expect(identity.getUpdateMask()).to.eq(''); + }); + + it('should return empty on only customClaims and sessionClaims', () => { + const response = { + customClaims: { + claim1: 'abc', + }, + sessionClaims: { + claim2: 'def', + }, + }; + + expect(identity.getUpdateMask(response)).to.eq(''); + }); + + it('should return the right claims on a response', () => { + const response = { + displayName: 'john', + disabled: false, + emailVerified: true, + photoURL: 'google.com', + customClaims: { + claim1: 'abc', + }, + sessionClaims: { + claim2: 'def', + }, + }; + + expect(identity.getUpdateMask(response)).to.eq( + 'displayName,disabled,emailVerified,photoURL' + ); + }); + }); }); diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 24a4e2c34..f3358f02e 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -20,8 +20,60 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import * as express from 'express'; import * as firebase from 'firebase-admin'; -import * as _ from 'lodash'; +import * as jwt from 'jsonwebtoken'; +import fetch from 'node-fetch'; +import { HttpsError } from './https'; +import { EventContext } from '../../cloud-functions'; +import { SUPPORTED_REGIONS } from '../../function-configuration'; +import { logger } from '../..'; + +export { HttpsError }; + +/** @internal */ +export const INVALID_TOKEN_BUFFER = 60000; // set to 1 minute + +/** @internal */ +export const JWT_CLIENT_CERT_URL = 'https://www.googleapis.com'; +/** @internal */ +export const JWT_CLIENT_CERT_PATH = + 'robot/v1/metadata/x509/securetoken@system.gserviceaccount.com'; +/** @internal */ +export const JWT_ALG = 'RS256'; +/** @internal */ +export const JWT_ISSUER = 'https://securetoken.google.com/'; + +/** @internal */ +export interface PublicKeysCache { + publicKeys: Record; + publicKeysExpireAt?: number; +} + +const DISALLOWED_CUSTOM_CLAIMS = [ + 'acr', + 'amr', + 'at_hash', + 'aud', + 'auth_time', + 'azp', + 'cnf', + 'c_hash', + 'exp', + 'iat', + 'iss', + 'jti', + 'nbf', + 'nonce', + 'firebase', +]; + +const CLAIMS_MAX_PAYLOAD_SIZE = 1000; + +const EVENT_MAPPING: Record = { + beforeCreate: 'providers/cloud.auth/eventTypes/user.beforeCreate', + beforeSignIn: 'providers/cloud.auth/eventTypes/user.beforeSignIn', +}; /** * The UserRecord passed to Cloud Functions is the same UserRecord that is returned by the Firebase Admin @@ -41,7 +93,7 @@ export class UserRecordMetadata implements firebase.auth.UserMetadata { constructor(public creationTime: string, public lastSignInTime: string) {} /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */ - toJSON() { + toJSON(): AuthUserMetadata { return { creationTime: this.creationTime, lastSignInTime: this.lastSignInTime, @@ -69,43 +121,964 @@ export function userRecordConstructor(wireData: Object): UserRecord { passwordHash: null, tokensValidAfterTime: null, }; - const record = _.assign({}, falseyValues, wireData); + const record = { ...falseyValues, ...wireData }; - const meta = _.get(record, 'metadata'); + const meta = record['metadata']; if (meta) { - _.set( - record, - 'metadata', - new UserRecordMetadata( - meta.createdAt || meta.creationTime, - meta.lastSignedInAt || meta.lastSignInTime - ) + record['metadata'] = new UserRecordMetadata( + meta.createdAt || meta.creationTime, + meta.lastSignedInAt || meta.lastSignInTime ); } else { - _.set(record, 'metadata', new UserRecordMetadata(null, null)); + record['metadata'] = new UserRecordMetadata(null, null); } - _.forEach(record.providerData, (entry) => { - _.set(entry, 'toJSON', () => { + for (const entry of Object.entries(record.providerData)) { + entry['toJSON'] = () => { return entry; - }); - }); - _.set(record, 'toJSON', () => { - const json: any = _.pick(record, [ - 'uid', - 'email', - 'emailVerified', - 'displayName', - 'photoURL', - 'phoneNumber', - 'disabled', - 'passwordHash', - 'passwordSalt', - 'tokensValidAfterTime', - ]); - json.metadata = _.get(record, 'metadata').toJSON(); - json.customClaims = _.cloneDeep(record.customClaims); - json.providerData = _.map(record.providerData, (entry) => entry.toJSON()); + }; + } + record['toJSON'] = () => { + const { + uid, + email, + emailVerified, + displayName, + photoURL, + phoneNumber, + disabled, + passwordHash, + passwordSalt, + tokensValidAfterTime, + } = record; + const json = { + uid, + email, + emailVerified, + displayName, + photoURL, + phoneNumber, + disabled, + passwordHash, + passwordSalt, + tokensValidAfterTime, + }; + json['metadata'] = record['metadata'].toJSON(); + json['customClaims'] = JSON.parse(JSON.stringify(record.customClaims)); + json['providerData'] = record.providerData.map((entry) => entry.toJSON()); return json; - }); + }; return record as UserRecord; } + +/** + * User info that is part of the AuthUserRecord + */ +export interface AuthUserInfo { + /** + * The user identifier for the linked provider. + */ + uid: string; + /** + * The display name for the linked provider. + */ + displayName: string; + /** + * The email for the linked provider. + */ + email: string; + /** + * The photo URL for the linked provider. + */ + photoURL: string; + /** + * The linked provider ID (for example, "google.com" for the Google provider). + */ + providerId: string; + /** + * The phone number for the linked provider. + */ + phoneNumber: string; +} + +/** + * Additional metadata about the user. + */ +export interface AuthUserMetadata { + /** + * The date the user was created, formatted as a UTC string. + */ + creationTime: string; + /** + * The date the user last signed in, formatted as a UTC string. + */ + lastSignInTime: string; +} + +/** + * Interface representing the common properties of a user-enrolled second factor. + */ +export interface AuthMultiFactorInfo { + /** + * The ID of the enrolled second factor. This ID is unique to the user. + */ + uid: string; + /** + * The optional display name of the enrolled second factor. + */ + displayName?: string; + /** + * The type identifier of the second factor. For SMS second factors, this is `phone`. + */ + factorId: string; + /** + * The optional date the second factor was enrolled, formatted as a UTC string. + */ + enrollmentTime?: string; + /** + * The phone number associated with a phone second factor. + */ + phoneNumber?: string; +} + +/** + * The multi-factor related properties for the current user, if available. + */ +export interface AuthMultiFactorSettings { + /** + * List of second factors enrolled with the current user. + */ + enrolledFactors: AuthMultiFactorInfo[]; +} + +/** + * The UserRecord passed to auth blocking Cloud Functions from the identity platform. + */ +export interface AuthUserRecord { + /** + * The user's `uid`. + */ + uid: string; + /** + * The user's primary email, if set. + */ + email?: string; + /** + * Whether or not the user's primary email is verified. + */ + emailVerified: boolean; + /** + * The user's display name. + */ + displayName?: string; + /** + * The user's photo URL. + */ + photoURL?: string; + /** + * The user's primary phone number, if set. + */ + phoneNumber?: string; + /** + * Whether or not the user is disabled: `true` for disabled; `false` for + * enabled. + */ + disabled: boolean; + /** + * Additional metadata about the user. + */ + metadata: AuthUserMetadata; + /** + * An array of providers (for example, Google, Facebook) linked to the user. + */ + providerData: AuthUserInfo[]; + /** + * The user's hashed password (base64-encoded). + */ + passwordHash?: string; + /** + * The user's password salt (base64-encoded). + */ + passwordSalt?: string; + /** + * The user's custom claims object if available, typically used to define + * user roles and propagated to an authenticated user's ID token. + */ + customClaims?: Record; + /** + * The ID of the tenant the user belongs to, if available. + */ + tenantId?: string | null; + /** + * The date the user's tokens are valid after, formatted as a UTC string. + */ + tokensValidAfterTime?: string; + /** + * The multi-factor related properties for the current user, if available. + */ + multiFactor?: AuthMultiFactorSettings; +} + +/** The additional user info component of the auth event context */ +export interface AdditionalUserInfo { + providerId: string; + profile?: any; + username?: string; + isNewUser: boolean; +} + +/** The credential component of the auth event context */ +export interface Credential { + claims?: { [key: string]: any }; + idToken?: string; + accessToken?: string; + refreshToken?: string; + expirationTime?: string; + secret?: string; + providerId: string; + signInMethod: string; +} + +/** Defines the auth event context for blocking events */ +export interface AuthEventContext extends EventContext { + locale?: string; + ipAddress: string; + userAgent: string; + additionalUserInfo?: AdditionalUserInfo; + credential?: Credential; +} + +/** The handler response type for beforeCreate blocking events */ +export interface BeforeCreateResponse { + displayName?: string; + disabled?: boolean; + emailVerified?: boolean; + photoURL?: string; + customClaims?: object; +} + +/** The handler response type for beforeSignIn blocking events */ +export interface BeforeSignInResponse extends BeforeCreateResponse { + sessionClaims?: object; +} + +interface DecodedPayloadUserRecordMetadata { + creation_time?: number; + last_sign_in_time?: number; +} + +interface DecodedPayloadUserRecordUserInfo { + uid: string; + display_name?: string; + email?: string; + photo_url?: string; + phone_number?: string; + provider_id: string; +} + +/** @internal */ +export interface DecodedPayloadMfaInfo { + uid: string; + display_name?: string; + phone_number?: string; + enrollment_time?: string; + factor_id?: string; +} + +interface DecodedPayloadUserRecordEnrolledFactors { + enrolled_factors?: DecodedPayloadMfaInfo[]; +} + +/** @internal */ +export interface DecodedPayloadUserRecord { + uid: string; + email?: string; + email_verified?: boolean; + phone_number?: string; + display_name?: string; + photo_url?: string; + disabled?: boolean; + metadata?: DecodedPayloadUserRecordMetadata; + password_hash?: string; + password_salt?: string; + provider_data?: DecodedPayloadUserRecordUserInfo[]; + multi_factor?: DecodedPayloadUserRecordEnrolledFactors; + custom_claims?: any; + tokens_valid_after_time?: number; + tenant_id?: string; + [key: string]: any; +} + +/** @internal */ +export interface DecodedPayload { + aud: string; + exp: number; + iat: number; + iss: string; + sub: string; + event_id: string; + event_type: string; + ip_address: string; + user_agent?: string; + locale?: string; + sign_in_method?: string; + user_record?: DecodedPayloadUserRecord; + tenant_id?: string; + raw_user_info?: string; + sign_in_attributes?: { + [key: string]: any; + }; + oauth_id_token?: string; + oauth_access_token?: string; + oauth_refresh_token?: string; + oauth_token_secret?: string; + oauth_expires_in?: number; + [key: string]: any; +} + +/** + * Helper to determine if we refresh the public keys + * @internal + */ +export function invalidPublicKeys( + keys: PublicKeysCache, + time: number = Date.now() +): boolean { + if (!keys.publicKeysExpireAt) { + return true; + } + return time + INVALID_TOKEN_BUFFER >= keys.publicKeysExpireAt; +} + +/** + * Helper to parse the response headers to obtain the expiration time. + * @internal + */ +export function setKeyExpirationTime( + response: any, + keysCache: PublicKeysCache, + time: number +): void { + if (response.headers.has('cache-control')) { + const ccHeader = response.headers.get('cache-control'); + const maxAgeEntry = ccHeader + .split(', ') + .find((item) => item.includes('max-age')); + if (maxAgeEntry) { + const maxAge = +maxAgeEntry.trim().split('=')[1]; + keysCache.publicKeysExpireAt = time + maxAge * 1000; + } + } +} + +/** + * Fetch the public keys for use in decoding and verifying the jwt sent from identity platform. + */ +async function refreshPublicKeys( + keysCache: PublicKeysCache, + time: number = Date.now() +): Promise { + const url = `${JWT_CLIENT_CERT_URL}/${JWT_CLIENT_CERT_PATH}`; + try { + const response = await fetch(url); + setKeyExpirationTime(response, keysCache, time); + const data = await response.json(); + keysCache.publicKeys = data as Record; + } catch (err) { + logger.error( + `Failed to obtain public keys for JWT verification: ${err.message}` + ); + throw new HttpsError( + 'internal', + 'Failed to obtain the public keys for JWT verification.' + ); + } +} + +/** + * Checks for a valid identity platform web request, otherwise throws an HttpsError + * @internal + */ +export function isValidRequest(req: express.Request): boolean { + if (req.method !== 'POST') { + logger.warn(`Request has invalid method "${req.method}".`); + return false; + } + + const contentType: string = (req.header('Content-Type') || '').toLowerCase(); + if (!contentType.includes('application/json')) { + logger.warn('Request has invalid header Content-Type.'); + return false; + } + + if (!req.body?.data?.jwt) { + logger.warn('Request has an invalid body.'); + return false; + } + return true; +} + +/** @internal */ +export function getPublicKeyFromHeader( + header: Record, + publicKeys: Record +): string { + if (header.alg !== JWT_ALG) { + throw new HttpsError( + 'invalid-argument', + `Provided JWT has incorrect algorithm. Expected ${JWT_ALG} but got ${header.alg}.` + ); + } + if (!header.kid) { + throw new HttpsError('invalid-argument', 'JWT header missing "kid" claim.'); + } + if (!publicKeys.hasOwnProperty(header.kid)) { + throw new HttpsError( + 'invalid-argument', + 'Provided JWT has "kid" claim which does not correspond to a known public key. Most likely the JWT is expired.' + ); + } + + return publicKeys[header.kid]; +} + +/** + * Checks for a well forms cloud functions url + * @internal + */ +export function isAuthorizedCloudFunctionURL( + cloudFunctionUrl: string, + projectId: string +): boolean { + const re = new RegExp( + `^https://(${SUPPORTED_REGIONS.join( + '|' + )})+-${projectId}\.cloudfunctions\.net/` + ); + const res = re.exec(cloudFunctionUrl) || []; + return res.length > 0; +} + +/** + * Checks for errors in a decoded jwt + * @internal + */ +export function checkDecodedToken( + decodedJWT: DecodedPayload, + eventType: string, + projectId: string +): void { + if (decodedJWT.event_type !== eventType) { + throw new HttpsError( + 'invalid-argument', + `Expected "${eventType}" but received "${decodedJWT.event_type}".` + ); + } + if (!isAuthorizedCloudFunctionURL(decodedJWT.aud, projectId)) { + throw new HttpsError( + 'invalid-argument', + 'Provided JWT has incorrect "aud" (audience) claim.' + ); + } + if (decodedJWT.iss !== `${JWT_ISSUER}${projectId}`) { + throw new HttpsError( + 'invalid-argument', + `Provided JWT has incorrect "iss" (issuer) claim. Expected ` + + `"${JWT_ISSUER}${projectId}" but got "${decodedJWT.iss}".` + ); + } + if (typeof decodedJWT.sub !== 'string' || decodedJWT.sub.length === 0) { + throw new HttpsError( + 'invalid-argument', + 'Provided JWT has no "sub" (subject) claim.' + ); + } + if (decodedJWT.sub.length > 128) { + throw new HttpsError( + 'invalid-argument', + 'Provided JWT has "sub" (subject) claim longer than 128 characters.' + ); + } + // set uid to sub + decodedJWT.uid = decodedJWT.sub; +} + +/** + * Helper function to decode the jwt, internally uses the 'jsonwebtoken' package. + * @internal + */ +export function decodeJWT(token: string): Record { + let decoded: Record; + try { + decoded = jwt.decode(token, { complete: true }) as Record; + } catch (err) { + logger.error('Decoding the JWT failed', err); + throw new HttpsError('internal', 'Failed to decode the JWT.'); + } + if (!decoded?.payload) { + throw new HttpsError( + 'internal', + 'The decoded JWT is not structured correctly.' + ); + } + return decoded; +} + +/** + * Helper function to determine if we need to do full verification of the jwt + * @internal + */ +export function shouldVerifyJWT(): boolean { + // TODO(colerogers): add emulator support to skip verification + return true; +} + +/** + * Verifies the jwt using the 'jwt' library and decodes the token with the public keys + * Throws an error if the event types do not match + * @internal + */ +export function verifyJWT( + token: string, + rawDecodedJWT: Record, + keysCache: PublicKeysCache, + time: number = Date.now() +): DecodedPayload { + if (!rawDecodedJWT.header) { + throw new HttpsError( + 'internal', + 'Unable to verify JWT payload, the decoded JWT does not have a header property.' + ); + } + const header = rawDecodedJWT.header; + let publicKey; + try { + if (invalidPublicKeys(keysCache, time)) { + refreshPublicKeys(keysCache); + } + publicKey = getPublicKeyFromHeader(header, keysCache.publicKeys); + return jwt.verify(token, publicKey, { + algorithms: [JWT_ALG], + }) as DecodedPayload; + } catch (err) { + logger.error('Verifying the JWT failed', err); + } + // force refresh keys and retry one more time + try { + refreshPublicKeys(keysCache); + publicKey = getPublicKeyFromHeader(header, keysCache.publicKeys); + return jwt.verify(token, publicKey, { + algorithms: [JWT_ALG], + }) as DecodedPayload; + } catch (err) { + logger.error('Verifying the JWT failed again', err); + throw new HttpsError('internal', 'Failed to verify the JWT.'); + } +} + +/** + * Helper function to parse the decoded metadata object into a UserMetaData object + * @internal + */ +export function parseMetadata( + metadata: DecodedPayloadUserRecordMetadata +): AuthUserMetadata { + const creationTime = metadata?.creation_time + ? new Date((metadata.creation_time as number) * 1000).toUTCString() + : null; + const lastSignInTime = metadata?.last_sign_in_time + ? new Date((metadata.last_sign_in_time as number) * 1000).toUTCString() + : null; + return { + creationTime, + lastSignInTime, + }; +} + +/** + * Helper function to parse the decoded user info array into an AuthUserInfo array + * @internal + */ +export function parseProviderData( + providerData: DecodedPayloadUserRecordUserInfo[] +): AuthUserInfo[] { + const providers: AuthUserInfo[] = []; + for (const provider of providerData) { + providers.push({ + uid: provider.uid, + displayName: provider.display_name, + email: provider.email, + photoURL: provider.photo_url, + providerId: provider.provider_id, + phoneNumber: provider.phone_number, + }); + } + return providers; +} + +/** + * Helper function to parse the date into a UTC string + * @internal + */ +export function parseDate(tokensValidAfterTime?: number): string | null { + if (!tokensValidAfterTime) { + return null; + } + tokensValidAfterTime = tokensValidAfterTime * 1000; + try { + const date = new Date(tokensValidAfterTime); + if (!isNaN(date.getTime())) { + return date.toUTCString(); + } + } catch {} + return null; +} + +/** + * Helper function to parse the decoded enrolled factors into a valid MultiFactorSettings + * @internal + */ +export function parseMultiFactor( + multiFactor?: DecodedPayloadUserRecordEnrolledFactors +): AuthMultiFactorSettings { + if (!multiFactor) { + return null; + } + const parsedEnrolledFactors: AuthMultiFactorInfo[] = []; + for (const factor of multiFactor.enrolled_factors || []) { + if (!factor.uid) { + throw new HttpsError( + 'internal', + 'INTERNAL ASSERT FAILED: Invalid multi-factor info response' + ); + } + const enrollmentTime = factor.enrollment_time + ? new Date(factor.enrollment_time).toUTCString() + : null; + parsedEnrolledFactors.push({ + uid: factor.uid, + factorId: factor.phone_number + ? factor.factor_id || 'phone' + : factor.factor_id, + displayName: factor.display_name, + enrollmentTime, + phoneNumber: factor.phone_number, + }); + } + + if (parsedEnrolledFactors.length > 0) { + return { + enrolledFactors: parsedEnrolledFactors, + }; + } + return null; +} + +/** + * Parses the decoded user record into a valid UserRecord for use in the handler + * @internal + */ +export function parseAuthUserRecord( + decodedJWTUserRecord: DecodedPayloadUserRecord +): AuthUserRecord { + if (!decodedJWTUserRecord.uid) { + throw new HttpsError( + 'internal', + 'INTERNAL ASSERT FAILED: Invalid user response' + ); + } + + const disabled = decodedJWTUserRecord.disabled || false; + const metadata = parseMetadata(decodedJWTUserRecord.metadata); + const providerData = parseProviderData(decodedJWTUserRecord.provider_data); + const tokensValidAfterTime = parseDate( + decodedJWTUserRecord.tokens_valid_after_time + ); + const multiFactor = parseMultiFactor(decodedJWTUserRecord.multi_factor); + + return { + uid: decodedJWTUserRecord.uid, + email: decodedJWTUserRecord.email, + emailVerified: decodedJWTUserRecord.email_verified, + displayName: decodedJWTUserRecord.display_name, + photoURL: decodedJWTUserRecord.photo_url, + phoneNumber: decodedJWTUserRecord.phone_number, + disabled, + metadata, + providerData, + passwordHash: decodedJWTUserRecord.password_hash, + passwordSalt: decodedJWTUserRecord.password_salt, + customClaims: decodedJWTUserRecord.custom_claims, + tenantId: decodedJWTUserRecord.tenant_id, + tokensValidAfterTime, + multiFactor, + }; +} + +/** Helper to get the AdditionalUserInfo from the decoded jwt */ +function parseAdditionalUserInfo( + decodedJWT: DecodedPayload +): AdditionalUserInfo { + let profile, username; + if (decodedJWT.raw_user_info) + try { + profile = JSON.parse(decodedJWT.raw_user_info); + } catch (err) { + logger.debug(`Parse Error: ${err.message}`); + } + if (profile) { + if (decodedJWT.sign_in_method === 'github.com') { + username = profile.login; + } + if (decodedJWT.sign_in_method === 'twitter.com') { + username = profile.screen_name; + } + } + + return { + providerId: + decodedJWT.sign_in_method === 'emailLink' + ? 'password' + : decodedJWT.sign_in_method, + profile, + username, + isNewUser: decodedJWT.event_type === 'beforeCreate' ? true : false, + }; +} + +/** Helper to get the Credential from the decoded jwt */ +function parseAuthCredential( + decodedJWT: DecodedPayload, + time: number +): Credential { + if ( + !decodedJWT.sign_in_attributes && + !decodedJWT.oauth_id_token && + !decodedJWT.oauth_access_token && + !decodedJWT.oauth_refresh_token + ) { + return null; + } + return { + claims: decodedJWT.sign_in_attributes, + idToken: decodedJWT.oauth_id_token, + accessToken: decodedJWT.oauth_access_token, + refreshToken: decodedJWT.oauth_refresh_token, + expirationTime: decodedJWT.oauth_expires_in + ? new Date(time + decodedJWT.oauth_expires_in * 1000).toUTCString() + : undefined, + secret: decodedJWT.oauth_token_secret, + providerId: + decodedJWT.sign_in_method === 'emailLink' + ? 'password' + : decodedJWT.sign_in_method, + signInMethod: decodedJWT.sign_in_method, + }; +} + +/** + * Parses the decoded jwt into a valid AuthEventContext for use in the handler + * @internal + */ +export function parseAuthEventContext( + decodedJWT: DecodedPayload, + projectId: string, + time: number = new Date().getTime() +): AuthEventContext { + const eventType = + (EVENT_MAPPING[decodedJWT.event_type] || decodedJWT.event_type) + + (decodedJWT.sign_in_method ? `:${decodedJWT.sign_in_method}` : ''); + + return { + locale: decodedJWT.locale, + ipAddress: decodedJWT.ip_address, + userAgent: decodedJWT.user_agent, + eventId: decodedJWT.event_id, + eventType, + authType: !!decodedJWT.user_record ? 'USER' : 'UNAUTHENTICATED', + resource: { + // TODO(colerogers): figure out the correct service + service: 'identitytoolkit.googleapis.com', + name: !!decodedJWT.tenant_id + ? `projects/${projectId}/tenants/${decodedJWT.tenant_id}` + : `projects/${projectId}`, + }, + timestamp: new Date(decodedJWT.iat * 1000).toUTCString(), + additionalUserInfo: parseAdditionalUserInfo(decodedJWT), + credential: parseAuthCredential(decodedJWT, time), + params: {}, + }; +} + +/** + * Checks the handler response for invalid customClaims & sessionClaims objects + * @internal + */ +export function validateAuthResponse( + eventType: string, + authRequest?: BeforeCreateResponse | BeforeSignInResponse +) { + if (!authRequest) { + authRequest = {}; + } + if (authRequest.customClaims) { + const invalidClaims = DISALLOWED_CUSTOM_CLAIMS.filter((claim) => + authRequest.customClaims.hasOwnProperty(claim) + ); + if (invalidClaims.length > 0) { + throw new HttpsError( + 'invalid-argument', + `The customClaims claims "${invalidClaims.join( + ',' + )}" are reserved and cannot be specified.` + ); + } + if ( + JSON.stringify(authRequest.customClaims).length > CLAIMS_MAX_PAYLOAD_SIZE + ) { + throw new HttpsError( + 'invalid-argument', + `The customClaims payload should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters.` + ); + } + } + if ( + eventType === 'beforeSignIn' && + (authRequest as BeforeSignInResponse).sessionClaims + ) { + const invalidClaims = DISALLOWED_CUSTOM_CLAIMS.filter((claim) => + (authRequest as BeforeSignInResponse).sessionClaims.hasOwnProperty(claim) + ); + if (invalidClaims.length > 0) { + throw new HttpsError( + 'invalid-argument', + `The sessionClaims claims "${invalidClaims.join( + ',' + )}" are reserved and cannot be specified.` + ); + } + if ( + JSON.stringify((authRequest as BeforeSignInResponse).sessionClaims) + .length > CLAIMS_MAX_PAYLOAD_SIZE + ) { + throw new HttpsError( + 'invalid-argument', + `The sessionClaims payload should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters.` + ); + } + const combinedClaims = { + ...authRequest.customClaims, + ...(authRequest as BeforeSignInResponse).sessionClaims, + }; + if (JSON.stringify(combinedClaims).length > CLAIMS_MAX_PAYLOAD_SIZE) { + throw new HttpsError( + 'invalid-argument', + `The customClaims and sessionClaims payloads should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters combined.` + ); + } + } +} + +/** + * Helper function to generate the update mask for the identity platform changed values + * @internal + */ +export function getUpdateMask( + authResponse?: BeforeCreateResponse | BeforeSignInResponse +): string { + if (!authResponse) { + return ''; + } + const updateMask: string[] = []; + for (const key in authResponse) { + if (key === 'customClaims' || key === 'sessionClaims') { + continue; + } + if ( + authResponse.hasOwnProperty(key) && + typeof authResponse[key] !== 'undefined' + ) { + updateMask.push(key); + } + } + return updateMask.join(','); +} + +/** @internal */ +export function createHandler( + handler: ( + user: AuthUserRecord, + context: AuthEventContext + ) => + | BeforeCreateResponse + | Promise + | BeforeSignInResponse + | Promise + | void + | Promise, + eventType: string, + keysCache: PublicKeysCache +): (req: express.Request, resp: express.Response) => Promise { + const wrappedHandler = wrapHandler(handler, eventType, keysCache); + return (req: express.Request, res: express.Response) => { + return new Promise((resolve) => { + res.on('finish', resolve); + resolve(wrappedHandler(req, res)); + }); + }; +} + +function wrapHandler( + handler: ( + user: AuthUserRecord, + context: AuthEventContext + ) => + | BeforeCreateResponse + | Promise + | BeforeSignInResponse + | Promise + | void + | Promise, + eventType: string, + keysCache: PublicKeysCache +) { + return async (req: express.Request, res: express.Response): Promise => { + try { + const projectId = process.env.GCLOUD_PROJECT; + if (!isValidRequest(req)) { + logger.error('Invalid request, unable to process'); + throw new HttpsError('invalid-argument', 'Bad Request'); + } + const rawDecodedJWT = decodeJWT(req.body.data.jwt); + const decodedPayload = shouldVerifyJWT() + ? verifyJWT(req.body.data.jwt, rawDecodedJWT, keysCache) + : (rawDecodedJWT.payload as DecodedPayload); + checkDecodedToken(decodedPayload, eventType, projectId); + const authUserRecord = parseAuthUserRecord(decodedPayload.user_record); + const authEventContext = parseAuthEventContext(decodedPayload, projectId); + const authResponse = + (await handler(authUserRecord, authEventContext)) || undefined; + validateAuthResponse(eventType, authResponse); + const updateMask = getUpdateMask(authResponse); + const result = { + userRecord: { + ...authResponse, + updateMask, + }, + }; + + res.status(200); + res.setHeader('Content-Type', 'application/json'); + res.send(JSON.stringify(result)); + } catch (err) { + if (!(err instanceof HttpsError)) { + // This doesn't count as an 'explicit' error. + logger.error('Unhandled error', err); + err = new HttpsError('internal', 'An unexpected error occurred.'); + } + + res.status(err.code); + res.setHeader('Content-Type', 'application/json'); + res.send({ error: err.toJson() }); + } + }; +} From b0140e419c9982ce1394dcd1f152eced914cff6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:40:33 -0700 Subject: [PATCH 409/705] Bump minimist from 1.2.5 to 1.2.6 (#1067) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc67d00f6..b02a633c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3497,9 +3497,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/mkdirp": { @@ -8933,9 +8933,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "mkdirp": { From 393efce8eae69c2b30541f1f583895db53fa4e91 Mon Sep 17 00:00:00 2001 From: CommanderRoot Date: Fri, 1 Apr 2022 01:43:18 +0200 Subject: [PATCH 410/705] refactor: replace deprecated String.prototype.substr() (#1066) .substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated Signed-off-by: Tobias Speicher Co-authored-by: Daniel Lee --- src/common/providers/https.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 5cbc016a1..5421ebb7b 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -437,7 +437,7 @@ function isValidRequest(req: Request): req is HttpRequest { // If it has a charset, just ignore it for now. const semiColon = contentType.indexOf(';'); if (semiColon >= 0) { - contentType = contentType.substr(0, semiColon).trim(); + contentType = contentType.slice(0, semiColon).trim(); } if (contentType !== 'application/json') { logger.warn('Request has incorrect Content-Type.', contentType); From 73325e7e93935d076569eacc3cdd4ada15265783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:46:59 -0700 Subject: [PATCH 411/705] Bump ansi-regex from 3.0.0 to 3.0.1 (#1068) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Lee --- package-lock.json | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index b02a633c8..5998a51a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -414,9 +414,9 @@ } }, "node_modules/@grpc/proto-loader/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "optional": true, "engines": { @@ -1018,9 +1018,9 @@ } }, "node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true, "engines": { "node": ">=4" @@ -1393,9 +1393,9 @@ } }, "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -3553,9 +3553,9 @@ } }, "node_modules/mocha/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -5643,9 +5643,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -5802,9 +5802,9 @@ } }, "node_modules/yargs-unparser/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, "engines": { "node": ">=6" @@ -5861,9 +5861,9 @@ } }, "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "engines": { "node": ">=8" @@ -6374,9 +6374,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "optional": true }, @@ -6909,9 +6909,9 @@ "dev": true }, "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true }, "ansi-styles": { @@ -7221,9 +7221,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "string-width": { @@ -8979,9 +8979,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "debug": { @@ -10620,9 +10620,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "string-width": { @@ -10725,9 +10725,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -10883,9 +10883,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "string-width": { From 47ac6b828ea7277a777b188d58ef8070002b403d Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 31 Mar 2022 16:53:45 -0700 Subject: [PATCH 412/705] Change Eventfilters to a Record structure (#1070) * changing to a map * adding channel & changelog Co-authored-by: Daniel Lee --- CHANGELOG.md | 1 + spec/runtime/loader.spec.ts | 9 +- spec/v1/cloud-functions.spec.ts | 36 ++--- spec/v1/providers/analytics.spec.ts | 9 +- spec/v1/providers/auth.spec.ts | 9 +- spec/v1/providers/database.spec.ts | 9 +- spec/v1/providers/firestore.spec.ts | 9 +- spec/v1/providers/pubsub.spec.ts | 9 +- spec/v1/providers/remoteConfig.spec.ts | 9 +- spec/v1/providers/storage.spec.ts | 9 +- spec/v1/providers/testLab.spec.ts | 9 +- spec/v2/providers/alerts/alerts.spec.ts | 63 ++------ .../providers/alerts/appDistribution.spec.ts | 50 +++---- spec/v2/providers/alerts/billing.spec.ts | 54 +++---- spec/v2/providers/alerts/crashlytics.spec.ts | 90 ++++-------- spec/v2/providers/pubsub.spec.ts | 9 +- spec/v2/providers/storage.spec.ts | 136 ++++-------------- src/cloud-functions.ts | 9 +- src/runtime/manifest.ts | 13 +- src/v2/providers/alerts/alerts.ts | 14 +- src/v2/providers/pubsub.ts | 2 +- src/v2/providers/storage.ts | 2 +- 22 files changed, 160 insertions(+), 400 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..4ccafa8c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Changes internal structure to be more flexible (#1070). diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index 11acb583f..6db4370fd 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -122,12 +122,9 @@ describe('extractStack', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.pubsub.topic.publish', - eventFilters: [ - { - attribute: 'resource', - value: 'projects/my-project/topics/my-topic', - }, - ], + eventFilters: { + resource: 'projects/my-project/topics/my-topic', + }, retry: false, }, labels: {}, diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index 3405af695..5dd0a8941 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -62,12 +62,9 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: [ - { - attribute: 'resource', - value: 'resource', - }, - ], + eventFilters: { + resource: 'resource', + }, retry: false, }, labels: {}, @@ -89,12 +86,9 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'providers/provider/eventTypes/event', - eventFilters: [ - { - attribute: 'resource', - value: 'resource', - }, - ], + eventFilters: { + resource: 'resource', + }, retry: false, }, labels: {}, @@ -125,12 +119,9 @@ describe('makeCloudFunction', () => { serviceAccountEmail: 'foo@google.com', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: [ - { - attribute: 'resource', - value: 'resource', - }, - ], + eventFilters: { + resource: 'resource', + }, retry: false, }, secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }], @@ -152,12 +143,9 @@ describe('makeCloudFunction', () => { platform: 'gcfv1', eventTrigger: { eventType: 'mock.provider.mock.event', - eventFilters: [ - { - attribute: 'resource', - value: 'resource', - }, - ], + eventFilters: { + resource: 'resource', + }, retry: true, }, labels: {}, diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts index 1603fc280..ead39554f 100644 --- a/spec/v1/providers/analytics.spec.ts +++ b/spec/v1/providers/analytics.spec.ts @@ -72,12 +72,9 @@ describe('Analytics Functions', () => { expect(cloudFunction.__endpoint).to.deep.equal({ platform: 'gcfv1', eventTrigger: { - eventFilters: [ - { - attribute: 'resource', - value: 'projects/project1/events/first_open', - }, - ], + eventFilters: { + resource: 'projects/project1/events/first_open', + }, eventType: 'providers/google.firebase.analytics/eventTypes/event.log', retry: false, diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index 3f5913d2b..8659a1967 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -64,12 +64,9 @@ describe('Auth Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: [ - { - attribute: 'resource', - value: `projects/${project}`, - }, - ], + eventFilters: { + resource: `projects/${project}`, + }, eventType: `providers/firebase.auth/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index 2ea1022e3..304c1d1fd 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -45,12 +45,9 @@ describe('Database Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: [ - { - attribute: 'resource', - value: resource, - }, - ], + eventFilters: { + resource, + }, eventType: `providers/google.firebase.database/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts index 0317e69f0..3f9f07fbe 100644 --- a/spec/v1/providers/firestore.spec.ts +++ b/spec/v1/providers/firestore.spec.ts @@ -107,12 +107,9 @@ describe('Firestore Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: [ - { - attribute: 'resource', - value: resource, - }, - ], + eventFilters: { + resource, + }, eventType: `providers/cloud.firestore/eventTypes/${eventType}`, retry: false, }, diff --git a/spec/v1/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts index eddf6533c..5547515ab 100644 --- a/spec/v1/providers/pubsub.spec.ts +++ b/spec/v1/providers/pubsub.spec.ts @@ -108,12 +108,9 @@ describe('Pubsub Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.pubsub.topic.publish', - eventFilters: [ - { - attribute: 'resource', - value: 'projects/project1/topics/toppy', - }, - ], + eventFilters: { + resource: 'projects/project1/topics/toppy', + }, retry: false, }, labels: {}, diff --git a/spec/v1/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts index 8dc310a7b..f3fde2043 100644 --- a/spec/v1/providers/remoteConfig.spec.ts +++ b/spec/v1/providers/remoteConfig.spec.ts @@ -68,12 +68,9 @@ describe('RemoteConfig Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.firebase.remoteconfig.update', - eventFilters: [ - { - attribute: 'resource', - value: 'projects/project1', - }, - ], + eventFilters: { + resource: 'projects/project1', + }, retry: false, }, labels: {}, diff --git a/spec/v1/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts index d99a14baa..d96b131b9 100644 --- a/spec/v1/providers/storage.spec.ts +++ b/spec/v1/providers/storage.spec.ts @@ -42,12 +42,9 @@ describe('Storage Functions', () => { return { platform: 'gcfv1', eventTrigger: { - eventFilters: [ - { - attribute: 'resource', - value: `projects/_/buckets/${bucket}`, - }, - ], + eventFilters: { + resource: `projects/_/buckets/${bucket}`, + }, eventType: `google.storage.object.${eventType}`, retry: false, }, diff --git a/spec/v1/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts index 968ccb079..b3ba22d7f 100644 --- a/spec/v1/providers/testLab.spec.ts +++ b/spec/v1/providers/testLab.spec.ts @@ -50,12 +50,9 @@ describe('Test Lab Functions', () => { platform: 'gcfv1', eventTrigger: { eventType: 'google.testing.testMatrix.complete', - eventFilters: [ - { - attribute: 'resource', - value: 'projects/project1/testMatrices/{matrix}', - }, - ], + eventFilters: { + resource: 'projects/project1/testMatrices/{matrix}', + }, retry: false, }, labels: {}, diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts index 4f53c41d2..6ad78a811 100644 --- a/spec/v2/providers/alerts/alerts.spec.ts +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -6,6 +6,15 @@ import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; const ALERT_TYPE = 'new-alert-type'; const APPID = '123456789'; +const ALERT_EVENT_FILTER = { + alerttype: ALERT_TYPE, +}; + +const ALERT_APP_EVENT_FILTER = { + alerttype: ALERT_TYPE, + appid: APPID, +}; + describe('alerts', () => { describe('onAlertPublished', () => { it('should create the function without opts', () => { @@ -16,12 +25,7 @@ describe('alerts', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -41,16 +45,7 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); @@ -81,12 +76,7 @@ describe('alerts', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -99,12 +89,7 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -117,16 +102,7 @@ describe('alerts', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); @@ -153,16 +129,7 @@ describe('alerts', () => { minInstances: 3, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts index 2f8ea5c5a..3242c7e07 100644 --- a/spec/v2/providers/alerts/appDistribution.spec.ts +++ b/spec/v2/providers/alerts/appDistribution.spec.ts @@ -6,6 +6,10 @@ import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; const APPID = '123456789'; const myHandler = () => 42; +const APP_EVENT_FILTER = { + appid: APPID, +}; + describe('appDistribution', () => { describe('onNewTesterIosDevicePublished', () => { it('should create a function with alertType & appId', () => { @@ -19,16 +23,10 @@ describe('appDistribution', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: appDistribution.newTesterIosDeviceAlert, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: appDistribution.newTesterIosDeviceAlert, + }, retry: false, }, }); @@ -44,12 +42,9 @@ describe('appDistribution', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: appDistribution.newTesterIosDeviceAlert, - }, - ], + eventFilters: { + alerttype: appDistribution.newTesterIosDeviceAlert, + }, retry: false, }, }); @@ -65,16 +60,10 @@ describe('appDistribution', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: appDistribution.newTesterIosDeviceAlert, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: appDistribution.newTesterIosDeviceAlert, + }, retry: false, }, }); @@ -88,12 +77,9 @@ describe('appDistribution', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: appDistribution.newTesterIosDeviceAlert, - }, - ], + eventFilters: { + alerttype: appDistribution.newTesterIosDeviceAlert, + }, retry: false, }, }); diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts index bc3fa6a9a..f8e0eeebb 100644 --- a/spec/v2/providers/alerts/billing.spec.ts +++ b/spec/v2/providers/alerts/billing.spec.ts @@ -16,12 +16,9 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: billing.planUpdateAlert, - }, - ], + eventFilters: { + alerttype: billing.planUpdateAlert, + }, retry: false, }, }); @@ -37,12 +34,9 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: billing.planUpdateAlert, - }, - ], + eventFilters: { + alerttype: billing.planUpdateAlert, + }, retry: false, }, }); @@ -58,12 +52,9 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: billing.planAutomatedUpdateAlert, - }, - ], + eventFilters: { + alerttype: billing.planAutomatedUpdateAlert, + }, retry: false, }, }); @@ -79,12 +70,9 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: billing.planAutomatedUpdateAlert, - }, - ], + eventFilters: { + alerttype: billing.planAutomatedUpdateAlert, + }, retry: false, }, }); @@ -100,12 +88,9 @@ describe('billing', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: { + alerttype: ALERT_TYPE, + }, retry: false, }, }); @@ -122,12 +107,9 @@ describe('billing', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: { + alerttype: ALERT_TYPE, + }, retry: false, }, }); diff --git a/spec/v2/providers/alerts/crashlytics.spec.ts b/spec/v2/providers/alerts/crashlytics.spec.ts index 0ac00c5e0..1ea1c4f0e 100644 --- a/spec/v2/providers/alerts/crashlytics.spec.ts +++ b/spec/v2/providers/alerts/crashlytics.spec.ts @@ -36,6 +36,15 @@ describe('crashlytics', () => { ]; for (const { method, event } of testcases) { + const ALERT_EVENT_FILTER = { + alerttype: event, + }; + + const ALERT_APP_EVENT_FILTER = { + ...ALERT_EVENT_FILTER, + appid: APPID, + }; + describe(method, () => { it('should create a function only handler', () => { const func = crashlytics[method](myHandler); @@ -45,12 +54,7 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: event, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -64,16 +68,7 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: event, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); @@ -86,12 +81,7 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: event, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -107,16 +97,7 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: event, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); @@ -124,6 +105,15 @@ describe('crashlytics', () => { }); } + const ALERT_EVENT_FILTER = { + alerttype: ALERT_TYPE, + }; + + const ALERT_APP_EVENT_FILTER = { + ...ALERT_EVENT_FILTER, + appid: APPID, + }; + describe('onOperation', () => { it('should create a function with alertType only', () => { const func = crashlytics.onOperation(ALERT_TYPE, myHandler, undefined); @@ -133,12 +123,7 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -152,16 +137,7 @@ describe('crashlytics', () => { labels: {}, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); @@ -178,12 +154,7 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - ], + eventFilters: ALERT_EVENT_FILTER, retry: false, }, }); @@ -200,16 +171,7 @@ describe('crashlytics', () => { ...FULL_ENDPOINT, eventTrigger: { eventType: alerts.eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: ALERT_TYPE, - }, - { - attribute: 'appid', - value: APPID, - }, - ], + eventFilters: ALERT_APP_EVENT_FILTER, retry: false, }, }); diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index 303ffa1d7..f48e10f72 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -12,12 +12,9 @@ const EVENT_TRIGGER = { const ENDPOINT_EVENT_TRIGGER = { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', - eventFilters: [ - { - attribute: 'topic', - value: 'topic', - }, - ], + eventFilters: { + topic: 'topic', + }, retry: false, }; diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts index cb612e561..0471b6931 100644 --- a/spec/v2/providers/storage.spec.ts +++ b/spec/v2/providers/storage.spec.ts @@ -12,15 +12,20 @@ const EVENT_TRIGGER = { const ENDPOINT_EVENT_TRIGGER = { eventType: 'event-type', - eventFilters: [ - { - attribute: 'bucket', - value: 'some-bucket', - }, - ], + eventFilters: { + bucket: 'some-bucket', + }, retry: false, }; +const DEFAULT_BUCKET_EVENT_FILTER = { + bucket: 'default-bucket', +}; + +const SPECIFIC_BUCKET_EVENT_FILTER = { + bucket: 'my-bucket', +}; + describe('v2/storage', () => { describe('getOptsAndBucket', () => { it('should return the default bucket with empty opts', () => { @@ -119,12 +124,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_EVENT_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -274,12 +274,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, }); }); @@ -301,12 +296,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, }); }); @@ -332,12 +322,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -363,12 +348,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_ARCHIVED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -413,12 +393,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, }); }); @@ -440,12 +415,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, }); }); @@ -471,12 +441,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -505,12 +470,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_FINALIZED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -555,12 +515,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, }); @@ -584,12 +539,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, }); }); @@ -615,12 +565,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -646,12 +591,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_DELETED_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -696,12 +636,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, }); @@ -725,12 +660,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, }); }); @@ -756,12 +686,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'my-bucket', - }, - ], + eventFilters: SPECIFIC_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); @@ -790,12 +715,7 @@ describe('v2/storage', () => { labels: {}, eventTrigger: { ...ENDPOINT_METADATA_TRIGGER, - eventFilters: [ - { - attribute: 'bucket', - value: 'default-bucket', - }, - ], + eventFilters: DEFAULT_BUCKET_EVENT_FILTER, }, region: ['us-west1'], }); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index ab6fdb120..ffe94e031 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -461,12 +461,9 @@ export function makeCloudFunction({ } else { endpoint.eventTrigger = { eventType: legacyEventType || provider + '.' + eventType, - eventFilters: [ - { - attribute: 'resource', - value: triggerResource(), - }, - ], + eventFilters: { + resource: triggerResource(), + }, retry: !!options.failurePolicy, }; } diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 2b08385d5..caece4ee5 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -19,15 +19,6 @@ // 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. -/** - * One or more event filters restrict the set of events delivered to an EventTrigger. - */ -interface EventFilter { - attribute: string; - value: string; - // if left unspecified, equality is used. - operator?: string; -} /** * An definition of a function as appears in the Manifest. @@ -58,7 +49,9 @@ export interface ManifestEndpoint { callableTrigger?: {}; eventTrigger?: { - eventFilters: EventFilter[]; + eventFilters: Record; + eventFilterPathPatterns?: Record; + channel?: string; eventType: string; retry: boolean; region?: string; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 902bd4232..173267422 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -91,20 +91,14 @@ export function getEndpointAnnotation( }, eventTrigger: { eventType, - eventFilters: [ - { - attribute: 'alerttype', - value: alertType, - }, - ], + eventFilters: { + alerttype: alertType, + }, retry: !!opts.retry, }, }; if (appId) { - endpoint.eventTrigger.eventFilters.push({ - attribute: 'appid', - value: appId, - }); + endpoint.eventTrigger.eventFilters.appid = appId; } return endpoint; } diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 01b731ccb..2964af42d 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -174,7 +174,7 @@ export function onMessagePublished( }, eventTrigger: { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', - eventFilters: [{ attribute: 'topic', value: topic }], + eventFilters: { topic }, retry: false, }, }; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 8e63ea45e..bc9d26653 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -360,7 +360,7 @@ export function onOperation( }, eventTrigger: { eventType, - eventFilters: [{ attribute: 'bucket', value: bucket }], + eventFilters: { bucket }, retry: false, }, }; From b9de399c83b67e8fd0a4a2aca142c6bdf3a6689c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 23:36:20 -0700 Subject: [PATCH 413/705] Bump pathval from 1.1.0 to 1.1.1 (#1038) Bumps [pathval](https://github.com/chaijs/pathval) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/chaijs/pathval/releases) - [Changelog](https://github.com/chaijs/pathval/blob/master/CHANGELOG.md) - [Commits](https://github.com/chaijs/pathval/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: pathval dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Lee --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5998a51a5..16140eff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4225,9 +4225,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "node_modules/pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, "engines": { "node": "*" @@ -9523,9 +9523,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, "performance-now": { From c31cf60eaa5d525e71ddec1c5aed4391caf690a1 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 4 Apr 2022 11:27:27 -0700 Subject: [PATCH 414/705] Move some TQ triggers under new namespace. (#1069) Move all task queue related API under newly formed `tasks` package. Task queue function are now under `tasks` namespace: ``` export const factorize = functions.tasks.taskQueue({ rateLimits: { maxBurstSize: 2, maxConcurrentDispatches: 1, maxDispatchesPerSecond: 1, }, retryConfig: { maxAttempts: 100, maxRetrySeconds: 1000, maxBackoffSeconds: 20, maxDoublings: 10, minBackoffSeconds: 0.1, } }).onDispatch((data, context) => { deducePrivateKey(data.publicKey); }); ``` Same goes for handler namespace. Few other changes: 1) Add probably-forgotten `maxRetrySeconds` option for task queues. 2) Remove `maxBurstsize` option since it's outputonly. --- package.json | 30 +- spec/common/providers/https.spec.ts | 352 +----------------- spec/common/providers/tasks.spec.ts | 262 +++++++++++++ spec/helper.ts | 127 +++++++ spec/runtime/loader.spec.ts | 4 +- spec/v1/providers/https.spec.ts | 203 +--------- spec/v1/providers/tasks.spec.ts | 165 ++++++++ spec/v2/providers/alerts/alerts.spec.ts | 2 +- .../providers/alerts/appDistribution.spec.ts | 2 +- spec/v2/providers/alerts/billing.spec.ts | 2 +- spec/v2/providers/alerts/crashlytics.spec.ts | 2 +- spec/v2/providers/{helpers.ts => fixtures.ts} | 0 spec/v2/providers/https.spec.ts | 225 ++--------- spec/v2/providers/pubsub.spec.ts | 2 +- spec/v2/providers/storage.spec.ts | 2 +- spec/v2/providers/tasks.spec.ts | 201 ++++++++++ src/common/providers/https.ts | 118 +----- src/common/providers/tasks.ts | 147 ++++++++ src/function-builder.ts | 9 +- src/handler-builder.ts | 24 +- src/index.ts | 2 + src/providers/https.ts | 119 +----- src/providers/tasks.ts | 145 ++++++++ src/v2/index.ts | 3 +- src/v2/providers/https.ts | 104 +----- src/v2/providers/tasks.ts | 150 ++++++++ v1/tasks.js | 26 ++ v2/tasks.js | 26 ++ 28 files changed, 1353 insertions(+), 1101 deletions(-) create mode 100644 spec/common/providers/tasks.spec.ts create mode 100644 spec/helper.ts create mode 100644 spec/v1/providers/tasks.spec.ts rename spec/v2/providers/{helpers.ts => fixtures.ts} (100%) create mode 100644 spec/v2/providers/tasks.spec.ts create mode 100644 src/common/providers/tasks.ts create mode 100644 src/providers/tasks.ts create mode 100644 src/v2/providers/tasks.ts create mode 100644 v1/tasks.js create mode 100644 v2/tasks.js diff --git a/package.json b/package.json index 099e5ec3f..ad1c392c7 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "./lib/providers/pubsub": "./lib/providers/pubsub.js", "./lib/providers/remoteConfig": "./lib/providers/remoteConfig.js", "./lib/providers/storage": "./lib/providers/storage.js", + "./lib/providers/tasks": "./lib/providers/tasks.js", "./lib/providers/testLab": "./lib/providers/testLab.js", "./v1": "./lib/index.js", "./v1/analytics": "./lib/providers/analytics.js", @@ -58,6 +59,7 @@ "./v2/params": "./lib/v2/params/index.js", "./v2/pubsub": "./lib/v2/providers/pubsub.js", "./v2/storage": "./lib/v2/providers/storage.js", + "./v2/tasks": "./lib/v2/providers/tasks.js", "./v2/alerts": "./lib/v2/providers/alerts/index.js", "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js", "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", @@ -98,12 +100,27 @@ "v1/storage": [ "lib/providers/storage" ], + "v1/tasks": [ + "lib/providers/tasks" + ], "v1/testLab": [ "lib/providers/testLab" ], "v2": [ "lib/v2" ], + "v2/alerts": [ + "lib/v2/providers/alerts" + ], + "v2/alerts/appDistribution": [ + "lib/v2/providers/alerts/appDistribution" + ], + "v2/alerts/billing": [ + "lib/v2/providers/alerts/billing" + ], + "v2/alerts/crashlytics": [ + "lib/v2/providers/alerts/crashlytics" + ], "v2/base": [ "lib/v2/base" ], @@ -122,17 +139,8 @@ "v2/storage": [ "lib/v2/providers/storage" ], - "v2/alerts": [ - "lib/v2/providers/alerts" - ], - "v2/alerts/appDistribution": [ - "lib/v2/providers/alerts/appDistribution" - ], - "v2/alerts/billing": [ - "lib/v2/providers/alerts/billing" - ], - "v2/alerts/crashlytics": [ - "lib/v2/providers/alerts/crashlytics" + "v2/tasks": [ + "lib/v2/providers/tasks" ] } }, diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index d9d8e63c4..d1f8703bd 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -1,20 +1,14 @@ import { expect } from 'chai'; -import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as sinon from 'sinon'; import { apps as appsNamespace } from '../../../src/apps'; -import * as debug from '../../../src/common/debug'; -import * as https from '../../../src/common/providers/https'; import { - CallableContext, - CallableRequest, - TaskContext, - TaskRequest, - unsafeDecodeAppCheckToken, - unsafeDecodeIdToken, -} from '../../../src/common/providers/https'; -import * as mocks from '../../fixtures/credential/key.json'; + checkAppCheckContext, + checkAuthContext, + runHandler, + RunHandlerResult, +} from '../../helper'; import { expectedResponseHeaders, generateAppCheckToken, @@ -25,15 +19,9 @@ import { mockFetchPublicKeys, mockRequest, } from '../../fixtures/mockrequest'; - -/** - * RunHandlerResult contains the data from an express.Response. - */ -interface RunHandlerResult { - status: number; - headers: { [name: string]: string }; - body: any; -} +import * as debug from '../../../src/common/debug'; +import * as https from '../../../src/common/providers/https'; +import * as mocks from '../../fixtures/credential/key.json'; /** * A CallTest is a specification for a test of a callable function that @@ -58,64 +46,6 @@ interface CallTest { expectedHttpResponse: RunHandlerResult; } -/** - * Runs an express handler with a given request asynchronously and returns the - * data populated into the response. - */ -function runHandler( - handler: express.Handler, - request: https.Request -): Promise { - return new Promise((resolve, reject) => { - // MockResponse mocks an express.Response. - // This class lives here so it can reference resolve and reject. - class MockResponse { - private statusCode = 0; - private headers: { [name: string]: string } = {}; - private callback: Function; - - public status(code: number) { - this.statusCode = code; - return this; - } - - // Headers are only set by the cors handler. - public setHeader(name: string, value: string) { - this.headers[name] = value; - } - - public getHeader(name: string): string { - return this.headers[name]; - } - - public send(body: any) { - resolve({ - status: this.statusCode, - headers: this.headers, - body, - }); - if (this.callback) { - this.callback(); - } - } - - public end() { - this.send(undefined); - } - - public on(event: string, callback: Function) { - if (event !== 'finish') { - throw new Error('MockResponse only implements the finish event'); - } - this.callback = callback; - } - } - - const response = new MockResponse(); - handler(request, response as any, () => undefined); - }); -} - // Runs a CallTest test. async function runCallableTest(test: CallTest): Promise { const opts = { @@ -145,81 +75,6 @@ async function runCallableTest(test: CallTest): Promise { expect(responseV2.status).to.equal(test.expectedHttpResponse.status); } -/** Represents a test case for a Task Queue Function */ -interface TaskTest { - // An http request, mocking a subset of https.Request. - httpRequest: any; - - // The expected format of the request passed to the handler. - expectedData: any; - - taskFunction?: ( - data: any, - context: https.TaskContext - ) => void | Promise; - - taskFunction2?: (request: https.TaskRequest) => void | Promise; - - // The expected shape of the http response returned to the callable SDK. - expectedStatus: number; -} - -// Runs a TaskTest test. -async function runTaskTest(test: TaskTest): Promise { - const taskQueueFunctionV1 = https.onDispatchHandler((data, context) => { - expect(data).to.deep.equal(test.expectedData); - if (test.taskFunction) { - test.taskFunction(data, context); - } - }); - - const responseV1 = await runHandler(taskQueueFunctionV1, test.httpRequest); - expect(responseV1.status).to.equal(test.expectedStatus); - - const taskQueueFunctionV2 = https.onDispatchHandler((request) => { - expect(request.data).to.deep.equal(test.expectedData); - if (test.taskFunction2) { - test.taskFunction2(request); - } - }); - - const responseV2 = await runHandler(taskQueueFunctionV2, test.httpRequest); - expect(responseV2.status).to.equal(test.expectedStatus); -} - -function checkAuthContext( - context: CallableContext | CallableRequest | TaskContext | TaskRequest, - projectId: string, - userId: string -) { - expect(context.auth).to.not.be.undefined; - expect(context.auth).to.not.be.null; - expect(context.auth.uid).to.equal(userId); - expect(context.auth.token.uid).to.equal(userId); - expect(context.auth.token.sub).to.equal(userId); - expect(context.auth.token.aud).to.equal(projectId); - - // TaskContext & TaskRequest don't have instanceIdToken - if ({}.hasOwnProperty.call(context, 'instanceIdToken')) { - expect((context as CallableContext).instanceIdToken).to.be.undefined; - } -} - -function checkAppCheckContext( - context: CallableContext | CallableRequest, - projectId: string, - appId: string -) { - expect(context.app).to.not.be.undefined; - expect(context.app).to.not.be.null; - expect(context.app.appId).to.equal(appId); - expect(context.app.token.app_id).to.be.equal(appId); - expect(context.app.token.sub).to.be.equal(appId); - expect(context.app.token.aud).to.be.deep.equal([`projects/${projectId}`]); - expect(context.auth).to.be.undefined; - expect(context.instanceIdToken).to.be.undefined; -} - describe('onCallHandler', () => { let app: firebase.app.App; @@ -667,187 +522,6 @@ describe('onCallHandler', () => { }); }); -describe('onEnqueueHandler', () => { - let app: firebase.app.App; - - before(() => { - const credential = { - getAccessToken: () => { - return Promise.resolve({ - expires_in: 1000, - access_token: 'fake', - }); - }, - getCertificate: () => { - return { - projectId: 'aProjectId', - }; - }, - }; - app = firebase.initializeApp({ - projectId: 'aProjectId', - credential, - }); - Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); - }); - - after(() => { - app.delete(); - delete appsNamespace.singleton; - }); - - it('should handle success', () => { - return runTaskTest({ - httpRequest: mockRequest({ foo: 'bar' }), - expectedData: { foo: 'bar' }, - expectedStatus: 204, - }); - }); - - it('should reject bad method', () => { - const req = mockRequest(null); - req.method = 'GET'; - return runTaskTest({ - httpRequest: req, - expectedData: null, - expectedStatus: 400, - }); - }); - - it('should ignore charset', () => { - return runTaskTest({ - httpRequest: mockRequest(null, 'application/json; charset=utf-8'), - expectedData: null, - expectedStatus: 204, - }); - }); - - it('should reject bad content type', () => { - return runTaskTest({ - httpRequest: mockRequest(null, 'text/plain'), - expectedData: null, - expectedStatus: 400, - }); - }); - - it('should reject extra body fields', () => { - const req = mockRequest(null); - req.body.extra = 'bad'; - return runTaskTest({ - httpRequest: req, - expectedData: null, - expectedStatus: 400, - }); - }); - - it('should handle unhandled error', () => { - return runTaskTest({ - httpRequest: mockRequest(null), - expectedData: null, - taskFunction: (data, context) => { - throw new Error(`ceci n'est pas une error`); - }, - taskFunction2: (request) => { - throw new Error(`cece n'est pas une error`); - }, - expectedStatus: 500, - }); - }); - - it('should handle unknown error status', () => { - return runTaskTest({ - httpRequest: mockRequest(null), - expectedData: null, - taskFunction: (data, context) => { - throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); - }, - taskFunction2: (request) => { - throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); - }, - expectedStatus: 500, - }); - }); - - it('should handle well-formed error', () => { - return runTaskTest({ - httpRequest: mockRequest(null), - expectedData: null, - taskFunction: (data, context) => { - throw new https.HttpsError('not-found', 'i am error'); - }, - taskFunction2: (request) => { - throw new https.HttpsError('not-found', 'i am error'); - }, - expectedStatus: 404, - }); - }); - - it('should handle auth', async () => { - const mock = mockFetchPublicKeys(); - const projectId = appsNamespace().admin.options.projectId; - const idToken = generateIdToken(projectId); - await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer ' + idToken, - }), - expectedData: null, - taskFunction: (data, context) => { - checkAuthContext(context, projectId, mocks.user_id); - return null; - }, - taskFunction2: (request) => { - checkAuthContext(request, projectId, mocks.user_id); - return null; - }, - expectedStatus: 204, - }); - mock.done(); - }); - - it('should reject bad auth', async () => { - const projectId = appsNamespace().admin.options.projectId; - const idToken = generateUnsignedIdToken(projectId); - await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer ' + idToken, - }), - expectedData: null, - expectedStatus: 401, - }); - }); - - describe('skip token verification debug mode support', () => { - before(() => { - sinon - .stub(debug, 'isDebugFeatureEnabled') - .withArgs('skipTokenVerification') - .returns(true); - }); - - after(() => { - sinon.verifyAndRestore(); - }); - - it('should skip auth token verification', async () => { - const projectId = appsNamespace().admin.options.projectId; - const idToken = generateUnsignedIdToken(projectId); - await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer ' + idToken, - }), - expectedData: null, - taskFunction: (data, context) => { - checkAuthContext(context, projectId, mocks.user_id); - }, - taskFunction2: (request) => { - checkAuthContext(request, projectId, mocks.user_id); - }, - expectedStatus: 204, - }); - }); - }); -}); - describe('encoding/decoding', () => { it('encodes null', () => { expect(https.encode(null)).to.be.null; @@ -977,19 +651,21 @@ describe('decode tokens', () => { const appId = '123:web:abc'; it('decodes valid Auth ID Token', () => { - const idToken = unsafeDecodeIdToken(generateIdToken(projectId)); + const idToken = https.unsafeDecodeIdToken(generateIdToken(projectId)); expect(idToken.uid).to.equal(mocks.user_id); expect(idToken.sub).to.equal(mocks.user_id); }); it('decodes invalid Auth ID Token', () => { - const idToken = unsafeDecodeIdToken(generateUnsignedIdToken(projectId)); + const idToken = https.unsafeDecodeIdToken( + generateUnsignedIdToken(projectId) + ); expect(idToken.uid).to.equal(mocks.user_id); expect(idToken.sub).to.equal(mocks.user_id); }); it('decodes valid App Check Token', () => { - const idToken = unsafeDecodeAppCheckToken( + const idToken = https.unsafeDecodeAppCheckToken( generateAppCheckToken(projectId, appId) ); expect(idToken.app_id).to.equal(appId); @@ -997,7 +673,7 @@ describe('decode tokens', () => { }); it('decodes invalid App Check Token', () => { - const idToken = unsafeDecodeAppCheckToken( + const idToken = https.unsafeDecodeAppCheckToken( generateUnsignedAppCheckToken(projectId, appId) ); expect(idToken.app_id).to.equal(appId); diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts new file mode 100644 index 000000000..a29731c5a --- /dev/null +++ b/spec/common/providers/tasks.spec.ts @@ -0,0 +1,262 @@ +// 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. + +import { expect } from 'chai'; +import * as sinon from 'sinon'; +import * as firebase from 'firebase-admin'; + +import { checkAuthContext, runHandler } from '../../helper'; +import { + generateIdToken, + generateUnsignedIdToken, + mockFetchPublicKeys, + mockRequest, +} from '../../fixtures/mockrequest'; +import { + onDispatchHandler, + TaskContext, + Request, +} from '../../../src/common/providers/tasks'; +import { apps as appsNamespace } from '../../../src/apps'; +import * as mocks from '../../fixtures/credential/key.json'; +import * as https from '../../../src/common/providers/https'; +import * as debug from '../../../src/common/debug'; + +/** Represents a test case for a Task Queue Function */ +interface TaskTest { + // An http request, mocking a subset of https.Request. + httpRequest: any; + + // The expected format of the request passed to the handler. + expectedData: any; + + taskFunction?: (data: any, context: TaskContext) => void | Promise; + + taskFunction2?: (request: Request) => void | Promise; + + // The expected shape of the http response returned to the callable SDK. + expectedStatus: number; +} + +// Runs a TaskTest test. +export async function runTaskTest(test: TaskTest): Promise { + const taskQueueFunctionV1 = onDispatchHandler((data, context) => { + expect(data).to.deep.equal(test.expectedData); + if (test.taskFunction) { + test.taskFunction(data, context); + } + }); + + const responseV1 = await runHandler(taskQueueFunctionV1, test.httpRequest); + expect(responseV1.status).to.equal(test.expectedStatus); + + const taskQueueFunctionV2 = onDispatchHandler((request) => { + expect(request.data).to.deep.equal(test.expectedData); + if (test.taskFunction2) { + test.taskFunction2(request); + } + }); + + const responseV2 = await runHandler(taskQueueFunctionV2, test.httpRequest); + expect(responseV2.status).to.equal(test.expectedStatus); +} + +describe('onEnqueueHandler', () => { + let app: firebase.app.App; + + before(() => { + const credential = { + getAccessToken: () => { + return Promise.resolve({ + expires_in: 1000, + access_token: 'fake', + }); + }, + getCertificate: () => { + return { + projectId: 'aProjectId', + }; + }, + }; + app = firebase.initializeApp({ + projectId: 'aProjectId', + credential, + }); + Object.defineProperty(appsNamespace(), 'admin', { get: () => app }); + }); + + after(() => { + app.delete(); + delete appsNamespace.singleton; + }); + + it('should handle success', () => { + return runTaskTest({ + httpRequest: mockRequest({ foo: 'bar' }), + expectedData: { foo: 'bar' }, + expectedStatus: 204, + }); + }); + + it('should reject bad method', () => { + const req = mockRequest(null); + req.method = 'GET'; + return runTaskTest({ + httpRequest: req, + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should ignore charset', () => { + return runTaskTest({ + httpRequest: mockRequest(null, 'application/json; charset=utf-8'), + expectedData: null, + expectedStatus: 204, + }); + }); + + it('should reject bad content type', () => { + return runTaskTest({ + httpRequest: mockRequest(null, 'text/plain'), + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should reject extra body fields', () => { + const req = mockRequest(null); + req.body.extra = 'bad'; + return runTaskTest({ + httpRequest: req, + expectedData: null, + expectedStatus: 400, + }); + }); + + it('should handle unhandled error', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new Error(`ceci n'est pas une error`); + }, + taskFunction2: (request) => { + throw new Error(`cece n'est pas une error`); + }, + expectedStatus: 500, + }); + }); + + it('should handle unknown error status', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, + taskFunction2: (request) => { + throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); + }, + expectedStatus: 500, + }); + }); + + it('should handle well-formed error', () => { + return runTaskTest({ + httpRequest: mockRequest(null), + expectedData: null, + taskFunction: (data, context) => { + throw new https.HttpsError('not-found', 'i am error'); + }, + taskFunction2: (request) => { + throw new https.HttpsError('not-found', 'i am error'); + }, + expectedStatus: 404, + }); + }); + + it('should handle auth', async () => { + const mock = mockFetchPublicKeys(); + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + taskFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + return null; + }, + taskFunction2: (request) => { + checkAuthContext(request, projectId, mocks.user_id); + return null; + }, + expectedStatus: 204, + }); + mock.done(); + }); + + it('should reject bad auth', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + expectedStatus: 401, + }); + }); + + describe('skip token verification debug mode support', () => { + before(() => { + sinon + .stub(debug, 'isDebugFeatureEnabled') + .withArgs('skipTokenVerification') + .returns(true); + }); + + after(() => { + sinon.verifyAndRestore(); + }); + + it('should skip auth token verification', async () => { + const projectId = appsNamespace().admin.options.projectId; + const idToken = generateUnsignedIdToken(projectId); + await runTaskTest({ + httpRequest: mockRequest(null, 'application/json', { + authorization: 'Bearer ' + idToken, + }), + expectedData: null, + taskFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + }, + taskFunction2: (request) => { + checkAuthContext(request, projectId, mocks.user_id); + }, + expectedStatus: 204, + }); + }); + }); +}); diff --git a/spec/helper.ts b/spec/helper.ts new file mode 100644 index 000000000..f39b96e04 --- /dev/null +++ b/spec/helper.ts @@ -0,0 +1,127 @@ +// 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. + +import * as express from 'express'; +import { expect } from 'chai'; + +import * as https from '../src/common/providers/https'; +import * as tasks from '../src/common/providers/tasks'; + +/** + * RunHandlerResult contains the data from an express.Response. + */ +export interface RunHandlerResult { + status: number; + headers: { [name: string]: string }; + body: any; +} + +/** + * Runs an express handler with a given request asynchronously and returns the + * data populated into the response. + */ +export function runHandler( + handler: express.Handler, + request: https.Request +): Promise { + return new Promise((resolve, reject) => { + // MockResponse mocks an express.Response. + // This class lives here so it can reference resolve and reject. + class MockResponse { + private statusCode = 0; + private headers: { [name: string]: string } = {}; + private callback: Function; + + public status(code: number) { + this.statusCode = code; + return this; + } + + // Headers are only set by the cors handler. + public setHeader(name: string, value: string) { + this.headers[name] = value; + } + + public getHeader(name: string): string { + return this.headers[name]; + } + + public send(body: any) { + resolve({ + status: this.statusCode, + headers: this.headers, + body, + }); + if (this.callback) { + this.callback(); + } + } + + public end() { + this.send(undefined); + } + + public on(event: string, callback: Function) { + if (event !== 'finish') { + throw new Error('MockResponse only implements the finish event'); + } + this.callback = callback; + } + } + + const response = new MockResponse(); + handler(request, response as any, () => undefined); + }); +} + +export function checkAuthContext( + context: https.CallableContext | https.CallableRequest | tasks.TaskContext, + projectId: string, + userId: string +) { + expect(context.auth).to.not.be.undefined; + expect(context.auth).to.not.be.null; + expect(context.auth.uid).to.equal(userId); + expect(context.auth.token.uid).to.equal(userId); + expect(context.auth.token.sub).to.equal(userId); + expect(context.auth.token.aud).to.equal(projectId); + + // TaskContext & TaskRequest don't have instanceIdToken + if ({}.hasOwnProperty.call(context, 'instanceIdToken')) { + expect((context as https.CallableContext).instanceIdToken).to.be.undefined; + } +} + +export function checkAppCheckContext( + context: https.CallableContext | https.CallableRequest, + projectId: string, + appId: string +) { + expect(context.app).to.not.be.undefined; + expect(context.app).to.not.be.null; + expect(context.app.appId).to.equal(appId); + expect(context.app.token.app_id).to.be.equal(appId); + expect(context.app.token.sub).to.be.equal(appId); + expect(context.app.token.aud).to.be.deep.equal([`projects/${projectId}`]); + expect(context.auth).to.be.undefined; + expect(context.instanceIdToken).to.be.undefined; +} diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index 6db4370fd..c75400064 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -4,9 +4,9 @@ import { expect } from 'chai'; import * as loader from '../../src/runtime/loader'; import * as functions from '../../src/index'; import { - ManifestStack, ManifestEndpoint, ManifestRequiredAPI, + ManifestStack, } from '../../src/runtime/manifest'; describe('extractStack', () => { @@ -44,7 +44,7 @@ describe('extractStack', () => { it('extracts stack with required APIs', () => { const module = { - taskq: functions.https.taskQueue().onDispatch(() => {}), + taskq: functions.tasks.taskQueue().onDispatch(() => {}), }; const endpoints: Record = {}; diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts index 22e6d52fd..7046ad25e 100644 --- a/spec/v1/providers/https.spec.ts +++ b/spec/v1/providers/https.spec.ts @@ -21,7 +21,6 @@ // SOFTWARE. import { expect } from 'chai'; -import * as express from 'express'; import * as functions from '../../../src/index'; import * as https from '../../../src/providers/https'; @@ -29,68 +28,7 @@ import { expectedResponseHeaders, MockRequest, } from '../../fixtures/mockrequest'; - -/** - * RunHandlerResult contains the data from an express.Response. - */ -interface RunHandlerResult { - status: number; - headers: { [name: string]: string }; - body: any; -} - -function runHandler( - handler: express.Handler, - request: https.Request -): Promise { - return new Promise((resolve, reject) => { - // MockResponse mocks an express.Response. - // This class lives here so it can reference resolve and reject. - class MockResponse { - private statusCode = 0; - private headers: { [name: string]: string } = {}; - private callback: Function; - - public status(code: number) { - this.statusCode = code; - return this; - } - - // Headers are only set by the cors handler. - public setHeader(name: string, value: string) { - this.headers[name] = value; - } - - public getHeader(name: string): string { - return this.headers[name]; - } - - public send(body: any) { - resolve({ - status: this.statusCode, - headers: this.headers, - body, - }); - if (this.callback) { - this.callback(); - } - } - - public end() { - this.send(undefined); - } - - public on(event: string, callback: Function) { - if (event !== 'finish') { - throw new Error('MockResponse only implements the finish event'); - } - this.callback = callback; - } - } - const response = new MockResponse(); - handler(request, response as any, () => undefined); - }); -} +import { runHandler } from '../../helper'; describe('CloudHttpsBuilder', () => { describe('#onRequest', () => { @@ -146,14 +84,6 @@ describe('handler namespace', () => { expect(result.__endpoint).to.be.undefined; }); }); - - describe('#onEnqueue', () => { - it('should return an empty trigger', () => { - const result = functions.handler.https.taskQueue.onEnqueue(() => null); - expect(result.__trigger).to.deep.equal({}); - expect(result.__endpoint).to.be.undefined; - }); - }); }); describe('#onCall', () => { @@ -231,137 +161,6 @@ describe('#onCall', () => { }); }); -describe('#onEnqueue', () => { - it('should return a trigger/endpoint with appropriate values', () => { - const result = https - .taskQueue({ - rateLimits: { - maxBurstSize: 20, - maxConcurrentDispatches: 30, - maxDispatchesPerSecond: 40, - }, - retryConfig: { - maxAttempts: 5, - maxBackoffSeconds: 20, - maxDoublings: 3, - minBackoffSeconds: 5, - }, - invoker: 'private', - }) - .onDispatch(() => {}); - - expect(result.__trigger).to.deep.equal({ - taskQueueTrigger: { - rateLimits: { - maxBurstSize: 20, - maxConcurrentDispatches: 30, - maxDispatchesPerSecond: 40, - }, - retryConfig: { - maxAttempts: 5, - maxBackoffSeconds: 20, - maxDoublings: 3, - minBackoffSeconds: 5, - }, - invoker: ['private'], - }, - }); - - expect(result.__endpoint).to.deep.equal({ - platform: 'gcfv1', - taskQueueTrigger: { - rateLimits: { - maxBurstSize: 20, - maxConcurrentDispatches: 30, - maxDispatchesPerSecond: 40, - }, - retryConfig: { - maxAttempts: 5, - maxBackoffSeconds: 20, - maxDoublings: 3, - minBackoffSeconds: 5, - }, - invoker: ['private'], - }, - }); - }); - - it('should allow both region and runtime options to be set', () => { - const fn = functions - .region('us-east1') - .runWith({ - timeoutSeconds: 90, - memory: '256MB', - }) - .https.taskQueue({ retryConfig: { maxAttempts: 5 } }) - .onDispatch(() => null); - - expect(fn.__trigger).to.deep.equal({ - regions: ['us-east1'], - availableMemoryMb: 256, - timeout: '90s', - taskQueueTrigger: { - retryConfig: { - maxAttempts: 5, - }, - }, - }); - - expect(fn.__endpoint).to.deep.equal({ - platform: 'gcfv1', - region: ['us-east1'], - availableMemoryMb: 256, - timeoutSeconds: 90, - taskQueueTrigger: { - retryConfig: { - maxAttempts: 5, - }, - }, - }); - }); - - it('has a .run method', async () => { - const data = 'data'; - const context = { - auth: { - uid: 'abc', - token: 'token' as any, - }, - }; - let done = false; - const cf = https.taskQueue().onDispatch((d, c) => { - expect(d).to.equal(data); - expect(c).to.deep.equal(context); - done = true; - }); - - await cf.run(data, context); - expect(done).to.be.true; - }); - - // Regression test for firebase-functions#947 - it('should lock to the v1 API even with function.length == 1', async () => { - let gotData: Record; - const func = https.taskQueue().onDispatch((data) => { - gotData = data; - }); - - const req = new MockRequest( - { - data: { foo: 'bar' }, - }, - { - 'content-type': 'application/json', - } - ); - req.method = 'POST'; - - const response = await runHandler(func, req as any); - expect(response.status).to.equal(204); - expect(gotData).to.deep.equal({ foo: 'bar' }); - }); -}); - describe('callable CORS', () => { it('handles OPTIONS preflight', async () => { const func = https.onCall((data, context) => { diff --git a/spec/v1/providers/tasks.spec.ts b/spec/v1/providers/tasks.spec.ts new file mode 100644 index 000000000..640ceed68 --- /dev/null +++ b/spec/v1/providers/tasks.spec.ts @@ -0,0 +1,165 @@ +// 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. + +import { expect } from 'chai'; + +import * as functions from '../../../src'; +import { taskQueue } from '../../../src/providers/tasks'; +import { MockRequest } from '../../fixtures/mockrequest'; +import { runHandler } from '../../helper'; + +describe('#onDispatch', () => { + it('should return a trigger/endpoint with appropriate values', () => { + const result = taskQueue({ + rateLimits: { + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxRetrySeconds: 10, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: 'private', + }).onDispatch(() => {}); + + expect(result.__trigger).to.deep.equal({ + taskQueueTrigger: { + rateLimits: { + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxRetrySeconds: 10, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: ['private'], + }, + }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv1', + taskQueueTrigger: { + rateLimits: { + maxConcurrentDispatches: 30, + maxDispatchesPerSecond: 40, + }, + retryConfig: { + maxAttempts: 5, + maxRetrySeconds: 10, + maxBackoffSeconds: 20, + maxDoublings: 3, + minBackoffSeconds: 5, + }, + invoker: ['private'], + }, + }); + }); + + it('should allow both region and runtime options to be set', () => { + const fn = functions + .region('us-east1') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .tasks.taskQueue({ retryConfig: { maxAttempts: 5 } }) + .onDispatch(() => null); + + expect(fn.__trigger).to.deep.equal({ + regions: ['us-east1'], + availableMemoryMb: 256, + timeout: '90s', + taskQueueTrigger: { + retryConfig: { + maxAttempts: 5, + }, + }, + }); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + region: ['us-east1'], + availableMemoryMb: 256, + timeoutSeconds: 90, + taskQueueTrigger: { + retryConfig: { + maxAttempts: 5, + }, + }, + }); + }); + + it('has a .run method', async () => { + const data = 'data'; + const context = { + auth: { + uid: 'abc', + token: 'token' as any, + }, + }; + let done = false; + const cf = taskQueue().onDispatch((d, c) => { + expect(d).to.equal(data); + expect(c).to.deep.equal(context); + done = true; + }); + + await cf.run(data, context); + expect(done).to.be.true; + }); + + // Regression test for firebase-functions#947 + it('should lock to the v1 API even with function.length == 1', async () => { + let gotData: Record; + const func = taskQueue().onDispatch((data) => { + gotData = data; + }); + + const req = new MockRequest( + { + data: { foo: 'bar' }, + }, + { + 'content-type': 'application/json', + } + ); + req.method = 'POST'; + + const response = await runHandler(func, req as any); + expect(response.status).to.equal(204); + expect(gotData).to.deep.equal({ foo: 'bar' }); + }); +}); + +describe('handler namespace', () => { + it('should return an empty trigger', () => { + const result = functions.handler.tasks.taskQueue.onDispatch(() => null); + expect(result.__trigger).to.deep.equal({}); + expect(result.__endpoint).to.be.undefined; + }); +}); diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts index 6ad78a811..8c4741f43 100644 --- a/spec/v2/providers/alerts/alerts.spec.ts +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as options from '../../../../src/v2/options'; import * as alerts from '../../../../src/v2/providers/alerts'; -import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; const ALERT_TYPE = 'new-alert-type'; const APPID = '123456789'; diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts index 3242c7e07..5fb112daa 100644 --- a/spec/v2/providers/alerts/appDistribution.spec.ts +++ b/spec/v2/providers/alerts/appDistribution.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as alerts from '../../../../src/v2/providers/alerts'; import * as appDistribution from '../../../../src/v2/providers/alerts/appDistribution'; -import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; const APPID = '123456789'; const myHandler = () => 42; diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts index f8e0eeebb..4bf5f3080 100644 --- a/spec/v2/providers/alerts/billing.spec.ts +++ b/spec/v2/providers/alerts/billing.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as alerts from '../../../../src/v2/providers/alerts'; import * as billing from '../../../../src/v2/providers/alerts/billing'; -import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; const ALERT_TYPE = 'new-alert-type'; const myHandler = () => 42; diff --git a/spec/v2/providers/alerts/crashlytics.spec.ts b/spec/v2/providers/alerts/crashlytics.spec.ts index 1ea1c4f0e..08956d8c7 100644 --- a/spec/v2/providers/alerts/crashlytics.spec.ts +++ b/spec/v2/providers/alerts/crashlytics.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as alerts from '../../../../src/v2/providers/alerts'; import * as crashlytics from '../../../../src/v2/providers/alerts/crashlytics'; -import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; const ALERT_TYPE = 'new-alert-type'; const APPID = '123456789'; diff --git a/spec/v2/providers/helpers.ts b/spec/v2/providers/fixtures.ts similarity index 100% rename from spec/v2/providers/helpers.ts rename to spec/v2/providers/fixtures.ts diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 5f0f7eb74..587be89c6 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -1,5 +1,26 @@ +// 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. + import { expect } from 'chai'; -import * as express from 'express'; import * as options from '../../../src/v2/options'; import * as https from '../../../src/v2/providers/https'; @@ -7,70 +28,8 @@ import { expectedResponseHeaders, MockRequest, } from '../../fixtures/mockrequest'; -import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './helpers'; - -/** - * RunHandlerResult contains the data from an express.Response. - */ -interface RunHandlerResult { - status: number; - headers: { [name: string]: string }; - body: any; -} - -function runHandler( - handler: express.Handler, - request: https.Request -): Promise { - return new Promise((resolve, reject) => { - // MockResponse mocks an express.Response. - // This class lives here so it can reference resolve and reject. - class MockResponse { - private statusCode = 0; - private headers: { [name: string]: string } = {}; - private callback: Function; - - public status(code: number) { - this.statusCode = code; - return this; - } - - // Headers are only set by the cors handler. - public setHeader(name: string, value: string) { - this.headers[name] = value; - } - - public getHeader(name: string): string { - return this.headers[name]; - } - - public send(body: any) { - resolve({ - status: this.statusCode, - headers: this.headers, - body, - }); - if (this.callback) { - this.callback(); - } - } - - public end() { - this.send(undefined); - } - - public on(event: string, callback: Function) { - if (event !== 'finish') { - throw new Error('MockResponse only implements the finish event'); - } - this.callback = callback; - } - } - - const response = new MockResponse(); - handler(request, response as any, () => undefined); - }); -} +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; +import { runHandler } from '../../helper'; describe('onRequest', () => { beforeEach(() => { @@ -415,139 +374,3 @@ describe('onCall', () => { https.onCall((request: https.CallableRequest) => `Hello, ${request.data}`); }); }); - -describe('onTaskEnqueue', () => { - beforeEach(() => { - options.setGlobalOptions({}); - process.env.GCLOUD_PROJECT = 'aProject'; - }); - - afterEach(() => { - delete process.env.GCLOUD_PROJECT; - }); - - it('should return a minimal trigger with appropriate values', () => { - const result = https.onTaskDispatched(() => {}); - expect(result.__trigger).to.deep.equal({ - apiVersion: 2, - platform: 'gcfv2', - taskQueueTrigger: {}, - labels: {}, - }); - }); - - it('should create a complex trigger with appropriate values', () => { - const result = https.onTaskDispatched( - { - ...FULL_OPTIONS, - retryConfig: { - maxAttempts: 4, - maxDoublings: 3, - minBackoffSeconds: 1, - maxBackoffSeconds: 2, - }, - rateLimits: { - maxBurstSize: 10, - maxConcurrentDispatches: 5, - maxDispatchesPerSecond: 10, - }, - invoker: 'private', - }, - () => {} - ); - expect(result.__trigger).to.deep.equal({ - ...FULL_TRIGGER, - taskQueueTrigger: { - retryConfig: { - maxAttempts: 4, - maxDoublings: 3, - minBackoffSeconds: 1, - maxBackoffSeconds: 2, - }, - rateLimits: { - maxBurstSize: 10, - maxConcurrentDispatches: 5, - maxDispatchesPerSecond: 10, - }, - invoker: ['private'], - }, - }); - }); - - it('should merge options and globalOptions', () => { - options.setGlobalOptions({ - concurrency: 20, - region: 'europe-west1', - minInstances: 1, - }); - - const result = https.onTaskDispatched( - { - region: 'us-west1', - minInstances: 3, - }, - (request) => {} - ); - - expect(result.__trigger).to.deep.equal({ - apiVersion: 2, - platform: 'gcfv2', - taskQueueTrigger: {}, - concurrency: 20, - minInstances: 3, - regions: ['us-west1'], - labels: {}, - }); - }); - - it('has a .run method', async () => { - const request: any = { - data: 'data', - auth: { - uid: 'abc', - token: 'token', - }, - }; - const cf = https.onTaskDispatched((r) => { - expect(r.data).to.deep.equal(request.data); - expect(r.auth).to.deep.equal(request.auth); - }); - - await cf.run(request); - }); - - it('should be an express handler', async () => { - const func = https.onTaskDispatched((request) => {}); - - const req = new MockRequest( - { - data: {}, - }, - { - 'content-type': 'application/json', - origin: 'example.com', - } - ); - req.method = 'POST'; - - const resp = await runHandler(func, req as any); - expect(resp.status).to.equal(204); - }); - - // These tests pass if the code transpiles - it('allows desirable syntax', () => { - https.onTaskDispatched((request: https.TaskRequest) => { - // There should be no lint warnings that data is not a string. - console.log(`hello, ${request.data}`); - }); - https.onTaskDispatched((request: https.TaskRequest) => { - console.log(`hello, ${request.data}`); - }); - https.onTaskDispatched((request: https.TaskRequest) => { - console.log(`hello, ${request.data}`); - }); - https.onTaskDispatched((request: https.TaskRequest) => { - console.log(`Hello, ${request.data}`); - }); - }); -}); diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index f48e10f72..73e5b55ab 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { CloudEvent } from '../../../src/v2/core'; import * as options from '../../../src/v2/options'; import * as pubsub from '../../../src/v2/providers/pubsub'; -import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './helpers'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; const EVENT_TRIGGER = { eventType: 'google.cloud.pubsub.topic.v1.messagePublished', diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts index 0471b6931..1c6d7c265 100644 --- a/spec/v2/providers/storage.spec.ts +++ b/spec/v2/providers/storage.spec.ts @@ -3,7 +3,7 @@ import * as sinon from 'sinon'; import * as config from '../../../src/config'; import * as options from '../../../src/v2/options'; import * as storage from '../../../src/v2/providers/storage'; -import { FULL_OPTIONS } from './helpers'; +import { FULL_OPTIONS } from './fixtures'; const EVENT_TRIGGER = { eventType: 'event-type', diff --git a/spec/v2/providers/tasks.spec.ts b/spec/v2/providers/tasks.spec.ts new file mode 100644 index 000000000..4ef4704db --- /dev/null +++ b/spec/v2/providers/tasks.spec.ts @@ -0,0 +1,201 @@ +// 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. + +import { expect } from 'chai'; + +import * as options from '../../../src/v2/options'; +import { onTaskDispatched, Request } from '../../../src/v2/providers/tasks'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; +import { MockRequest } from '../../fixtures/mockrequest'; +import { runHandler } from '../../helper'; + +describe('onTaskDispatched', () => { + beforeEach(() => { + options.setGlobalOptions({}); + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + delete process.env.GCLOUD_PROJECT; + }); + + it('should return a minimal trigger/endpoint with appropriate values', () => { + const result = onTaskDispatched(() => {}); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + taskQueueTrigger: {}, + labels: {}, + }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + taskQueueTrigger: {}, + labels: {}, + }); + }); + + it('should create a complex trigger/endpoint with appropriate values', () => { + const result = onTaskDispatched( + { + ...FULL_OPTIONS, + retryConfig: { + maxAttempts: 4, + maxRetrySeconds: 10, + maxDoublings: 3, + minBackoffSeconds: 1, + maxBackoffSeconds: 2, + }, + rateLimits: { + maxConcurrentDispatches: 5, + maxDispatchesPerSecond: 10, + }, + invoker: 'private', + }, + () => {} + ); + + expect(result.__trigger).to.deep.equal({ + ...FULL_TRIGGER, + taskQueueTrigger: { + retryConfig: { + maxAttempts: 4, + maxRetrySeconds: 10, + maxDoublings: 3, + minBackoffSeconds: 1, + maxBackoffSeconds: 2, + }, + rateLimits: { + maxConcurrentDispatches: 5, + maxDispatchesPerSecond: 10, + }, + invoker: ['private'], + }, + }); + + expect(result.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + platform: 'gcfv2', + taskQueueTrigger: { + retryConfig: { + maxAttempts: 4, + maxRetrySeconds: 10, + maxDoublings: 3, + minBackoffSeconds: 1, + maxBackoffSeconds: 2, + }, + rateLimits: { + maxConcurrentDispatches: 5, + maxDispatchesPerSecond: 10, + }, + invoker: ['private'], + }, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = onTaskDispatched( + { + region: 'us-west1', + minInstances: 3, + }, + (request) => {} + ); + + expect(result.__trigger).to.deep.equal({ + apiVersion: 2, + platform: 'gcfv2', + taskQueueTrigger: {}, + concurrency: 20, + minInstances: 3, + regions: ['us-west1'], + labels: {}, + }); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + taskQueueTrigger: {}, + concurrency: 20, + minInstances: 3, + region: ['us-west1'], + labels: {}, + }); + }); + + it('has a .run method', async () => { + const request: any = { + data: 'data', + auth: { + uid: 'abc', + token: 'token', + }, + }; + const cf = onTaskDispatched((r) => { + expect(r.data).to.deep.equal(request.data); + expect(r.auth).to.deep.equal(request.auth); + }); + + await cf.run(request); + }); + + it('should be an express handler', async () => { + const func = onTaskDispatched((request) => {}); + + const req = new MockRequest( + { + data: {}, + }, + { + 'content-type': 'application/json', + origin: 'example.com', + } + ); + req.method = 'POST'; + + const resp = await runHandler(func, req as any); + expect(resp.status).to.equal(204); + }); + + // These tests pass if the code transpiles + it('allows desirable syntax', () => { + onTaskDispatched((request: Request) => { + // There should be no lint warnings that data is not a string. + console.log(`hello, ${request.data}`); + }); + onTaskDispatched((request: Request) => { + console.log(`hello, ${request.data}`); + }); + onTaskDispatched((request: Request) => { + console.log(`hello, ${request.data}`); + }); + onTaskDispatched((request: Request) => { + console.log(`Hello, ${request.data}`); + }); + }); +}); diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 5421ebb7b..76e02cd37 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -29,7 +29,8 @@ import * as logger from '../../logger'; // TODO(inlined): Decide whether we want to un-version apps or whether we want a // different strategy import { apps } from '../../apps'; -import { isDebugFeatureEnabled } from '../../common/debug'; +import { isDebugFeatureEnabled } from '../debug'; +import { TaskContext } from './tasks'; const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/; @@ -169,68 +170,6 @@ export interface CallableRequest { rawRequest: Request; } -/** How a task should be retried in the event of a non-2xx return. */ -export interface TaskRetryConfig { - /** - * Maximum number of times a request should be attempted. - * If left unspecified, will default to 3. - */ - maxAttempts?: number; - - /** - * The maximum amount of time to wait between attempts. - * If left unspecified will default to 1hr. - */ - maxBackoffSeconds?: number; - - /** - * The maximum number of times to double the backoff between - * retries. If left unspecified will default to 16. - */ - maxDoublings?: number; - - /** - * The minimum time to wait between attempts. If left unspecified - * will default to 100ms. - */ - minBackoffSeconds?: number; -} - -/** How congestion control should be applied to the function. */ -export interface TaskRateLimits { - // If left unspecified, will default to 100 - maxBurstSize?: number; - - // If left unspecified, wild default to 1000 - maxConcurrentDispatches?: number; - - // If left unspecified, will default to 500 - maxDispatchesPerSecond?: number; -} - -/** Metadata about a call to a Task Queue function. */ -export interface TaskContext { - /** - * The result of decoding and verifying an ODIC token. - */ - auth?: AuthData; -} - -/** - * The request used to call a Task Queue function. - */ -export interface TaskRequest { - /** - * The parameters used by a client when calling this function. - */ - data: T; - - /** - * The result of decoding and verifying an ODIC token. - */ - auth?: AuthData; -} - /** * The set of Firebase Functions status codes. The codes are the same at the * ones exposed by gRPC here: @@ -419,7 +358,7 @@ interface HttpResponseBody { /** @hidden */ // Returns true if req is a properly formatted callable request. -function isValidRequest(req: Request): req is HttpRequest { +export function isValidRequest(req: Request): req is HttpRequest { // The body must not be empty. if (!req.body) { logger.warn('Request is missing body.'); @@ -670,7 +609,7 @@ async function checkTokens( } /** @interanl */ -async function checkAuthToken( +export async function checkAuthToken( req: Request, ctx: CallableContext | TaskContext ): Promise { @@ -739,8 +678,6 @@ type v1CallableHandler = ( context: CallableContext ) => any | Promise; type v2CallableHandler = (request: CallableRequest) => Res; -type v1TaskHandler = (data: any, context: TaskContext) => void | Promise; -type v2TaskHandler = (request: TaskRequest) => void | Promise; /** @internal **/ export interface CallableOptions { @@ -828,50 +765,3 @@ function wrapOnCallHandler( } }; } - -/** @internal */ -export function onDispatchHandler( - handler: v1TaskHandler | v2TaskHandler -): (req: Request, res: express.Response) => Promise { - return async (req: Request, res: express.Response): Promise => { - try { - if (!isValidRequest(req)) { - logger.error('Invalid request, unable to process.'); - throw new HttpsError('invalid-argument', 'Bad Request'); - } - - const context: TaskContext = {}; - const status = await checkAuthToken(req, context); - // Note: this should never happen since task queue functions are guarded by IAM. - if (status === 'INVALID') { - throw new HttpsError('unauthenticated', 'Unauthenticated'); - } - - const data: Req = decode(req.body.data); - if (handler.length === 2) { - await handler(data, context); - } else { - const arg: TaskRequest = { - ...context, - data, - }; - // For some reason the type system isn't picking up that the handler - // is a one argument function. - await (handler as any)(arg); - } - - res.status(204).end(); - } catch (err) { - if (!(err instanceof HttpsError)) { - // This doesn't count as an 'explicit' error. - logger.error('Unhandled error', err); - err = new HttpsError('internal', 'INTERNAL'); - } - - const { status } = err.httpErrorCode; - const body = { error: err.toJSON() }; - - res.status(status).send(body); - } - }; -} diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts new file mode 100644 index 000000000..57cecd215 --- /dev/null +++ b/src/common/providers/tasks.ts @@ -0,0 +1,147 @@ +// 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. + +import * as express from 'express'; +import * as firebase from 'firebase-admin'; + +import * as logger from '../../logger'; +import * as https from './https'; + +/** How a task should be retried in the event of a non-2xx return. */ +export interface RetryConfig { + /** + * Maximum number of times a request should be attempted. + * If left unspecified, will default to 3. + */ + maxAttempts?: number; + + /** + * Maximum amount of time for retrying failed task. + * If left unspecified will retry indefinitely. + */ + maxRetrySeconds?: number; + + /** + * The maximum amount of time to wait between attempts. + * If left unspecified will default to 1hr. + */ + maxBackoffSeconds?: number; + + /** + * The maximum number of times to double the backoff between + * retries. If left unspecified will default to 16. + */ + maxDoublings?: number; + + /** + * The minimum time to wait between attempts. If left unspecified + * will default to 100ms. + */ + minBackoffSeconds?: number; +} + +/** How congestion control should be applied to the function. */ +export interface RateLimits { + // If left unspecified, wild default to 1000 + maxConcurrentDispatches?: number; + + // If left unspecified, will default to 500 + maxDispatchesPerSecond?: number; +} + +export interface AuthData { + uid: string; + token: firebase.auth.DecodedIdToken; +} + +/** Metadata about a call to a Task Queue function. */ +export interface TaskContext { + /** + * The result of decoding and verifying an ODIC token. + */ + auth?: AuthData; +} + +/** + * The request used to call a Task Queue function. + */ +export interface Request { + /** + * The parameters used by a client when calling this function. + */ + data: T; + + /** + * The result of decoding and verifying an ODIC token. + */ + auth?: AuthData; +} + +type v1TaskHandler = (data: any, context: TaskContext) => void | Promise; +type v2TaskHandler = (request: Request) => void | Promise; + +/** @internal */ +export function onDispatchHandler( + handler: v1TaskHandler | v2TaskHandler +): (req: https.Request, res: express.Response) => Promise { + return async (req: https.Request, res: express.Response): Promise => { + try { + if (!https.isValidRequest(req)) { + logger.error('Invalid request, unable to process.'); + throw new https.HttpsError('invalid-argument', 'Bad Request'); + } + + const context: TaskContext = {}; + const status = await https.checkAuthToken(req, context); + // Note: this should never happen since task queue functions are guarded by IAM. + if (status === 'INVALID') { + throw new https.HttpsError('unauthenticated', 'Unauthenticated'); + } + + const data: Req = https.decode(req.body.data); + if (handler.length === 2) { + await handler(data, context); + } else { + const arg: Request = { + ...context, + data, + }; + // For some reason the type system isn't picking up that the handler + // is a one argument function. + await (handler as any)(arg); + } + + res.status(204).end(); + } catch (err) { + if (!(err instanceof https.HttpsError)) { + // This doesn't count as an 'explicit' error. + logger.error('Unhandled error', err); + err = new https.HttpsError('internal', 'INTERNAL'); + } + + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; + + res.status(status).send(body); + } + }; +} diff --git a/src/function-builder.ts b/src/function-builder.ts index cf52bfb56..88f58bb1c 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -42,6 +42,7 @@ 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'; /** @@ -367,14 +368,18 @@ export class FunctionBuilder { context: https.CallableContext ) => any | Promise ) => https._onCallWithOptions(handler, this.options), + }; + } + get tasks() { + return { /** * Declares a task queue function for clients to call using a Firebase Admin SDK. * @param options Configurations for the task queue function. */ /** @hidden */ - taskQueue: (options?: https.TaskQueueOptions) => { - return new https.TaskQueueBuilder(options, this.options); + taskQueue: (options?: tasks.TaskQueueOptions) => { + return new tasks.TaskQueueBuilder(options, this.options); }, }; } diff --git a/src/handler-builder.ts b/src/handler-builder.ts index c89f3c936..efa0d9f4c 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -32,6 +32,7 @@ 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'; /** @@ -86,16 +87,29 @@ export 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( + onDispatch: ( handler: ( data: any, - context: https.TaskContext + context: tasks.TaskContext ) => void | Promise - ) { - const builder = new https.TaskQueueBuilder(); + ): HttpsFunction => { + const builder = new tasks.TaskQueueBuilder(); const func = builder.onDispatch(handler); func.__trigger = {}; func.__endpoint = undefined; diff --git a/src/index.ts b/src/index.ts index dbb42003c..a77ba3ff9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -29,6 +29,7 @@ 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'; @@ -49,6 +50,7 @@ export { pubsub, remoteConfig, storage, + tasks, testLab, logger, }; diff --git a/src/providers/https.ts b/src/providers/https.ts index dc62458a7..842ebd84c 100644 --- a/src/providers/https.ts +++ b/src/providers/https.ts @@ -28,37 +28,17 @@ import { optionsToTrigger, Runnable, } from '../cloud-functions'; -import { - convertIfPresent, - convertInvoker, - copyIfPresent, -} from '../common/encoding'; -import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; +import { convertIfPresent, convertInvoker } from '../common/encoding'; import { CallableContext, FunctionsErrorCode, HttpsError, onCallHandler, - onDispatchHandler, Request, - TaskContext, - TaskRateLimits, - TaskRetryConfig, } 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. @@ -81,101 +61,6 @@ export function onCall( return _onCallWithOptions(handler, {}); } -/** - * 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; - __trigger: unknown; - __endpoint: ManifestEndpoint; - __requiredAPIs?: ManifestRequiredAPI[]; - run(data: any, context: TaskContext): void | Promise; -} - -/** @hidden */ -export class TaskQueueBuilder { - /** @internal */ - constructor( - private readonly tqOpts?: TaskQueueOptions, - private readonly depOpts?: DeploymentOptions - ) {} - - onDispatch( - handler: (data: any, context: TaskContext) => void | Promise - ): TaskQueueFunction { - // 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: any, context: TaskContext) => - handler(data, context); - const func: any = onDispatchHandler(fixedLen); - - func.__trigger = { - ...optionsToTrigger(this.depOpts || {}), - taskQueueTrigger: {}, - }; - copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig'); - copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits'); - convertIfPresent( - func.__trigger.taskQueueTrigger, - this.tqOpts, - 'invoker', - 'invoker', - convertInvoker - ); - - func.__endpoint = { - platform: 'gcfv1', - ...optionsToEndpoint(this.depOpts), - taskQueueTrigger: {}, - }; - copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig'); - copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits'); - convertIfPresent( - func.__endpoint.taskQueueTrigger, - this.tqOpts, - 'invoker', - 'invoker', - convertInvoker - ); - - func.__requiredAPIs = [ - { - api: 'cloudtasks.googleapis.com', - reason: 'Needed for task queue functions', - }, - ]; - - func.run = handler; - - return func; - } -} - -/** - * 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 function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder { - return new TaskQueueBuilder(options); -} - /** @hidden */ export function _onRequestWithOptions( handler: (req: Request, resp: express.Response) => void | Promise, diff --git a/src/providers/tasks.ts b/src/providers/tasks.ts new file mode 100644 index 000000000..5d9520497 --- /dev/null +++ b/src/providers/tasks.ts @@ -0,0 +1,145 @@ +// 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. + +import * as express from 'express'; + +import { Request } from '../common/providers/https'; +import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; +import { DeploymentOptions } from '../function-configuration'; +import { optionsToEndpoint, optionsToTrigger } from '../cloud-functions'; +import { + convertIfPresent, + convertInvoker, + copyIfPresent, +} from '../common/encoding'; +import { + onDispatchHandler, + TaskContext, + RateLimits, + RetryConfig, +} from '../common/providers/tasks'; + +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; + + __trigger: unknown; + __endpoint: ManifestEndpoint; + __requiredAPIs?: ManifestRequiredAPI[]; + + run(data: any, context: TaskContext): void | Promise; +} + +/** @hidden */ +export class TaskQueueBuilder { + /** @internal */ + constructor( + private readonly tqOpts?: TaskQueueOptions, + private readonly depOpts?: DeploymentOptions + ) {} + + onDispatch( + handler: (data: any, context: TaskContext) => void | Promise + ): TaskQueueFunction { + // 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: any, context: TaskContext) => + handler(data, context); + const func: any = onDispatchHandler(fixedLen); + + func.__trigger = { + ...optionsToTrigger(this.depOpts || {}), + taskQueueTrigger: {}, + }; + copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig'); + copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits'); + convertIfPresent( + func.__trigger.taskQueueTrigger, + this.tqOpts, + 'invoker', + 'invoker', + convertInvoker + ); + + func.__endpoint = { + platform: 'gcfv1', + ...optionsToEndpoint(this.depOpts), + taskQueueTrigger: {}, + }; + copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig'); + copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits'); + convertIfPresent( + func.__endpoint.taskQueueTrigger, + this.tqOpts, + 'invoker', + 'invoker', + convertInvoker + ); + + func.__requiredAPIs = [ + { + api: 'cloudtasks.googleapis.com', + reason: 'Needed for task queue functions', + }, + ]; + + func.run = handler; + + return func; + } +} + +/** + * 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 function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder { + return new TaskQueueBuilder(options); +} diff --git a/src/v2/index.ts b/src/v2/index.ts index 3de9b749f..3f6873810 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -26,8 +26,9 @@ import * as alerts from './providers/alerts'; import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; +import * as tasks from './providers/tasks'; -export { https, pubsub, storage, logger, params, alerts }; +export { alerts, https, pubsub, storage, logger, params, tasks }; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index f7b51e508..24367759c 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -22,11 +22,7 @@ import * as cors from 'cors'; import * as express from 'express'; -import { - convertIfPresent, - convertInvoker, - copyIfPresent, -} from '../../common/encoding'; +import { convertIfPresent, convertInvoker } from '../../common/encoding'; import * as options from '../options'; import { @@ -34,23 +30,11 @@ import { FunctionsErrorCode, HttpsError, onCallHandler, - onDispatchHandler, Request, - TaskRateLimits, - TaskRequest, - TaskRetryConfig, } from '../../common/providers/https'; import { ManifestEndpoint } from '../../runtime/manifest'; -export { - Request, - CallableRequest, - FunctionsErrorCode, - HttpsError, - TaskRateLimits, - TaskRequest, - TaskRetryConfig as TaskRetryPolicy, -}; +export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; export interface HttpsOptions extends Omit { region?: @@ -60,18 +44,6 @@ export interface HttpsOptions extends Omit { cors?: string | boolean | RegExp | Array; } -export interface TaskQueueOptions extends options.GlobalOptions { - 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[]; -} - export type HttpsFunction = (( req: Request, res: express.Response @@ -82,9 +54,6 @@ export type HttpsFunction = (( export interface CallableFunction extends HttpsFunction { run(data: CallableRequest): Return; } -export interface TaskQueueFunction extends HttpsFunction { - run(data: TaskRequest): void | Promise; -} export function onRequest( opts: HttpsOptions, @@ -269,72 +238,3 @@ export function onCall>( func.run = handler; return func; } - -/** Handle a request sent to a Cloud Tasks queue. */ -export function onTaskDispatched( - handler: (request: TaskRequest) => void | Promise -): TaskQueueFunction; - -/** Handle a request sent to a Cloud Tasks queue. */ -export function onTaskDispatched( - options: TaskQueueOptions, - handler: (request: TaskRequest) => void | Promise -): TaskQueueFunction; - -export function onTaskDispatched( - optsOrHandler: - | TaskQueueOptions - | ((request: TaskRequest) => void | Promise), - handler?: (request: TaskRequest) => void | Promise -): TaskQueueFunction { - let opts: TaskQueueOptions; - if (arguments.length == 1) { - opts = {}; - handler = optsOrHandler as ( - request: TaskRequest - ) => void | Promise; - } else { - opts = optsOrHandler as TaskQueueOptions; - } - - // onEnqueueHandler sniffs the function length to determine which API to present. - // fix the length to prevent api versions from being mismatched. - const fixedLen = (req: TaskRequest) => handler(req); - const func: any = onDispatchHandler(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 as options.GlobalOptions - ); - const taskQueueTrigger: Record = {}; - copyIfPresent(taskQueueTrigger, opts, 'retryConfig', 'rateLimits'); - convertIfPresent( - taskQueueTrigger, - opts, - 'invoker', - 'invoker', - convertInvoker - ); - return { - apiVersion: 2, - platform: 'gcfv2', - ...baseOpts, - ...specificOpts, - labels: { - ...baseOpts?.labels, - ...specificOpts?.labels, - }, - taskQueueTrigger, - }; - }, - }); - - func.run = handler; - return func; -} diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts new file mode 100644 index 000000000..ab5892bb5 --- /dev/null +++ b/src/v2/providers/tasks.ts @@ -0,0 +1,150 @@ +// 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. + +import * as options from '../options'; +import { + convertIfPresent, + convertInvoker, + copyIfPresent, +} from '../../common/encoding'; +import { HttpsFunction } from './https'; +import { + AuthData, + RateLimits, + Request, + RetryConfig, + onDispatchHandler, +} from '../../common/providers/tasks'; + +export { AuthData, RateLimits, Request, RetryConfig as RetryPolicy }; + +export interface TaskQueueOptions extends options.GlobalOptions { + 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[]; +} + +export interface TaskQueueFunction extends HttpsFunction { + run(data: Request): void | Promise; +} + +/** Handle a request sent to a Cloud Tasks queue. */ +export function onTaskDispatched( + handler: (request: Request) => void | Promise +): TaskQueueFunction; +/** Handle a request sent to a Cloud Tasks queue. */ +export function onTaskDispatched( + options: TaskQueueOptions, + handler: (request: Request) => void | Promise +): TaskQueueFunction; +export function onTaskDispatched( + optsOrHandler: + | TaskQueueOptions + | ((request: Request) => void | Promise), + handler?: (request: Request) => void | Promise +): TaskQueueFunction { + let opts: TaskQueueOptions; + if (arguments.length == 1) { + opts = {}; + handler = optsOrHandler as (request: Request) => void | Promise; + } else { + opts = optsOrHandler as TaskQueueOptions; + } + + // onDispatchHandler sniffs the function length to determine which API to present. + // fix the length to prevent api versions from being mismatched. + const fixedLen = (req: Request) => handler(req); + const func: any = onDispatchHandler(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 as options.GlobalOptions + ); + const taskQueueTrigger: Record = {}; + copyIfPresent(taskQueueTrigger, opts, 'retryConfig', 'rateLimits'); + convertIfPresent( + taskQueueTrigger, + opts, + 'invoker', + 'invoker', + convertInvoker + ); + return { + apiVersion: 2, + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + taskQueueTrigger, + }; + }, + }); + + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + // global options calls region a scalar and https allows it to be an array, + // but optionsToManifestEndpoint handles both cases. + const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions); + func.__endpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + taskQueueTrigger: {}, + }; + copyIfPresent(func.__endpoint.taskQueueTrigger, opts, 'retryConfig'); + copyIfPresent(func.__endpoint.taskQueueTrigger, opts, 'rateLimits'); + convertIfPresent( + func.__endpoint.taskQueueTrigger, + opts, + 'invoker', + 'invoker', + convertInvoker + ); + + func.__requiredAPIs = [ + { + api: 'cloudtasks.googleapis.com', + reason: 'Needed for task queue functions', + }, + ]; + + func.run = handler; + return func; +} diff --git a/v1/tasks.js b/v1/tasks.js new file mode 100644 index 000000000..ae33ba821 --- /dev/null +++ b/v1/tasks.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 diff --git a/v2/tasks.js b/v2/tasks.js new file mode 100644 index 000000000..ae33ba821 --- /dev/null +++ b/v2/tasks.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 6c1d0f8cab961a8fe72068dadd80f6ce5990d3fb Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 4 Apr 2022 20:57:43 +0000 Subject: [PATCH 415/705] 3.20.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16140eff4..4c578b4db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firebase-functions", - "version": "3.19.0", + "version": "3.20.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-functions", - "version": "3.19.0", + "version": "3.20.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index ad1c392c7..9a11f45f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.19.0", + "version": "3.20.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 6fac2f0d005d1eb5151de855801f68a536dd2f53 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Mon, 4 Apr 2022 20:57:46 +0000 Subject: [PATCH 416/705] [firebase-release] Removed change log and reset repo after 3.20.0 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ccafa8c9..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Changes internal structure to be more flexible (#1070). From c32db65981b6d8c71a5949d18329717f08693982 Mon Sep 17 00:00:00 2001 From: Pavel Jbanov Date: Wed, 6 Apr 2022 14:45:50 -0400 Subject: [PATCH 417/705] Added eventarc onCustomEventPublished API (#1061) --- package.json | 6 +- spec/v2/providers/eventarc.spec.ts | 162 +++++++++++++++++++++++++++++ src/v2/index.ts | 3 +- src/v2/providers/eventarc.ts | 114 ++++++++++++++++++++ v2/eventarc.js | 26 +++++ 5 files changed, 309 insertions(+), 2 deletions(-) create mode 100644 spec/v2/providers/eventarc.spec.ts create mode 100644 src/v2/providers/eventarc.ts create mode 100644 v2/eventarc.js diff --git a/package.json b/package.json index 9a11f45f1..fefe74b70 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "./v2/alerts": "./lib/v2/providers/alerts/index.js", "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js", "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", - "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js" + "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js", + "./v2/eventarc": "./lib/v2/providers/eventarc.js" }, "typesVersions": { "*": { @@ -124,6 +125,9 @@ "v2/base": [ "lib/v2/base" ], + "v2/eventarc": [ + "lib/v2/providers/eventarc" + ], "v2/options": [ "lib/v2/options" ], diff --git a/spec/v2/providers/eventarc.spec.ts b/spec/v2/providers/eventarc.spec.ts new file mode 100644 index 000000000..e7387bbd0 --- /dev/null +++ b/spec/v2/providers/eventarc.spec.ts @@ -0,0 +1,162 @@ +// 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. + +import { expect } from 'chai'; +import * as options from '../../../src/v2/options'; +import * as eventarc from '../../../src/v2/providers/eventarc'; +import { FULL_OPTIONS } from './fixtures'; + +const ENDPOINT_EVENT_TRIGGER = { + eventType: 'event-type', + retry: false, + eventFilters: {}, +}; + +describe('v2/eventarc', () => { + describe('onCustomEventPublished', () => { + beforeEach(() => { + process.env.GCLOUD_PROJECT = 'aProject'; + }); + + afterEach(() => { + options.setGlobalOptions({}); + delete process.env.GCLOUD_PROJECT; + }); + + it('should create a minimal trigger/endpoint with default channel', () => { + const result = eventarc.onCustomEventPublished('event-type', () => 42); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + channel: 'locations/us-central1/channels/firebase', + }, + }); + }); + + it('should create a minimal trigger/endpoint with opts', () => { + const result = eventarc.onCustomEventPublished( + { eventType: 'event-type', region: 'us-west1' }, + () => 42 + ); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + channel: 'locations/us-central1/channels/firebase', + }, + region: ['us-west1'], + }); + }); + + it('should create a minimal trigger with channel with opts', () => { + const result = eventarc.onCustomEventPublished( + { + eventType: 'event-type', + channel: 'locations/us-west1/channels/my-channel', + filters: { foo: 'bar' }, + }, + () => 42 + ); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + channel: 'locations/us-west1/channels/my-channel', + eventFilters: { + foo: 'bar', + }, + }, + }); + }); + + it('should create a complex trigger/endpoint with appropriate values', () => { + const result = eventarc.onCustomEventPublished( + { + ...FULL_OPTIONS, + eventType: 'event-type', + channel: 'locations/us-west1/channels/my-channel', + }, + () => 42 + ); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + region: ['us-west1'], + availableMemoryMb: 512, + timeoutSeconds: 60, + minInstances: 1, + maxInstances: 3, + concurrency: 20, + vpc: { + connector: 'aConnector', + egressSettings: 'ALL_TRAFFIC', + }, + serviceAccountEmail: 'root@', + ingressSettings: 'ALLOW_ALL', + labels: { + hello: 'world', + }, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + channel: 'locations/us-west1/channels/my-channel', + }, + }); + }); + + it('should merge options and globalOptions', () => { + options.setGlobalOptions({ + concurrency: 20, + region: 'europe-west1', + minInstances: 1, + }); + + const result = eventarc.onCustomEventPublished( + { + eventType: 'event-type', + channel: 'locations/us-west1/channels/my-channel', + region: 'us-west1', + minInstances: 3, + }, + () => 42 + ); + + expect(result.__endpoint).to.deep.equal({ + platform: 'gcfv2', + concurrency: 20, + minInstances: 3, + region: ['us-west1'], + labels: {}, + eventTrigger: { + ...ENDPOINT_EVENT_TRIGGER, + channel: 'locations/us-west1/channels/my-channel', + }, + }); + }); + }); +}); diff --git a/src/v2/index.ts b/src/v2/index.ts index 3f6873810..71189e76f 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -27,8 +27,9 @@ import * as https from './providers/https'; import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; +import * as eventarc from './providers/eventarc'; -export { alerts, https, pubsub, storage, logger, params, tasks }; +export { alerts, https, pubsub, storage, logger, params, tasks, eventarc }; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts new file mode 100644 index 000000000..9c371cef5 --- /dev/null +++ b/src/v2/providers/eventarc.ts @@ -0,0 +1,114 @@ +// 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. + +import * as options from '../options'; +import { CloudEvent, CloudFunction } from '../core'; +import { copyIfPresent, convertIfPresent } from '../../common/encoding'; +import { ManifestEndpoint } from '../../runtime/manifest'; + +/** Options that can be set on an Eventarc trigger. */ +export interface EventarcTriggerOptions extends options.EventHandlerOptions { + /** + * Type of the event. + */ + eventType: string; + + /** + * ID of the channel. Can be either: + * * fully qualified channel resource name: + * `projects/{project}/locations/{location}/channels/{channel-id}` + * * partial resource name with location and channel ID, in which case + * the runtime project ID of the function will be used: + * `locations/{location}/channels/{channel-id}` + * * partial channel ID, in which case the runtime project ID of the + * function and `us-central1` as location will be used: + * `{channel-id}` + * + * If not specified, the default Firebase channel will be used: + * `projects/{project}/locations/us-central1/channels/firebase` + */ + channel?: string; + + /** + * Eventarc event exact match filter. + */ + filters?: Record; +} + +export type CloudEventHandler = (event: CloudEvent) => any | Promise; + +/** Handle an Eventarc event published on the default channel. */ +export function onCustomEventPublished( + eventType: string, + handler: CloudEventHandler +): CloudFunction>; + +export function onCustomEventPublished( + opts: EventarcTriggerOptions, + handler: CloudEventHandler +): CloudFunction>; + +export function onCustomEventPublished( + eventTypeOrOpts: string | EventarcTriggerOptions, + handler: CloudEventHandler +): CloudFunction> { + let opts: EventarcTriggerOptions; + if (typeof eventTypeOrOpts === 'string') { + opts = { + eventType: eventTypeOrOpts as string, + }; + } else if (typeof eventTypeOrOpts === 'object') { + opts = eventTypeOrOpts as EventarcTriggerOptions; + } + const func = (raw: CloudEvent) => { + return handler(raw as CloudEvent); + }; + + func.run = handler; + + const channel = opts.channel ?? 'locations/us-central1/channels/firebase'; + + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + const specificOpts = options.optionsToEndpoint(opts); + + const endpoint: ManifestEndpoint = { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType: opts.eventType, + eventFilters: {}, + retry: false, + channel, + }, + }; + convertIfPresent(endpoint.eventTrigger, opts, 'eventFilters', 'filters'); + copyIfPresent(endpoint.eventTrigger, opts, 'retry'); + + func.__endpoint = endpoint; + + return func; +} diff --git a/v2/eventarc.js b/v2/eventarc.js new file mode 100644 index 000000000..ae33ba821 --- /dev/null +++ b/v2/eventarc.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 60a7a40afdaa2c1994b1a114b727fac8a5604c88 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 12 Apr 2022 14:11:23 -0700 Subject: [PATCH 418/705] Require auth token but skip verification for tasks queue functions. (#1073) Previously, we allowed TQ functions to either: 1) Not have any auth token 2) Have admin SDK verified auth tokens. Since TQ functions are guarded by IAM, we instead implement the following behavior: 1) MUST have auth token 2) We do not verify auth token - instead we just decode it and pass it to the handler --- CHANGELOG.md | 1 + spec/common/providers/tasks.spec.ts | 74 +++++++++++------------------ spec/v1/providers/tasks.spec.ts | 1 + spec/v2/providers/tasks.spec.ts | 10 +--- src/common/providers/tasks.ts | 14 ++++-- 5 files changed, 42 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..69f82438a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Improve authorization for tasks. (#1073) diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts index a29731c5a..b511bcb59 100644 --- a/spec/common/providers/tasks.spec.ts +++ b/spec/common/providers/tasks.spec.ts @@ -21,14 +21,12 @@ // SOFTWARE. import { expect } from 'chai'; -import * as sinon from 'sinon'; import * as firebase from 'firebase-admin'; import { checkAuthContext, runHandler } from '../../helper'; import { generateIdToken, generateUnsignedIdToken, - mockFetchPublicKeys, mockRequest, } from '../../fixtures/mockrequest'; import { @@ -39,7 +37,6 @@ import { import { apps as appsNamespace } from '../../../src/apps'; import * as mocks from '../../fixtures/credential/key.json'; import * as https from '../../../src/common/providers/https'; -import * as debug from '../../../src/common/debug'; /** Represents a test case for a Task Queue Function */ interface TaskTest { @@ -83,6 +80,14 @@ export async function runTaskTest(test: TaskTest): Promise { describe('onEnqueueHandler', () => { let app: firebase.app.App; + function mockEnqueueRequest( + data: unknown, + contentType: string = 'application/json', + context: { authorization: string } = { authorization: 'Bearer abc' } + ): ReturnType { + return mockRequest(data, contentType, context); + } + before(() => { const credential = { getAccessToken: () => { @@ -111,7 +116,7 @@ describe('onEnqueueHandler', () => { it('should handle success', () => { return runTaskTest({ - httpRequest: mockRequest({ foo: 'bar' }), + httpRequest: mockEnqueueRequest({ foo: 'bar' }), expectedData: { foo: 'bar' }, expectedStatus: 204, }); @@ -129,7 +134,7 @@ describe('onEnqueueHandler', () => { it('should ignore charset', () => { return runTaskTest({ - httpRequest: mockRequest(null, 'application/json; charset=utf-8'), + httpRequest: mockEnqueueRequest(null, 'application/json; charset=utf-8'), expectedData: null, expectedStatus: 204, }); @@ -137,14 +142,14 @@ describe('onEnqueueHandler', () => { it('should reject bad content type', () => { return runTaskTest({ - httpRequest: mockRequest(null, 'text/plain'), + httpRequest: mockEnqueueRequest(null, 'text/plain'), expectedData: null, expectedStatus: 400, }); }); it('should reject extra body fields', () => { - const req = mockRequest(null); + const req = mockEnqueueRequest(null); req.body.extra = 'bad'; return runTaskTest({ httpRequest: req, @@ -155,7 +160,7 @@ describe('onEnqueueHandler', () => { it('should handle unhandled error', () => { return runTaskTest({ - httpRequest: mockRequest(null), + httpRequest: mockEnqueueRequest(null), expectedData: null, taskFunction: (data, context) => { throw new Error(`ceci n'est pas une error`); @@ -169,7 +174,7 @@ describe('onEnqueueHandler', () => { it('should handle unknown error status', () => { return runTaskTest({ - httpRequest: mockRequest(null), + httpRequest: mockEnqueueRequest(null), expectedData: null, taskFunction: (data, context) => { throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope'); @@ -183,7 +188,7 @@ describe('onEnqueueHandler', () => { it('should handle well-formed error', () => { return runTaskTest({ - httpRequest: mockRequest(null), + httpRequest: mockEnqueueRequest(null), expectedData: null, taskFunction: (data, context) => { throw new https.HttpsError('not-found', 'i am error'); @@ -196,11 +201,10 @@ describe('onEnqueueHandler', () => { }); it('should handle auth', async () => { - const mock = mockFetchPublicKeys(); const projectId = appsNamespace().admin.options.projectId; const idToken = generateIdToken(projectId); await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { + httpRequest: mockEnqueueRequest(null, 'application/json', { authorization: 'Bearer ' + idToken, }), expectedData: null, @@ -214,49 +218,25 @@ describe('onEnqueueHandler', () => { }, expectedStatus: 204, }); - mock.done(); }); - it('should reject bad auth', async () => { + it('should accept unsigned auth too', async () => { const projectId = appsNamespace().admin.options.projectId; const idToken = generateUnsignedIdToken(projectId); await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { + httpRequest: mockEnqueueRequest(null, 'application/json', { authorization: 'Bearer ' + idToken, }), expectedData: null, - expectedStatus: 401, - }); - }); - - describe('skip token verification debug mode support', () => { - before(() => { - sinon - .stub(debug, 'isDebugFeatureEnabled') - .withArgs('skipTokenVerification') - .returns(true); - }); - - after(() => { - sinon.verifyAndRestore(); - }); - - it('should skip auth token verification', async () => { - const projectId = appsNamespace().admin.options.projectId; - const idToken = generateUnsignedIdToken(projectId); - await runTaskTest({ - httpRequest: mockRequest(null, 'application/json', { - authorization: 'Bearer ' + idToken, - }), - expectedData: null, - taskFunction: (data, context) => { - checkAuthContext(context, projectId, mocks.user_id); - }, - taskFunction2: (request) => { - checkAuthContext(request, projectId, mocks.user_id); - }, - expectedStatus: 204, - }); + taskFunction: (data, context) => { + checkAuthContext(context, projectId, mocks.user_id); + return null; + }, + taskFunction2: (request) => { + checkAuthContext(request, projectId, mocks.user_id); + return null; + }, + expectedStatus: 204, }); }); }); diff --git a/spec/v1/providers/tasks.spec.ts b/spec/v1/providers/tasks.spec.ts index 640ceed68..20f8c8e00 100644 --- a/spec/v1/providers/tasks.spec.ts +++ b/spec/v1/providers/tasks.spec.ts @@ -146,6 +146,7 @@ describe('#onDispatch', () => { }, { 'content-type': 'application/json', + authorization: 'Bearer abc', } ); req.method = 'POST'; diff --git a/spec/v2/providers/tasks.spec.ts b/spec/v2/providers/tasks.spec.ts index 4ef4704db..d6be998a5 100644 --- a/spec/v2/providers/tasks.spec.ts +++ b/spec/v2/providers/tasks.spec.ts @@ -149,16 +149,9 @@ describe('onTaskDispatched', () => { }); it('has a .run method', async () => { - const request: any = { - data: 'data', - auth: { - uid: 'abc', - token: 'token', - }, - }; + const request: any = { data: 'data' }; const cf = onTaskDispatched((r) => { expect(r.data).to.deep.equal(request.data); - expect(r.auth).to.deep.equal(request.auth); }); await cf.run(request); @@ -173,6 +166,7 @@ describe('onTaskDispatched', () => { }, { 'content-type': 'application/json', + authorization: 'Bearer abc', origin: 'example.com', } ); diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts index 57cecd215..9c6ffbc23 100644 --- a/src/common/providers/tasks.ts +++ b/src/common/providers/tasks.ts @@ -110,12 +110,20 @@ export function onDispatchHandler( throw new https.HttpsError('invalid-argument', 'Bad Request'); } - const context: TaskContext = {}; - const status = await https.checkAuthToken(req, context); + const authHeader = req.header('Authorization') || ''; + const token = authHeader.match(/^Bearer (.*)$/)?.[1]; // Note: this should never happen since task queue functions are guarded by IAM. - if (status === 'INVALID') { + if (!token) { throw new https.HttpsError('unauthenticated', 'Unauthenticated'); } + // We skip authenticating the token since tq functions are guarded by IAM. + const authToken = await https.unsafeDecodeIdToken(token); + const context: TaskContext = { + auth: { + uid: authToken.uid, + token: authToken, + }, + }; const data: Req = https.decode(req.body.data); if (handler.length === 2) { From 5f8770f2649cec30f3ea197fed7f3f35b8b790b3 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 13 Apr 2022 11:49:24 -0700 Subject: [PATCH 419/705] Modernize integration test (#1074) Small touchups to the existing integration test: 1) Use `node-fetch` to simplify HTTP calls 2) Group v1 triggers (in prep for running v2 trigger tests) 3) Replace use of `console.log` to `functions.logger.info` 4) Get rid of node10 as test target --- integration_test/functions/src/index.ts | 227 ++++++++---------- integration_test/functions/src/test-utils.ts | 38 --- integration_test/functions/src/testing.ts | 10 +- .../functions/src/{ => v1}/auth-tests.ts | 6 +- .../functions/src/{ => v1}/database-tests.ts | 12 +- .../functions/src/{ => v1}/firestore-tests.ts | 2 +- .../functions/src/{ => v1}/https-tests.ts | 2 +- integration_test/functions/src/v1/index.ts | 8 + .../functions/src/{ => v1}/pubsub-tests.ts | 2 +- .../src/{ => v1}/remoteConfig-tests.ts | 2 +- .../functions/src/{ => v1}/storage-tests.ts | 2 +- .../functions/src/{ => v1}/testLab-tests.ts | 4 +- .../functions/src/{ => v1}/testLab-utils.ts | 54 ++--- integration_test/package.json.template | 3 +- integration_test/run_tests.sh | 13 +- 15 files changed, 159 insertions(+), 226 deletions(-) delete mode 100644 integration_test/functions/src/test-utils.ts rename integration_test/functions/src/{ => v1}/auth-tests.ts (94%) rename integration_test/functions/src/{ => v1}/database-tests.ts (85%) rename integration_test/functions/src/{ => v1}/firestore-tests.ts (95%) rename integration_test/functions/src/{ => v1}/https-tests.ts (88%) create mode 100644 integration_test/functions/src/v1/index.ts rename integration_test/functions/src/{ => v1}/pubsub-tests.ts (97%) rename integration_test/functions/src/{ => v1}/remoteConfig-tests.ts (95%) rename integration_test/functions/src/{ => v1}/storage-tests.ts (94%) rename integration_test/functions/src/{ => v1}/testLab-tests.ts (86%) rename integration_test/functions/src/{ => v1}/testLab-utils.ts (72%) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 6865d7dd5..e51536295 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,41 +1,32 @@ import { PubSub } from '@google-cloud/pubsub'; import { Request, Response } from 'express'; +import fetch from 'node-fetch'; import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; -import * as https from 'https'; -export * from './pubsub-tests'; -export * from './database-tests'; -export * from './auth-tests'; -export * from './firestore-tests'; -export * from './https-tests'; -export * from './remoteConfig-tests'; -export * from './storage-tests'; -export * from './testLab-tests'; -const numTests = Object.keys(exports).length; // Assumption: every exported function is its own test. +import * as v1 from './v1/index'; +const numTests = Object.keys(v1).filter((k) => + ({}.hasOwnProperty.call(v1[k], '__endpoint')) +).length; +export { v1 }; -import * as utils from './test-utils'; -import * as testLab from './testLab-utils'; +import * as testLab from './v1/testLab-utils'; -import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213) -import { config } from 'firebase-functions'; const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); -admin.initializeApp(); const REGION = functions.config().functions.test_region; +admin.initializeApp(); -// TODO(klimt): Get rid of this once the JS client SDK supports callable triggers. -function callHttpsTrigger(name: string, data: any, baseUrl) { - return utils.makeRequest( +function callHttpsTrigger(name: string, data: any) { + return fetch( + `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`, { method: 'POST', - host: REGION + '-' + firebaseConfig.projectId + '.' + baseUrl, - path: '/' + name, headers: { 'Content-Type': 'application/json', }, - }, - JSON.stringify({ data }) + body: JSON.stringify({ data }), + } ); } @@ -43,41 +34,85 @@ async function callScheduleTrigger(functionName: string, region: string) { const accessToken = await admin.credential .applicationDefault() .getAccessToken(); - return new Promise((resolve, reject) => { - const request = https.request( - { - method: 'POST', - host: 'cloudscheduler.googleapis.com', - path: `/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${accessToken.access_token}`, - }, + const response = await fetch( + `https://cloudscheduler.googleapis.com/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${accessToken.access_token}`, }, - (response) => { - if (response.statusCode! / 100 != 2) { - reject( - new Error('Failed request with status ' + response.statusCode!) - ); - return; - } - let body = ''; - response.on('data', (chunk) => { - body += chunk; - }); - response.on('end', () => { - console.log(`Successfully scheduled function ${functionName}`); - resolve(body); - }); - } - ); - request.on('error', (err) => { - console.error('Failed to schedule cloud scheduler job with error', err); - reject(err); - }); - request.write('{}'); - request.end(); - }); + } + ); + if (!response.ok) { + throw new Error(`Failed request with status ${response.status}!`); + } + const data = await response.text(); + functions.logger.log(`Successfully scheduled function ${functionName}`, data); + return; +} + +async function updateRemoteConfig( + testId: string, + accessToken: string +): Promise { + await fetch( + `https://firebaseremoteconfig.googleapis.com/v1/projects/${firebaseConfig.projectId}/remoteConfig`, + { + method: 'PUT', + headers: { + Authorization: `Bearer ${accessToken}`, + 'Content-Type': 'application/json; UTF-8', + 'Accept-Encoding': 'gzip', + 'If-Match': '*', + }, + body: JSON.stringify({ version: { description: testId } }), + } + ); +} + +function v1Tests(testId: string, accessToken: string) { + return [ + // A database write to trigger the Firebase Realtime Database tests. + admin + .database() + .ref(`dbTests/${testId}/start`) + .set({ '.sv': 'timestamp' }), + // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. + new PubSub() + .topic('pubsubTests') + .publish(Buffer.from(JSON.stringify({ testId }))), + // A user creation to trigger the Firebase Auth user creation tests. + admin + .auth() + .createUser({ + email: `${testId}@fake.com`, + password: 'secret', + displayName: `${testId}`, + }) + .then((userRecord) => { + // A user deletion to trigger the Firebase Auth user deletion tests. + admin.auth().deleteUser(userRecord.uid); + }), + // A firestore write to trigger the Cloud Firestore tests. + admin + .firestore() + .collection('tests') + .doc(testId) + .set({ test: testId }), + // Invoke a callable HTTPS trigger. + callHttpsTrigger('v1-callableTests', { foo: 'bar', testId }), + // A Remote Config update to trigger the Remote Config tests. + updateRemoteConfig(testId, accessToken), + // A storage upload to trigger the Storage tests + admin + .storage() + .bucket() + .upload('/tmp/' + testId + '.txt'), + testLab.startTestRun(firebaseConfig.projectId, testId), + // Invoke the schedule for our scheduled function to fire + callScheduleTrigger('v1-schedule', 'us-central1'), + ]; } export const integrationTests: any = functions @@ -86,12 +121,6 @@ export const integrationTests: any = functions timeoutSeconds: 540, }) .https.onRequest(async (req: Request, resp: Response) => { - // We take the base url for our https call (cloudfunctions.net, txckloud.net, etc) from the request - // so that it changes with the environment that the tests are run in - const baseUrl = req.hostname - .split('.') - .slice(1) - .join('.'); const testId = admin .database() .ref() @@ -101,71 +130,15 @@ export const integrationTests: any = functions .ref(`testRuns/${testId}/timestamp`) .set(Date.now()); const testIdRef = admin.database().ref(`testRuns/${testId}`); - console.log('testId is: ', testId); + functions.logger.info('testId is: ', testId); fs.writeFile('/tmp/' + testId + '.txt', 'test', () => {}); try { - await Promise.all([ - // A database write to trigger the Firebase Realtime Database tests. - admin - .database() - .ref(`dbTests/${testId}/start`) - .set({ '.sv': 'timestamp' }), - // A Pub/Sub publish to trigger the Cloud Pub/Sub tests. - new PubSub() - .topic('pubsubTests') - .publish(Buffer.from(JSON.stringify({ testId }))), - // A user creation to trigger the Firebase Auth user creation tests. - admin - .auth() - .createUser({ - email: `${testId}@fake.com`, - password: 'secret', - displayName: `${testId}`, - }) - .then((userRecord) => { - // A user deletion to trigger the Firebase Auth user deletion tests. - admin.auth().deleteUser(userRecord.uid); - }), - // A firestore write to trigger the Cloud Firestore tests. - admin - .firestore() - .collection('tests') - .doc(testId) - .set({ test: testId }), - // Invoke a callable HTTPS trigger. - callHttpsTrigger('callableTests', { foo: 'bar', testId }, baseUrl), - // A Remote Config update to trigger the Remote Config tests. - admin.credential - .applicationDefault() - .getAccessToken() - .then((accessToken) => { - const options = { - hostname: 'firebaseremoteconfig.googleapis.com', - path: `/v1/projects/${firebaseConfig.projectId}/remoteConfig`, - method: 'PUT', - headers: { - Authorization: 'Bearer ' + accessToken.access_token, - 'Content-Type': 'application/json; UTF-8', - 'Accept-Encoding': 'gzip', - 'If-Match': '*', - }, - }; - const request = https.request(options, (resp) => {}); - request.write(JSON.stringify({ version: { description: testId } })); - request.end(); - }), - // A storage upload to trigger the Storage tests - admin - .storage() - .bucket() - .upload('/tmp/' + testId + '.txt'), - testLab.startTestRun(firebaseConfig.projectId, testId), - // Invoke the schedule for our scheduled function to fire - callScheduleTrigger('schedule', 'us-central1'), - ]); - + const accessToken = await admin.credential + .applicationDefault() + .getAccessToken(); + await Promise.all([...v1Tests(testId, accessToken.access_token)]); // On test completion, check that all tests pass and reply "PASS", or provide further details. - console.log('Waiting for all tests to report they pass...'); + functions.logger.info('Waiting for all tests to report they pass...'); await new Promise((resolve, reject) => { setTimeout(() => reject(new Error('Timeout')), 5 * 60 * 1000); let testsExecuted = 0; @@ -179,7 +152,7 @@ export const integrationTests: any = functions ); return; } - console.log( + functions.logger.info( `${snapshot.key} passed (${testsExecuted} of ${numTests})` ); if (testsExecuted < numTests) { @@ -190,10 +163,10 @@ export const integrationTests: any = functions resolve(); }); }); - console.log('All tests pass!'); + functions.logger.info('All tests pass!'); resp.status(200).send('PASS \n'); } catch (err) { - console.log(`Some tests failed: ${err}`); + functions.logger.info(`Some tests failed: ${err}`, err); resp .status(500) .send( diff --git a/integration_test/functions/src/test-utils.ts b/integration_test/functions/src/test-utils.ts deleted file mode 100644 index eda799a67..000000000 --- a/integration_test/functions/src/test-utils.ts +++ /dev/null @@ -1,38 +0,0 @@ -import * as https from 'https'; - -/** - * Makes an http request asynchronously and returns the response data. - * - * This function wraps the callback-based `http.request()` function with a - * Promise. The returned Promise will be rejected in case the request fails with an - * error, or the response code is not in the 200-299 range. - * - * @param options Request options for the request. - * @param body Optional body to send as part of the request. - * @returns Promise returning the response data as string. - */ -export function makeRequest( - options: https.RequestOptions, - body?: string -): Promise { - return new Promise((resolve, reject) => { - const request = https.request(options, (response) => { - let body = ''; - response.on('data', (chunk) => { - body += chunk; - }); - response.on('end', () => { - if (response.statusCode < 200 || response.statusCode > 299) { - reject(body); - return; - } - resolve(body); - }); - }); - if (body) { - request.write(body); - } - request.on('error', reject); - request.end(); - }); -} diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts index 1cb9f7819..1054c7f01 100644 --- a/integration_test/functions/src/testing.ts +++ b/integration_test/functions/src/testing.ts @@ -1,7 +1,7 @@ import * as firebase from 'firebase-admin'; -import { EventContext } from 'firebase-functions'; +import * as functions from 'firebase-functions'; -export type TestCase = (data: T, context?: EventContext) => any; +export type TestCase = (data: T, context?: functions.EventContext) => any; export interface TestCaseMap { [key: string]: TestCase; } @@ -20,7 +20,7 @@ export class TestSuite { return this; } - run(testId: string, data: T, context?: EventContext): Promise { + run(testId: string, data: T, context?: functions.EventContext): Promise { const running: Array> = []; for (const testName in this.tests) { if (!this.tests.hasOwnProperty(testName)) { @@ -30,7 +30,7 @@ export class TestSuite { .then(() => this.tests[testName](data, context)) .then( (result) => { - console.log( + functions.logger.info( `${result ? 'Passed' : 'Failed with successful op'}: ${testName}` ); return { name: testName, passed: !!result }; @@ -47,7 +47,7 @@ export class TestSuite { results.forEach((val) => (sum = sum + val.passed)); const summary = `passed ${sum} of ${running.length}`; const passed = sum === running.length; - console.log(summary); + functions.logger.info(summary); const result = { passed, summary, tests: results }; return firebase .database() diff --git a/integration_test/functions/src/auth-tests.ts b/integration_test/functions/src/v1/auth-tests.ts similarity index 94% rename from integration_test/functions/src/auth-tests.ts rename to integration_test/functions/src/v1/auth-tests.ts index c97c907bc..c82166baf 100644 --- a/integration_test/functions/src/auth-tests.ts +++ b/integration_test/functions/src/v1/auth-tests.ts @@ -1,6 +1,6 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from './testing'; +import { expectEq, TestSuite } from '../testing'; import UserMetadata = admin.auth.UserRecord; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; @@ -10,7 +10,7 @@ export const createUserTests: any = functions .auth.user() .onCreate((u, c) => { const testId: string = u.displayName; - console.log(`testId is ${testId}`); + functions.logger.info(`testId is ${testId}`); return new TestSuite('auth user onCreate') .it('should have a project as resource', (user, context) => @@ -50,7 +50,7 @@ export const deleteUserTests: any = functions .auth.user() .onDelete((u, c) => { const testId: string = u.displayName; - console.log(`testId is ${testId}`); + functions.logger.info(`testId is ${testId}`); return new TestSuite('auth user onDelete') .it('should have a project as resource', (user, context) => diff --git a/integration_test/functions/src/database-tests.ts b/integration_test/functions/src/v1/database-tests.ts similarity index 85% rename from integration_test/functions/src/database-tests.ts rename to integration_test/functions/src/v1/database-tests.ts index 568d26bf4..040c6786c 100644 --- a/integration_test/functions/src/database-tests.ts +++ b/integration_test/functions/src/v1/database-tests.ts @@ -1,6 +1,6 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectEq, expectMatches, TestSuite } from './testing'; +import { expectEq, expectMatches, TestSuite } from '../testing'; import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; @@ -11,7 +11,7 @@ export const databaseTests: any = functions .database.ref('dbTests/{testId}/start') .onWrite((ch, ctx) => { if (ch.after.val() === null) { - console.log( + functions.logger.info( 'Event for ' + ctx.params[testIdFieldName] + ' is null; presuming data cleanup, so skipping.' @@ -40,7 +40,7 @@ export const databaseTests: any = functions return expectMatches( url, new RegExp( - `^https://${process.env.GCLOUD_PROJECT}.firebaseio.com/dbTests` + `^https://${process.env.GCLOUD_PROJECT}(-default-rtdb)*.firebaseio.com/dbTests` ) ); }) @@ -50,9 +50,11 @@ export const databaseTests: any = functions }) .it('should have refs resources', (change, context) => - expectEq( + expectMatches( context.resource.name, - `projects/_/instances/${process.env.GCLOUD_PROJECT}/refs/dbTests/${context.params.testId}/start` + new RegExp( + `^projects/_/instances/${process.env.GCLOUD_PROJECT}(-default-rtdb)*/refs/dbTests/${context.params.testId}/start$` + ) ) ) diff --git a/integration_test/functions/src/firestore-tests.ts b/integration_test/functions/src/v1/firestore-tests.ts similarity index 95% rename from integration_test/functions/src/firestore-tests.ts rename to integration_test/functions/src/v1/firestore-tests.ts index 97daadea5..9916e2d3c 100644 --- a/integration_test/functions/src/firestore-tests.ts +++ b/integration_test/functions/src/v1/firestore-tests.ts @@ -1,6 +1,6 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectDeepEq, expectEq, TestSuite } from './testing'; +import { expectDeepEq, expectEq, TestSuite } from '../testing'; import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; diff --git a/integration_test/functions/src/https-tests.ts b/integration_test/functions/src/v1/https-tests.ts similarity index 88% rename from integration_test/functions/src/https-tests.ts rename to integration_test/functions/src/v1/https-tests.ts index 18972bd47..103228d7d 100644 --- a/integration_test/functions/src/https-tests.ts +++ b/integration_test/functions/src/v1/https-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from './testing'; +import { expectEq, TestSuite } from '../testing'; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; diff --git a/integration_test/functions/src/v1/index.ts b/integration_test/functions/src/v1/index.ts new file mode 100644 index 000000000..6e6717b15 --- /dev/null +++ b/integration_test/functions/src/v1/index.ts @@ -0,0 +1,8 @@ +export * from './pubsub-tests'; +export * from './database-tests'; +export * from './auth-tests'; +export * from './firestore-tests'; +export * from './https-tests'; +export * from './remoteConfig-tests'; +export * from './storage-tests'; +export * from './testLab-tests'; diff --git a/integration_test/functions/src/pubsub-tests.ts b/integration_test/functions/src/v1/pubsub-tests.ts similarity index 97% rename from integration_test/functions/src/pubsub-tests.ts rename to integration_test/functions/src/v1/pubsub-tests.ts index a21c2011a..79f5889c6 100644 --- a/integration_test/functions/src/pubsub-tests.ts +++ b/integration_test/functions/src/v1/pubsub-tests.ts @@ -1,6 +1,6 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { evaluate, expectEq, success, TestSuite } from './testing'; +import { evaluate, expectEq, success, TestSuite } from '../testing'; import PubsubMessage = functions.pubsub.Message; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; diff --git a/integration_test/functions/src/remoteConfig-tests.ts b/integration_test/functions/src/v1/remoteConfig-tests.ts similarity index 95% rename from integration_test/functions/src/remoteConfig-tests.ts rename to integration_test/functions/src/v1/remoteConfig-tests.ts index 3f2cc8993..a9dbd10d7 100644 --- a/integration_test/functions/src/remoteConfig-tests.ts +++ b/integration_test/functions/src/v1/remoteConfig-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from './testing'; +import { expectEq, TestSuite } from '../testing'; import TemplateVersion = functions.remoteConfig.TemplateVersion; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; diff --git a/integration_test/functions/src/storage-tests.ts b/integration_test/functions/src/v1/storage-tests.ts similarity index 94% rename from integration_test/functions/src/storage-tests.ts rename to integration_test/functions/src/v1/storage-tests.ts index df3032f78..4259c5a00 100644 --- a/integration_test/functions/src/storage-tests.ts +++ b/integration_test/functions/src/v1/storage-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from './testing'; +import { expectEq, TestSuite } from '../testing'; import ObjectMetadata = functions.storage.ObjectMetadata; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; diff --git a/integration_test/functions/src/testLab-tests.ts b/integration_test/functions/src/v1/testLab-tests.ts similarity index 86% rename from integration_test/functions/src/testLab-tests.ts rename to integration_test/functions/src/v1/testLab-tests.ts index 8e064928a..805b988c8 100644 --- a/integration_test/functions/src/testLab-tests.ts +++ b/integration_test/functions/src/v1/testLab-tests.ts @@ -1,5 +1,5 @@ import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from './testing'; +import { expectEq, TestSuite } from '../testing'; import TestMatrix = functions.testLab.TestMatrix; const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; @@ -13,8 +13,6 @@ export const testLabTests: any = functions return new TestSuite('test matrix complete') .it('should have eventId', (snap, context) => context.eventId) - .it('should have timestamp', (snap, context) => context.timestamp) - .it('should have right eventType', (_, context) => expectEq(context.eventType, 'google.testing.testMatrix.complete') ) diff --git a/integration_test/functions/src/testLab-utils.ts b/integration_test/functions/src/v1/testLab-utils.ts similarity index 72% rename from integration_test/functions/src/testLab-utils.ts rename to integration_test/functions/src/v1/testLab-utils.ts index 3dbb7b763..8f0424d98 100644 --- a/integration_test/functions/src/testLab-utils.ts +++ b/integration_test/functions/src/v1/testLab-utils.ts @@ -1,7 +1,5 @@ +import fetch from 'node-fetch'; import * as admin from 'firebase-admin'; -import * as http from 'http'; -import * as https from 'https'; -import * as utils from './test-utils'; interface AndroidDevice { androidModelId: string; @@ -30,10 +28,16 @@ export async function startTestRun(projectId: string, testId: string) { async function fetchDefaultDevice( accessToken: admin.GoogleOAuthAccessToken ): Promise { - const response = await utils.makeRequest( - requestOptions(accessToken, 'GET', '/v1/testEnvironmentCatalog/ANDROID') + const response = await fetch( + `https://${TESTING_API_SERVICE_NAME}/v1/testEnvironmentCatalog/ANDROID`, + { + headers: { + Authorization: 'Bearer ' + accessToken.access_token, + 'Content-Type': 'application/json', + }, + } ); - const data = JSON.parse(response); + const data = await response.json(); const models = data?.androidDeviceCatalog?.models || []; const defaultModels = models.filter( (m) => @@ -58,17 +62,12 @@ async function fetchDefaultDevice( } as AndroidDevice; } -function createTestMatrix( +async function createTestMatrix( accessToken: admin.GoogleOAuthAccessToken, projectId: string, testId: string, device: AndroidDevice -): Promise { - const options = requestOptions( - accessToken, - 'POST', - '/v1/projects/' + projectId + '/testMatrices' - ); +): Promise { const body = { projectId, testSpecification: { @@ -96,21 +95,16 @@ function createTestMatrix( }, }, }; - return utils.makeRequest(options, JSON.stringify(body)); -} - -function requestOptions( - accessToken: admin.GoogleOAuthAccessToken, - method: string, - path: string -): https.RequestOptions { - return { - method, - hostname: TESTING_API_SERVICE_NAME, - path, - headers: { - Authorization: 'Bearer ' + accessToken.access_token, - 'Content-Type': 'application/json', - }, - }; + await fetch( + `https://${TESTING_API_SERVICE_NAME}/v1/projects/${projectId}/testMatrices`, + { + method: 'POST', + headers: { + Authorization: 'Bearer ' + accessToken.access_token, + 'Content-Type': 'application/json', + }, + body: JSON.stringify(body), + } + ); + return; } diff --git a/integration_test/package.json.template b/integration_test/package.json.template index a5259aeb6..07585cbe2 100644 --- a/integration_test/package.json.template +++ b/integration_test/package.json.template @@ -8,10 +8,11 @@ "@google-cloud/pubsub": "^2.10.0", "firebase-admin": "__FIREBASE_ADMIN__", "firebase-functions": "__SDK_TARBALL__", - "lodash": "~4.17.2" + "node-fetch": "^2.6.7" }, "main": "lib/index.js", "devDependencies": { + "@types/node-fetch": "^2.6.1", "typescript": "~4.2.2" }, "engines": { diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 498a9b0a0..b78150cc2 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -85,9 +85,9 @@ function delete_all_functions { # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. if [[ "${TOKEN}" == "" ]]; then - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests testLabTests --force --project=$PROJECT_ID || : & + firebase functions:delete integrationTests v1 --force --project=$PROJECT_ID || : & else - firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests remoteConfigTests testLabTests --force --project=$PROJECT_ID --token=$TOKEN || : & + firebase functions:delete integrationTests v1 --force --project=$PROJECT_ID --token=$TOKEN || : & fi wait announce "Project emptied." @@ -139,13 +139,8 @@ build_sdk delete_all_functions set_region -for version in 10 12 14 16; do - if [[ "$version" -eq 10 ]]; then - admin_sdk="^9.12.0" - else - admin_sdk="^10.0.0" - fi - create_package_json $TIMESTAMP $version $admin_sdk +for version in 12 14 16; do + create_package_json $TIMESTAMP $version "^10.0.0" install_deps announce "Re-deploying the same functions to Node $version runtime ..." deploy From b8f161450a85818962c6357cdd20e123904ed808 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 13 Apr 2022 13:31:45 -0700 Subject: [PATCH 420/705] Setup v2 triggers for integration tests (#1075) Also remove region setting option of the test since it's not possible to dynamically set region using function config when parsing triggers via container contract. Just adding a single v2 trigger def for now - with the structure introduced here, it should be easy to add more triggers in the near future. --- integration_test/functions/src/index.ts | 95 +++++++++++++++---- integration_test/functions/src/region.ts | 2 + .../functions/src/v1/auth-tests.ts | 3 +- .../functions/src/v1/database-tests.ts | 2 +- .../functions/src/v1/firestore-tests.ts | 2 +- .../functions/src/v1/https-tests.ts | 3 +- .../functions/src/v1/pubsub-tests.ts | 3 +- .../functions/src/v1/remoteConfig-tests.ts | 3 +- .../functions/src/v1/storage-tests.ts | 3 +- .../functions/src/v1/testLab-tests.ts | 2 +- .../functions/src/v1/testLab-utils.ts | 32 ++++--- .../functions/src/v2/https-tests.ts | 10 ++ integration_test/functions/src/v2/index.ts | 5 + integration_test/run_tests.sh | 29 +----- 14 files changed, 122 insertions(+), 72 deletions(-) create mode 100644 integration_test/functions/src/region.ts create mode 100644 integration_test/functions/src/v2/https-tests.ts create mode 100644 integration_test/functions/src/v2/index.ts diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index e51536295..184b5683d 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -5,20 +5,24 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; -import * as v1 from './v1/index'; -const numTests = Object.keys(v1).filter((k) => - ({}.hasOwnProperty.call(v1[k], '__endpoint')) -).length; -export { v1 }; +import * as v1 from './v1'; +import * as v2 from './v2'; +const getNumTests = (m: object): number => { + return Object.keys(m).filter((k) => + ({}.hasOwnProperty.call(m[k], '__endpoint')) + ).length; +}; +const numTests = getNumTests(v1) + getNumTests(v2); +export { v1, v2 }; import * as testLab from './v1/testLab-utils'; +import { REGION } from './region'; const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); -const REGION = functions.config().functions.test_region; admin.initializeApp(); -function callHttpsTrigger(name: string, data: any) { - return fetch( +async function callHttpsTrigger(name: string, data: any) { + const resp = await fetch( `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`, { method: 'POST', @@ -28,19 +32,56 @@ function callHttpsTrigger(name: string, data: any) { body: JSON.stringify({ data }), } ); + if (!resp.ok) { + throw Error(resp.statusText); + } +} + +async function callV2HttpsTrigger( + name: string, + data: any, + accessToken: string +) { + let resp = await fetch( + `https://cloudfunctions.googleapis.com/v2beta/projects/${firebaseConfig.projectId}/locations/${REGION}/functions/${name}`, + { + headers: { + Authorization: `Bearer ${accessToken}`, + }, + } + ); + if (!resp.ok) { + throw new Error(resp.statusText); + } + const fn = await resp.json(); + const uri = fn.serviceConfig?.uri; + if (!uri) { + throw new Error(`Cannot call v2 https trigger ${name} - no uri found`); + } + resp = await fetch(uri, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ data }), + }); + if (!resp.ok) { + throw new Error(resp.statusText); + } } -async function callScheduleTrigger(functionName: string, region: string) { - const accessToken = await admin.credential - .applicationDefault() - .getAccessToken(); +async function callScheduleTrigger( + functionName: string, + region: string, + accessToken: string +) { const response = await fetch( `https://cloudscheduler.googleapis.com/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, { method: 'POST', headers: { 'Content-Type': 'application/json', - Authorization: `Bearer ${accessToken.access_token}`, + Authorization: `Bearer ${accessToken}`, }, } ); @@ -56,7 +97,7 @@ async function updateRemoteConfig( testId: string, accessToken: string ): Promise { - await fetch( + const resp = await fetch( `https://firebaseremoteconfig.googleapis.com/v1/projects/${firebaseConfig.projectId}/remoteConfig`, { method: 'PUT', @@ -69,9 +110,12 @@ async function updateRemoteConfig( body: JSON.stringify({ version: { description: testId } }), } ); + if (!resp.ok) { + throw new Error(resp.statusText); + } } -function v1Tests(testId: string, accessToken: string) { +function v1Tests(testId: string, accessToken: string): Promise[] { return [ // A database write to trigger the Firebase Realtime Database tests. admin @@ -109,9 +153,16 @@ function v1Tests(testId: string, accessToken: string) { .storage() .bucket() .upload('/tmp/' + testId + '.txt'), - testLab.startTestRun(firebaseConfig.projectId, testId), + testLab.startTestRun(firebaseConfig.projectId, testId, accessToken), // Invoke the schedule for our scheduled function to fire - callScheduleTrigger('v1-schedule', 'us-central1'), + callScheduleTrigger('v1-schedule', 'us-central1', accessToken), + ]; +} + +function v2Tests(testId: string, accessToken: string): Promise[] { + return [ + // Invoke a callable HTTPS trigger. + callV2HttpsTrigger('v2-callabletests', { foo: 'bar', testId }, accessToken), ]; } @@ -136,15 +187,21 @@ export const integrationTests: any = functions const accessToken = await admin.credential .applicationDefault() .getAccessToken(); - await Promise.all([...v1Tests(testId, accessToken.access_token)]); + await Promise.all([ + ...v1Tests(testId, accessToken.access_token), + ...v2Tests(testId, accessToken.access_token), + ]); // On test completion, check that all tests pass and reply "PASS", or provide further details. functions.logger.info('Waiting for all tests to report they pass...'); await new Promise((resolve, reject) => { setTimeout(() => reject(new Error('Timeout')), 5 * 60 * 1000); let testsExecuted = 0; testIdRef.on('child_added', (snapshot) => { + if (snapshot.key === 'timestamp') { + return; + } testsExecuted += 1; - if (snapshot.key != 'timestamp' && !snapshot.val().passed) { + if (!snapshot.val().passed) { reject( new Error( `test ${snapshot.key} failed; see database for details.` diff --git a/integration_test/functions/src/region.ts b/integration_test/functions/src/region.ts new file mode 100644 index 000000000..4252a4672 --- /dev/null +++ b/integration_test/functions/src/region.ts @@ -0,0 +1,2 @@ +// TODO: Add back support for selecting region for integration test once params is ready. +export const REGION = 'us-central1'; diff --git a/integration_test/functions/src/v1/auth-tests.ts b/integration_test/functions/src/v1/auth-tests.ts index c82166baf..2a8113c84 100644 --- a/integration_test/functions/src/v1/auth-tests.ts +++ b/integration_test/functions/src/v1/auth-tests.ts @@ -1,10 +1,9 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import { expectEq, TestSuite } from '../testing'; +import { REGION } from '../region'; import UserMetadata = admin.auth.UserRecord; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - export const createUserTests: any = functions .region(REGION) .auth.user() diff --git a/integration_test/functions/src/v1/database-tests.ts b/integration_test/functions/src/v1/database-tests.ts index 040c6786c..891c4ec70 100644 --- a/integration_test/functions/src/v1/database-tests.ts +++ b/integration_test/functions/src/v1/database-tests.ts @@ -1,10 +1,10 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import { expectEq, expectMatches, TestSuite } from '../testing'; +import { REGION } from '../region'; import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const databaseTests: any = functions .region(REGION) diff --git a/integration_test/functions/src/v1/firestore-tests.ts b/integration_test/functions/src/v1/firestore-tests.ts index 9916e2d3c..ebd5ccaa8 100644 --- a/integration_test/functions/src/v1/firestore-tests.ts +++ b/integration_test/functions/src/v1/firestore-tests.ts @@ -1,10 +1,10 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import { expectDeepEq, expectEq, TestSuite } from '../testing'; +import { REGION } from '../region'; import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const firestoreTests: any = functions .runWith({ diff --git a/integration_test/functions/src/v1/https-tests.ts b/integration_test/functions/src/v1/https-tests.ts index 103228d7d..8acf8932f 100644 --- a/integration_test/functions/src/v1/https-tests.ts +++ b/integration_test/functions/src/v1/https-tests.ts @@ -1,8 +1,7 @@ import * as functions from 'firebase-functions'; +import { REGION } from '../region'; import { expectEq, TestSuite } from '../testing'; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - export const callableTests: any = functions.region(REGION).https.onCall((d) => { return new TestSuite('https onCall') .it('should have the correct data', (data: any) => diff --git a/integration_test/functions/src/v1/pubsub-tests.ts b/integration_test/functions/src/v1/pubsub-tests.ts index 79f5889c6..515708e07 100644 --- a/integration_test/functions/src/v1/pubsub-tests.ts +++ b/integration_test/functions/src/v1/pubsub-tests.ts @@ -1,10 +1,9 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; +import { REGION } from '../region'; import { evaluate, expectEq, success, TestSuite } from '../testing'; import PubsubMessage = functions.pubsub.Message; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - // TODO(inlined) use multiple queues to run inline. // Expected message data: {"hello": "world"} export const pubsubTests: any = functions diff --git a/integration_test/functions/src/v1/remoteConfig-tests.ts b/integration_test/functions/src/v1/remoteConfig-tests.ts index a9dbd10d7..47e70461b 100644 --- a/integration_test/functions/src/v1/remoteConfig-tests.ts +++ b/integration_test/functions/src/v1/remoteConfig-tests.ts @@ -1,9 +1,8 @@ import * as functions from 'firebase-functions'; +import { REGION } from '../region'; import { expectEq, TestSuite } from '../testing'; import TemplateVersion = functions.remoteConfig.TemplateVersion; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - export const remoteConfigTests: any = functions .region(REGION) .remoteConfig.onUpdate((v, c) => { diff --git a/integration_test/functions/src/v1/storage-tests.ts b/integration_test/functions/src/v1/storage-tests.ts index 4259c5a00..51b947293 100644 --- a/integration_test/functions/src/v1/storage-tests.ts +++ b/integration_test/functions/src/v1/storage-tests.ts @@ -1,9 +1,8 @@ import * as functions from 'firebase-functions'; +import { REGION } from '../region'; import { expectEq, TestSuite } from '../testing'; import ObjectMetadata = functions.storage.ObjectMetadata; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; - export const storageTests: any = functions .runWith({ timeoutSeconds: 540, diff --git a/integration_test/functions/src/v1/testLab-tests.ts b/integration_test/functions/src/v1/testLab-tests.ts index 805b988c8..8e1986ce0 100644 --- a/integration_test/functions/src/v1/testLab-tests.ts +++ b/integration_test/functions/src/v1/testLab-tests.ts @@ -1,7 +1,7 @@ import * as functions from 'firebase-functions'; +import { REGION } from '../region'; import { expectEq, TestSuite } from '../testing'; import TestMatrix = functions.testLab.TestMatrix; -const REGION = process.env.FIREBASE_FUNCTIONS_TEST_REGION || 'us-central1'; export const testLabTests: any = functions .runWith({ diff --git a/integration_test/functions/src/v1/testLab-utils.ts b/integration_test/functions/src/v1/testLab-utils.ts index 8f0424d98..bd739a708 100644 --- a/integration_test/functions/src/v1/testLab-utils.ts +++ b/integration_test/functions/src/v1/testLab-utils.ts @@ -16,28 +16,31 @@ const TESTING_API_SERVICE_NAME = 'testing.googleapis.com'; * * @param projectId Project for which the test run will be created * @param testId Test id which will be encoded in client info details + * @param accessToken accessToken to attach to requested for authentication */ -export async function startTestRun(projectId: string, testId: string) { - const accessToken = await admin.credential - .applicationDefault() - .getAccessToken(); +export async function startTestRun( + projectId: string, + testId: string, + accessToken: string +) { const device = await fetchDefaultDevice(accessToken); return await createTestMatrix(accessToken, projectId, testId, device); } -async function fetchDefaultDevice( - accessToken: admin.GoogleOAuthAccessToken -): Promise { - const response = await fetch( +async function fetchDefaultDevice(accessToken: string): Promise { + const resp = await fetch( `https://${TESTING_API_SERVICE_NAME}/v1/testEnvironmentCatalog/ANDROID`, { headers: { - Authorization: 'Bearer ' + accessToken.access_token, + Authorization: 'Bearer ' + accessToken, 'Content-Type': 'application/json', }, } ); - const data = await response.json(); + if (!resp.ok) { + throw new Error(resp.statusText); + } + const data = await resp.json(); const models = data?.androidDeviceCatalog?.models || []; const defaultModels = models.filter( (m) => @@ -63,7 +66,7 @@ async function fetchDefaultDevice( } async function createTestMatrix( - accessToken: admin.GoogleOAuthAccessToken, + accessToken: string, projectId: string, testId: string, device: AndroidDevice @@ -95,16 +98,19 @@ async function createTestMatrix( }, }, }; - await fetch( + const resp = await fetch( `https://${TESTING_API_SERVICE_NAME}/v1/projects/${projectId}/testMatrices`, { method: 'POST', headers: { - Authorization: 'Bearer ' + accessToken.access_token, + Authorization: 'Bearer ' + accessToken, 'Content-Type': 'application/json', }, body: JSON.stringify(body), } ); + if (!resp.ok) { + throw new Error(resp.statusText); + } return; } diff --git a/integration_test/functions/src/v2/https-tests.ts b/integration_test/functions/src/v2/https-tests.ts new file mode 100644 index 000000000..4936c48ea --- /dev/null +++ b/integration_test/functions/src/v2/https-tests.ts @@ -0,0 +1,10 @@ +import { onCall } from 'firebase-functions/v2/https'; +import { expectEq, TestSuite } from '../testing'; + +export const callabletests = onCall((req) => { + return new TestSuite('v2 https onCall') + .it('should have the correct data', (data: any) => + expectEq(data?.foo, 'bar') + ) + .run(req.data.testId, req.data); +}); diff --git a/integration_test/functions/src/v2/index.ts b/integration_test/functions/src/v2/index.ts new file mode 100644 index 000000000..089064d9e --- /dev/null +++ b/integration_test/functions/src/v2/index.ts @@ -0,0 +1,5 @@ +import { REGION } from '../region'; +import { setGlobalOptions } from 'firebase-functions/v2'; +setGlobalOptions({ region: REGION }); + +export * from './https-tests'; diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index b78150cc2..6ae86f25f 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -38,26 +38,6 @@ function build_sdk { mv firebase-functions-*.tgz "integration_test/functions/firebase-functions-${TIMESTAMP}.tgz" } -function set_region { - if [[ "${FIREBASE_FUNCTIONS_TEST_REGION}" == "" ]]; then - FIREBASE_FUNCTIONS_TEST_REGION="us-central1" - fi - if [[ "${TOKEN}" == "" ]]; then - firebase functions:config:set functions.test_region=$FIREBASE_FUNCTIONS_TEST_REGION --project=$PROJECT_ID - else - firebase functions:config:set functions.test_region=$FIREBASE_FUNCTIONS_TEST_REGION --project=$PROJECT_ID --token=$TOKEN - fi - announce "Set region to ${FIREBASE_FUNCTIONS_TEST_REGION}" -} - -function unset_region { - if [[ "${TOKEN}" == "" ]]; then - firebase functions:config:unset functions.test_region --project=$PROJECT_ID - else - firebase functions:config:unset functions.test_region --project=$PROJECT_ID --token=$TOKEN - fi -} - # Creates a Package.json from package.json.template # @param timestmap of the current SDK build # @param Node version to test under @@ -85,9 +65,9 @@ function delete_all_functions { # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. if [[ "${TOKEN}" == "" ]]; then - firebase functions:delete integrationTests v1 --force --project=$PROJECT_ID || : & + firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID || : & else - firebase functions:delete integrationTests v1 --force --project=$PROJECT_ID --token=$TOKEN || : & + firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID --token=$TOKEN || : & fi wait announce "Project emptied." @@ -111,9 +91,6 @@ function run_tests { # causing this script to start failing, but currently we don't have a very # reliable way of determining the URL dynamically. TEST_DOMAIN="cloudfunctions.net" - if [[ "${FIREBASE_FUNCTIONS_URL}" == "https://preprod-cloudfunctions.sandbox.googleapis.com" ]]; then - TEST_DOMAIN="txcloud.net" - fi if [[ "${FIREBASE_FUNCTIONS_TEST_REGION}" == "" ]]; then FIREBASE_FUNCTIONS_TEST_REGION="us-central1" fi @@ -126,7 +103,6 @@ function run_tests { function cleanup { announce "Performing cleanup..." delete_all_functions - unset_region rm "${DIR}/functions/firebase-functions-${TIMESTAMP}.tgz" rm "${DIR}/functions/package.json" rm -f "${DIR}/functions/firebase-debug.log" @@ -137,7 +113,6 @@ function cleanup { # Setup build_sdk delete_all_functions -set_region for version in 12 14 16; do create_package_json $TIMESTAMP $version "^10.0.0" From 9a5b23f855f96cfd69e37480b63636cfbe3e39f9 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 14 Apr 2022 17:56:52 +0000 Subject: [PATCH 421/705] 3.20.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c578b4db..f1d1eeff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firebase-functions", - "version": "3.20.0", + "version": "3.20.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-functions", - "version": "3.20.0", + "version": "3.20.1", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index fefe74b70..dc47fb24e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.20.0", + "version": "3.20.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 19d7d6e2044d0c8138cc338be834adb1932e408f Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 14 Apr 2022 17:56:54 +0000 Subject: [PATCH 422/705] [firebase-release] Removed change log and reset repo after 3.20.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69f82438a..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Improve authorization for tasks. (#1073) From 78dae73c955e7307c6de43b72d3dc834bfc833a0 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Fri, 15 Apr 2022 10:21:17 -0700 Subject: [PATCH 423/705] Add CPU option. Rip out deprecated apiVersion (#1077) * Add CPU option. Rip out deprecated apiVersion * Formatter * PR feedback --- integration_test/functions/src/index.ts | 8 ++--- .../functions/src/v1/auth-tests.ts | 2 +- .../functions/src/v1/database-tests.ts | 2 +- .../functions/src/v1/firestore-tests.ts | 2 +- .../functions/src/v1/testLab-utils.ts | 2 +- integration_test/functions/src/v2/index.ts | 2 +- scripts/bin-test/test.ts | 14 ++++---- spec/common/providers/https.spec.ts | 18 +++++----- spec/common/providers/identity.spec.ts | 12 +++---- spec/common/providers/tasks.spec.ts | 18 +++++----- spec/helper.ts | 2 +- spec/runtime/loader.spec.ts | 8 ++--- spec/v2/providers/eventarc.spec.ts | 19 ++--------- spec/v2/providers/fixtures.ts | 3 +- spec/v2/providers/https.spec.ts | 6 +--- spec/v2/providers/pubsub.spec.ts | 3 -- spec/v2/providers/storage.spec.ts | 34 ++----------------- spec/v2/providers/tasks.spec.ts | 4 +-- src/common/providers/identity.ts | 28 +++++++-------- src/providers/auth.ts | 12 +++---- src/providers/tasks.ts | 8 ++--- src/runtime/loader.ts | 18 +++++----- src/runtime/manifest.ts | 1 + src/v2/index.ts | 2 +- src/v2/options.ts | 19 +++++++++-- src/v2/providers/alerts/appDistribution.ts | 2 +- src/v2/providers/alerts/billing.ts | 2 +- src/v2/providers/alerts/crashlytics.ts | 2 +- src/v2/providers/eventarc.ts | 6 ++-- src/v2/providers/https.ts | 8 +---- src/v2/providers/pubsub.ts | 7 ++-- src/v2/providers/storage.ts | 6 ++-- src/v2/providers/tasks.ts | 7 ++-- 33 files changed, 120 insertions(+), 167 deletions(-) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 184b5683d..57654c8d1 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,9 +1,9 @@ import { PubSub } from '@google-cloud/pubsub'; import { Request, Response } from 'express'; -import fetch from 'node-fetch'; import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; +import fetch from 'node-fetch'; import * as v1 from './v1'; import * as v2 from './v2'; @@ -15,8 +15,8 @@ const getNumTests = (m: object): number => { const numTests = getNumTests(v1) + getNumTests(v2); export { v1, v2 }; -import * as testLab from './v1/testLab-utils'; import { REGION } from './region'; +import * as testLab from './v1/testLab-utils'; const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); admin.initializeApp(); @@ -115,7 +115,7 @@ async function updateRemoteConfig( } } -function v1Tests(testId: string, accessToken: string): Promise[] { +function v1Tests(testId: string, accessToken: string): Array> { return [ // A database write to trigger the Firebase Realtime Database tests. admin @@ -159,7 +159,7 @@ function v1Tests(testId: string, accessToken: string): Promise[] { ]; } -function v2Tests(testId: string, accessToken: string): Promise[] { +function v2Tests(testId: string, accessToken: string): Array> { return [ // Invoke a callable HTTPS trigger. callV2HttpsTrigger('v2-callabletests', { foo: 'bar', testId }, accessToken), diff --git a/integration_test/functions/src/v1/auth-tests.ts b/integration_test/functions/src/v1/auth-tests.ts index 2a8113c84..e6daf5162 100644 --- a/integration_test/functions/src/v1/auth-tests.ts +++ b/integration_test/functions/src/v1/auth-tests.ts @@ -1,7 +1,7 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectEq, TestSuite } from '../testing'; import { REGION } from '../region'; +import { expectEq, TestSuite } from '../testing'; import UserMetadata = admin.auth.UserRecord; export const createUserTests: any = functions diff --git a/integration_test/functions/src/v1/database-tests.ts b/integration_test/functions/src/v1/database-tests.ts index 891c4ec70..fe3e29f17 100644 --- a/integration_test/functions/src/v1/database-tests.ts +++ b/integration_test/functions/src/v1/database-tests.ts @@ -1,7 +1,7 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectEq, expectMatches, TestSuite } from '../testing'; import { REGION } from '../region'; +import { expectEq, expectMatches, TestSuite } from '../testing'; import DataSnapshot = admin.database.DataSnapshot; const testIdFieldName = 'testId'; diff --git a/integration_test/functions/src/v1/firestore-tests.ts b/integration_test/functions/src/v1/firestore-tests.ts index ebd5ccaa8..51a93d021 100644 --- a/integration_test/functions/src/v1/firestore-tests.ts +++ b/integration_test/functions/src/v1/firestore-tests.ts @@ -1,7 +1,7 @@ import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; -import { expectDeepEq, expectEq, TestSuite } from '../testing'; import { REGION } from '../region'; +import { expectDeepEq, expectEq, TestSuite } from '../testing'; import DocumentSnapshot = admin.firestore.DocumentSnapshot; const testIdFieldName = 'documentId'; diff --git a/integration_test/functions/src/v1/testLab-utils.ts b/integration_test/functions/src/v1/testLab-utils.ts index bd739a708..870c9b8ec 100644 --- a/integration_test/functions/src/v1/testLab-utils.ts +++ b/integration_test/functions/src/v1/testLab-utils.ts @@ -1,5 +1,5 @@ -import fetch from 'node-fetch'; import * as admin from 'firebase-admin'; +import fetch from 'node-fetch'; interface AndroidDevice { androidModelId: string; diff --git a/integration_test/functions/src/v2/index.ts b/integration_test/functions/src/v2/index.ts index 089064d9e..def01bfbb 100644 --- a/integration_test/functions/src/v2/index.ts +++ b/integration_test/functions/src/v2/index.ts @@ -1,5 +1,5 @@ -import { REGION } from '../region'; import { setGlobalOptions } from 'firebase-functions/v2'; +import { REGION } from '../region'; setGlobalOptions({ region: REGION }); export * from './https-tests'; diff --git a/scripts/bin-test/test.ts b/scripts/bin-test/test.ts index 0ce2f6518..154c2295c 100644 --- a/scripts/bin-test/test.ts +++ b/scripts/bin-test/test.ts @@ -1,12 +1,12 @@ -import * as path from 'path'; import * as subprocess from 'child_process'; +import * as path from 'path'; import { promisify } from 'util'; +import { expect } from 'chai'; +import * as yaml from 'js-yaml'; import fetch from 'node-fetch'; import * as portfinder from 'portfinder'; -import * as yaml from 'js-yaml'; import * as semver from 'semver'; -import { expect } from 'chai'; const TIMEOUT_XL = 20_000; const TIMEOUT_L = 10_000; @@ -43,11 +43,11 @@ const BASE_STACK = { specVersion: 'v1alpha1', }; -type Testcase = { +interface Testcase { name: string; modulePath: string; expected: Record; -}; +} async function retryUntil( fn: () => Promise, @@ -66,7 +66,9 @@ async function retryUntil( }); const retry = (async () => { while (true) { - if (await fn()) break; + if (await fn()) { + break; + } await sleep(); } })(); diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index d1f8703bd..8916a371a 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -3,12 +3,9 @@ import * as firebase from 'firebase-admin'; import * as sinon from 'sinon'; import { apps as appsNamespace } from '../../../src/apps'; -import { - checkAppCheckContext, - checkAuthContext, - runHandler, - RunHandlerResult, -} from '../../helper'; +import * as debug from '../../../src/common/debug'; +import * as https from '../../../src/common/providers/https'; +import * as mocks from '../../fixtures/credential/key.json'; import { expectedResponseHeaders, generateAppCheckToken, @@ -19,9 +16,12 @@ import { mockFetchPublicKeys, mockRequest, } from '../../fixtures/mockrequest'; -import * as debug from '../../../src/common/debug'; -import * as https from '../../../src/common/providers/https'; -import * as mocks from '../../fixtures/credential/key.json'; +import { + checkAppCheckContext, + checkAuthContext, + runHandler, + RunHandlerResult, +} from '../../helper'; /** * A CallTest is a specification for a test of a callable function that diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts index caa656e3e..617f0f859 100644 --- a/spec/common/providers/identity.spec.ts +++ b/spec/common/providers/identity.spec.ts @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { expect } from 'chai'; import * as express from 'express'; import * as jwt from 'jsonwebtoken'; import * as sinon from 'sinon'; import * as identity from '../../../src/common/providers/identity'; -import { expect } from 'chai'; const PROJECT = 'my-project'; const EVENT = 'EVENT_TYPE'; @@ -308,8 +308,8 @@ describe('identity', () => { kid: '123456', }, { - '123456': '7890', - '2468': '1357', + 123456: '7890', + 2468: '1357', } ) ).to.eq('7890'); @@ -438,7 +438,7 @@ describe('identity', () => { const decoded = { aud: VALID_URL, iss: `${identity.JWT_ISSUER}${PROJECT}`, - sub: sub, + sub, event_type: EVENT, } as identity.DecodedPayload; @@ -515,8 +515,8 @@ describe('identity', () => { let jwtVerifyStub: sinon.SinonStub; const keysCache = { publicKeys: { - '123456': '7890', - '2468': '1357', + 123456: '7890', + 2468: '1357', }, publicKeysExpireAt: time + identity.INVALID_TOKEN_BUFFER + 10000, }; diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts index b511bcb59..d3711a18f 100644 --- a/spec/common/providers/tasks.spec.ts +++ b/spec/common/providers/tasks.spec.ts @@ -23,20 +23,20 @@ import { expect } from 'chai'; import * as firebase from 'firebase-admin'; -import { checkAuthContext, runHandler } from '../../helper'; -import { - generateIdToken, - generateUnsignedIdToken, - mockRequest, -} from '../../fixtures/mockrequest'; +import { apps as appsNamespace } from '../../../src/apps'; +import * as https from '../../../src/common/providers/https'; import { onDispatchHandler, - TaskContext, Request, + TaskContext, } from '../../../src/common/providers/tasks'; -import { apps as appsNamespace } from '../../../src/apps'; import * as mocks from '../../fixtures/credential/key.json'; -import * as https from '../../../src/common/providers/https'; +import { + generateIdToken, + generateUnsignedIdToken, + mockRequest, +} from '../../fixtures/mockrequest'; +import { checkAuthContext, runHandler } from '../../helper'; /** Represents a test case for a Task Queue Function */ interface TaskTest { diff --git a/spec/helper.ts b/spec/helper.ts index f39b96e04..a0cb57db3 100644 --- a/spec/helper.ts +++ b/spec/helper.ts @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as express from 'express'; import { expect } from 'chai'; +import * as express from 'express'; import * as https from '../src/common/providers/https'; import * as tasks from '../src/common/providers/tasks'; diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index c75400064..9994557c4 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -1,8 +1,8 @@ -import * as path from 'path'; import { expect } from 'chai'; +import * as path from 'path'; -import * as loader from '../../src/runtime/loader'; import * as functions from '../../src/index'; +import * as loader from '../../src/runtime/loader'; import { ManifestEndpoint, ManifestRequiredAPI, @@ -246,11 +246,11 @@ describe('loadStack', () => { specVersion: 'v1alpha1', }; - type Testcase = { + interface Testcase { name: string; modulePath: string; expected: ManifestStack; - }; + } function runTests(tc: Testcase) { it('loads stack given relative path', async () => { await expect(loader.loadStack(tc.modulePath)).to.eventually.deep.equal( diff --git a/spec/v2/providers/eventarc.spec.ts b/spec/v2/providers/eventarc.spec.ts index e7387bbd0..96bd48940 100644 --- a/spec/v2/providers/eventarc.spec.ts +++ b/spec/v2/providers/eventarc.spec.ts @@ -23,7 +23,7 @@ import { expect } from 'chai'; import * as options from '../../../src/v2/options'; import * as eventarc from '../../../src/v2/providers/eventarc'; -import { FULL_OPTIONS } from './fixtures'; +import { FULL_ENDPOINT, FULL_OPTIONS } from './fixtures'; const ENDPOINT_EVENT_TRIGGER = { eventType: 'event-type', @@ -106,22 +106,7 @@ describe('v2/eventarc', () => { ); expect(result.__endpoint).to.deep.equal({ - platform: 'gcfv2', - region: ['us-west1'], - availableMemoryMb: 512, - timeoutSeconds: 60, - minInstances: 1, - maxInstances: 3, - concurrency: 20, - vpc: { - connector: 'aConnector', - egressSettings: 'ALL_TRAFFIC', - }, - serviceAccountEmail: 'root@', - ingressSettings: 'ALLOW_ALL', - labels: { - hello: 'world', - }, + ...FULL_ENDPOINT, eventTrigger: { ...ENDPOINT_EVENT_TRIGGER, channel: 'locations/us-west1/channels/my-channel', diff --git a/spec/v2/providers/fixtures.ts b/spec/v2/providers/fixtures.ts index a499be69a..53aa852b3 100644 --- a/spec/v2/providers/fixtures.ts +++ b/spec/v2/providers/fixtures.ts @@ -11,13 +11,13 @@ export const FULL_OPTIONS: options.GlobalOptions = { vpcConnectorEgressSettings: 'ALL_TRAFFIC', serviceAccount: 'root@', ingressSettings: 'ALLOW_ALL', + cpu: 'gcf_gen1', labels: { hello: 'world', }, }; export const FULL_TRIGGER = { - apiVersion: 2, platform: 'gcfv2', regions: ['us-west1'], availableMemoryMb: 512, @@ -48,6 +48,7 @@ export const FULL_ENDPOINT = { }, serviceAccountEmail: 'root@', ingressSettings: 'ALLOW_ALL', + cpu: 'gcf_gen1', labels: { hello: 'world', }, diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 587be89c6..345bd8965 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -28,8 +28,8 @@ import { expectedResponseHeaders, MockRequest, } from '../../fixtures/mockrequest'; -import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; import { runHandler } from '../../helper'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; describe('onRequest', () => { beforeEach(() => { @@ -47,7 +47,6 @@ describe('onRequest', () => { }); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', httpsTrigger: { allowInsecure: false, @@ -112,7 +111,6 @@ describe('onRequest', () => { ); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', httpsTrigger: { allowInsecure: false, @@ -199,7 +197,6 @@ describe('onCall', () => { const result = https.onCall((request) => 42); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', httpsTrigger: { allowInsecure: false, @@ -252,7 +249,6 @@ describe('onCall', () => { ); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', httpsTrigger: { allowInsecure: false, diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts index 73e5b55ab..395dadace 100644 --- a/spec/v2/providers/pubsub.spec.ts +++ b/spec/v2/providers/pubsub.spec.ts @@ -32,7 +32,6 @@ describe('onMessagePublished', () => { const result = pubsub.onMessagePublished('topic', () => 42); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', eventTrigger: EVENT_TRIGGER, labels: {}, @@ -79,7 +78,6 @@ describe('onMessagePublished', () => { ); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', concurrency: 20, minInstances: 3, @@ -110,7 +108,6 @@ describe('onMessagePublished', () => { ); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', minInstances: 3, regions: ['us-west1'], diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts index 1c6d7c265..4f5221b6a 100644 --- a/spec/v2/providers/storage.spec.ts +++ b/spec/v2/providers/storage.spec.ts @@ -3,7 +3,7 @@ import * as sinon from 'sinon'; import * as config from '../../../src/config'; import * as options from '../../../src/v2/options'; import * as storage from '../../../src/v2/providers/storage'; -import { FULL_OPTIONS } from './fixtures'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; const EVENT_TRIGGER = { eventType: 'event-type', @@ -161,40 +161,12 @@ describe('v2/storage', () => { ); expect(result.__trigger).to.deep.equal({ - platform: 'gcfv2', - regions: ['us-west1'], - availableMemoryMb: 512, - timeout: '60s', - minInstances: 1, - maxInstances: 3, - concurrency: 20, - vpcConnector: 'aConnector', - vpcConnectorEgressSettings: 'ALL_TRAFFIC', - serviceAccountEmail: 'root@aProject.iam.gserviceaccount.com', - ingressSettings: 'ALLOW_ALL', - labels: { - hello: 'world', - }, + ...FULL_TRIGGER, eventTrigger: EVENT_TRIGGER, }); expect(result.__endpoint).to.deep.equal({ - platform: 'gcfv2', - region: ['us-west1'], - availableMemoryMb: 512, - timeoutSeconds: 60, - minInstances: 1, - maxInstances: 3, - concurrency: 20, - vpc: { - connector: 'aConnector', - egressSettings: 'ALL_TRAFFIC', - }, - serviceAccountEmail: 'root@', - ingressSettings: 'ALLOW_ALL', - labels: { - hello: 'world', - }, + ...FULL_ENDPOINT, eventTrigger: ENDPOINT_EVENT_TRIGGER, }); }); diff --git a/spec/v2/providers/tasks.spec.ts b/spec/v2/providers/tasks.spec.ts index d6be998a5..f0f8c9cc5 100644 --- a/spec/v2/providers/tasks.spec.ts +++ b/spec/v2/providers/tasks.spec.ts @@ -24,9 +24,9 @@ import { expect } from 'chai'; import * as options from '../../../src/v2/options'; import { onTaskDispatched, Request } from '../../../src/v2/providers/tasks'; -import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; import { MockRequest } from '../../fixtures/mockrequest'; import { runHandler } from '../../helper'; +import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures'; describe('onTaskDispatched', () => { beforeEach(() => { @@ -42,7 +42,6 @@ describe('onTaskDispatched', () => { const result = onTaskDispatched(() => {}); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', taskQueueTrigger: {}, labels: {}, @@ -129,7 +128,6 @@ describe('onTaskDispatched', () => { ); expect(result.__trigger).to.deep.equal({ - apiVersion: 2, platform: 'gcfv2', taskQueueTrigger: {}, concurrency: 20, diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index f3358f02e..8872057ad 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -24,10 +24,10 @@ import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as jwt from 'jsonwebtoken'; import fetch from 'node-fetch'; -import { HttpsError } from './https'; +import { logger } from '../..'; import { EventContext } from '../../cloud-functions'; import { SUPPORTED_REGIONS } from '../../function-configuration'; -import { logger } from '../..'; +import { HttpsError } from './https'; export { HttpsError }; @@ -123,21 +123,16 @@ export function userRecordConstructor(wireData: Object): UserRecord { }; const record = { ...falseyValues, ...wireData }; - const meta = record['metadata']; + const meta = record.metadata; if (meta) { - record['metadata'] = new UserRecordMetadata( + record.metadata = new UserRecordMetadata( meta.createdAt || meta.creationTime, meta.lastSignedInAt || meta.lastSignInTime ); } else { - record['metadata'] = new UserRecordMetadata(null, null); + record.metadata = new UserRecordMetadata(null, null); } - for (const entry of Object.entries(record.providerData)) { - entry['toJSON'] = () => { - return entry; - }; - } - record['toJSON'] = () => { + record.toJSON = () => { const { uid, email, @@ -150,7 +145,7 @@ export function userRecordConstructor(wireData: Object): UserRecord { passwordSalt, tokensValidAfterTime, } = record; - const json = { + const json: Record = { uid, email, emailVerified, @@ -162,9 +157,9 @@ export function userRecordConstructor(wireData: Object): UserRecord { passwordSalt, tokensValidAfterTime, }; - json['metadata'] = record['metadata'].toJSON(); - json['customClaims'] = JSON.parse(JSON.stringify(record.customClaims)); - json['providerData'] = record.providerData.map((entry) => entry.toJSON()); + json.metadata = record.metadata.toJSON(); + json.customClaims = JSON.parse(JSON.stringify(record.customClaims)); + json.providerData = record.providerData.map((entry) => entry.toJSON()); return json; }; return record as UserRecord; @@ -819,12 +814,13 @@ function parseAdditionalUserInfo( decodedJWT: DecodedPayload ): AdditionalUserInfo { let profile, username; - if (decodedJWT.raw_user_info) + if (decodedJWT.raw_user_info) { try { profile = JSON.parse(decodedJWT.raw_user_info); } catch (err) { logger.debug(`Parse Error: ${err.message}`); } + } if (profile) { if (decodedJWT.sign_in_method === 'github.com') { username = profile.login; diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 160de06c8..98568ce18 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import { - UserRecord, - UserInfo, - UserRecordMetadata, - userRecordConstructor, -} from '../common/providers/identity'; import { CloudFunction, Event, EventContext, makeCloudFunction, } from '../cloud-functions'; +import { + UserInfo, + UserRecord, + userRecordConstructor, + UserRecordMetadata, +} from '../common/providers/identity'; import { DeploymentOptions } from '../function-configuration'; // TODO: yank in next breaking change release diff --git a/src/providers/tasks.ts b/src/providers/tasks.ts index 5d9520497..64acc240f 100644 --- a/src/providers/tasks.ts +++ b/src/providers/tasks.ts @@ -22,21 +22,21 @@ import * as express from 'express'; -import { Request } from '../common/providers/https'; -import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; -import { DeploymentOptions } from '../function-configuration'; import { optionsToEndpoint, optionsToTrigger } from '../cloud-functions'; import { convertIfPresent, convertInvoker, copyIfPresent, } from '../common/encoding'; +import { Request } from '../common/providers/https'; import { onDispatchHandler, - TaskContext, RateLimits, RetryConfig, + TaskContext, } from '../common/providers/tasks'; +import { DeploymentOptions } from '../function-configuration'; +import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; export { /** @hidden */ diff --git a/src/runtime/loader.ts b/src/runtime/loader.ts index 8d08138b9..de31eefd3 100644 --- a/src/runtime/loader.ts +++ b/src/runtime/loader.ts @@ -19,13 +19,13 @@ // 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. -import * as url from 'url'; import * as path from 'path'; +import * as url from 'url'; import { - ManifestStack, ManifestEndpoint, ManifestRequiredAPI, + ManifestStack, } from './manifest'; /** @@ -64,19 +64,21 @@ export function extractStack( requiredAPIs: ManifestRequiredAPI[], 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: any = 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) { extractStack(val, endpoints, requiredAPIs, prefix + name + '-'); diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index caece4ee5..7939d9c09 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -33,6 +33,7 @@ export interface ManifestEndpoint { concurrency?: number; serviceAccountEmail?: string; timeoutSeconds?: number; + cpu?: number | 'gcf_gen1'; vpc?: { connector: string; egressSettings?: string; diff --git a/src/v2/index.ts b/src/v2/index.ts index 71189e76f..ae2c5df51 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -23,11 +23,11 @@ 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 pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; -import * as eventarc from './providers/eventarc'; export { alerts, https, pubsub, storage, logger, params, tasks, eventarc }; diff --git a/src/v2/options.ts b/src/v2/options.ts index 73eca40ac..bfbc3195d 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -27,10 +27,10 @@ import { serviceAccountFromShorthand, } from '../common/encoding'; import * as logger from '../logger'; +import { ManifestEndpoint } from '../runtime/manifest'; import { TriggerAnnotation } from './core'; import { declaredParams } from './params'; import { ParamSpec } from './params/types'; -import { ManifestEndpoint } from '../runtime/manifest'; /** * List of all regions supported by Cloud Functions v2 @@ -167,9 +167,21 @@ export interface GlobalOptions { /** * Number of requests a function can serve at once. * Can only be applied to functions running on Cloud Functions v2. - * A value of null restores the default concurrency. + * 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. */ concurrency?: number | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + /** * Connect cloud function to specified VPC connector. * A value of null removes the VPC connector @@ -311,7 +323,8 @@ export function optionsToEndpoint( 'maxInstances', 'ingressSettings', 'labels', - 'timeoutSeconds' + 'timeoutSeconds', + 'cpu' ); convertIfPresent(endpoint, opts, 'serviceAccountEmail', 'serviceAccount'); if (opts.vpcConnector) { diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 58b54e9b6..e70e1796a 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -1,6 +1,6 @@ -import { getEndpointAnnotation, FirebaseAlertData } from './alerts'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; +import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; /** * The internal payload object for adding a new tester device to app distribution. diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index dd8ccb2c5..a4b7a151e 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -1,4 +1,4 @@ -import { getEndpointAnnotation, FirebaseAlertData } from '.'; +import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index d9cece913..6a5f36f73 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -1,4 +1,4 @@ -import { getEndpointAnnotation, FirebaseAlertData } from '.'; +import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index 9c371cef5..fd56e714f 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as options from '../options'; -import { CloudEvent, CloudFunction } from '../core'; -import { copyIfPresent, convertIfPresent } from '../../common/encoding'; +import { convertIfPresent, copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; /** Options that can be set on an Eventarc trigger. */ export interface EventarcTriggerOptions extends options.EventHandlerOptions { diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 24367759c..f6101ba1b 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -24,7 +24,6 @@ import * as cors from 'cors'; import * as express from 'express'; import { convertIfPresent, convertInvoker } from '../../common/encoding'; -import * as options from '../options'; import { CallableRequest, FunctionsErrorCode, @@ -33,6 +32,7 @@ import { Request, } from '../../common/providers/https'; import { ManifestEndpoint } from '../../runtime/manifest'; +import * as options from '../options'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; @@ -111,9 +111,6 @@ export function onRequest( opts as options.GlobalOptions ); const trigger: any = { - // TODO(inlined): Remove "apiVersion" once the latest version of the CLI - // has migrated to "platform". - apiVersion: 2, platform: 'gcfv2', ...baseOpts, ...specificOpts, @@ -202,9 +199,6 @@ export function onCall>( opts as options.GlobalOptions ); return { - // TODO(inlined): Remove "apiVersion" once the latest version of the CLI - // has migrated to "platform". - apiVersion: 2, platform: 'gcfv2', ...baseOpts, ...specificOpts, diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 2964af42d..9f06fb083 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -1,7 +1,7 @@ -import * as options from '../options'; -import { CloudEvent, CloudFunction } from '../core'; import { copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; /** * Interface representing a Google Cloud Pub/Sub message. @@ -143,9 +143,6 @@ export function onMessagePublished( const specificOpts = options.optionsToTriggerAnnotations(opts); return { - // TODO(inlined): Remove "apiVersion" once the CLI has migrated to - // "platform" - apiVersion: 2, platform: 'gcfv2', ...baseOpts, ...specificOpts, diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index bc9d26653..f4ce5b004 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as options from '../options'; -import { firebaseConfig } from '../../config'; -import { CloudEvent, CloudFunction } from '../core'; import { copyIfPresent } from '../../common/encoding'; +import { firebaseConfig } from '../../config'; import { ManifestEndpoint } from '../../runtime/manifest'; +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; /** * An object within Google Cloud Storage. diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index ab5892bb5..b45de3361 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -20,20 +20,20 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as options from '../options'; import { convertIfPresent, convertInvoker, copyIfPresent, } from '../../common/encoding'; -import { HttpsFunction } from './https'; import { AuthData, + onDispatchHandler, RateLimits, Request, RetryConfig, - onDispatchHandler, } from '../../common/providers/tasks'; +import * as options from '../options'; +import { HttpsFunction } from './https'; export { AuthData, RateLimits, Request, RetryConfig as RetryPolicy }; @@ -101,7 +101,6 @@ export function onTaskDispatched( convertInvoker ); return { - apiVersion: 2, platform: 'gcfv2', ...baseOpts, ...specificOpts, From 143eea8e06c75478c9d5404b631dd6140b096bd2 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 28 Apr 2022 17:46:17 -0400 Subject: [PATCH 424/705] Add auth blocking handlers (#1080) * adding inital components for v1 * getting the sdk to work with the cli * more tinkering * reverting package-lock * cleaning up things * adding back old package-lock * adding current package & check before using admin api * cleaning up & starting tests * removing old token verification peices & adding tests for v1/v2 handlers * remove node-fetch * bumping admin version & removing node-fetch types * add back in the @types * add RS256 alg to broken test * adding DOM to fix tsc errors * adding skip lib check * address comments * exporting HttpsError from v1 & v2 namespaces * wrap the handlers, remove skipLibCheck, and add back in node-fetch * Add polyfill to avoid depending on DOM or using skipLibCheck (#1085) * Add polyfill to avoid depending on DOM or using skipLibCheck * Formatter * Linter Co-authored-by: Thomas Bouldin --- package-lock.json | 9028 ++++-------------------- package.json | 8 +- spec/common/providers/identity.spec.ts | 389 - spec/fixtures/mockrequest.ts | 1 + spec/v1/providers/auth.spec.ts | 176 + spec/v2/providers/identity.spec.ts | 277 + src/cloud-functions.ts | 9 + src/common/providers/https.ts | 3 +- src/common/providers/identity.ts | 368 +- src/function-builder.ts | 3 +- src/handler-builder.ts | 2 +- src/providers/auth.ts | 140 +- src/runtime/manifest.ts | 5 + src/types/global.d.ts | 6 + src/v2/core.ts | 4 + src/v2/index.ts | 13 +- src/v2/providers/identity.ts | 215 + tsconfig.release.json | 1 + v2/identity.js | 21 + 19 files changed, 2318 insertions(+), 8351 deletions(-) create mode 100644 spec/v2/providers/identity.spec.ts create mode 100644 src/types/global.d.ts create mode 100644 src/v2/providers/identity.ts create mode 100644 v2/identity.js diff --git a/package-lock.json b/package-lock.json index f1d1eeff2..4e1d204b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6085 +1,31 @@ { "name": "firebase-functions", "version": "3.20.1", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "firebase-functions", - "version": "3.20.1", - "license": "MIT", - "dependencies": { - "@types/cors": "^2.8.5", - "@types/express": "4.17.3", - "cors": "^2.8.5", - "express": "^4.17.1", - "lodash": "^4.17.14", - "node-fetch": "^2.6.7" - }, - "bin": { - "firebase-functions": "lib/bin/firebase-functions.js" - }, - "devDependencies": { - "@types/chai": "^4.1.7", - "@types/chai-as-promised": "^7.1.0", - "@types/jsonwebtoken": "^8.3.2", - "@types/lodash": "^4.14.135", - "@types/mocha": "^5.2.7", - "@types/mock-require": "^2.0.0", - "@types/nock": "^10.0.3", - "@types/node": "^8.10.50", - "@types/node-fetch": "^3.0.3", - "@types/sinon": "^7.0.13", - "chai": "^4.2.0", - "chai-as-promised": "^7.1.1", - "child-process-promise": "^2.2.1", - "firebase-admin": "10.0.0", - "js-yaml": "^3.13.1", - "jsdom": "^16.2.1", - "jsonwebtoken": "^8.5.1", - "jwk-to-pem": "^2.0.5", - "mocha": "^6.1.4", - "mock-require": "^3.0.3", - "mz": "^2.7.0", - "nock": "^10.0.6", - "node-fetch": "^2.6.7", - "portfinder": "^1.0.28", - "prettier": "^1.18.2", - "semver": "^7.3.5", - "sinon": "^7.3.2", - "ts-node": "^10.4.0", - "tslint": "^5.18.0", - "tslint-config-prettier": "^1.18.0", - "tslint-no-unused-expression-chai": "^0.1.4", - "tslint-plugin-prettier": "^2.0.1", - "typedoc": "0.21.2", - "typescript": "^4.3.5", - "yargs": "^15.3.1" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - }, - "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "node_modules/@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "node_modules/@cspotcode/source-map-consumer": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", - "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", - "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", - "dev": true, - "dependencies": { - "@cspotcode/source-map-consumer": "0.8.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@firebase/app-types": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", - "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==", - "dev": true - }, - "node_modules/@firebase/auth-interop-types": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", - "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true, - "peerDependencies": { - "@firebase/app-types": "0.x", - "@firebase/util": "1.x" - } - }, - "node_modules/@firebase/component": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz", - "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==", - "dev": true, - "dependencies": { - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/component/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/@firebase/database": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.2.tgz", - "integrity": "sha512-Y1LZR1LIQM8YKMkeUPpAq3/e53hcfcXO+JEZ6vCzBeD6xRawqmpw6B5/DzePdCNNvjcqheXzSaR7T39eRZo/wA==", - "dev": true, - "dependencies": { - "@firebase/auth-interop-types": "0.1.6", - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "faye-websocket": "0.11.4", - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/database-compat": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.2.tgz", - "integrity": "sha512-sV32QIRSNIBj/6OYtpmPzA/SfQz1/NBZbhxg9dIhGaSt9e5HaMxXRuz2lImudX0Sd/v8DKdExrxa++K6rKrRtA==", - "dev": true, - "dependencies": { - "@firebase/component": "0.5.7", - "@firebase/database": "0.12.2", - "@firebase/database-types": "0.9.1", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", - "tslib": "^2.1.0" - }, - "peerDependencies": { - "@firebase/app-compat": "0.x" - } - }, - "node_modules/@firebase/database-compat/node_modules/@firebase/database-types": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz", - "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==", - "dev": true, - "dependencies": { - "@firebase/app-types": "0.7.0", - "@firebase/util": "1.4.0" - } - }, - "node_modules/@firebase/database-compat/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/@firebase/database-types": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz", - "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==", - "dev": true, - "dependencies": { - "@firebase/app-types": "0.6.3" - } - }, - "node_modules/@firebase/database-types/node_modules/@firebase/app-types": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz", - "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw==", - "dev": true - }, - "node_modules/@firebase/database/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/@firebase/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/logger/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/@firebase/util": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz", - "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@firebase/util/node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/@google-cloud/common": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", - "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", - "dev": true, - "optional": true, - "dependencies": { - "@google-cloud/projectify": "^2.0.0", - "@google-cloud/promisify": "^2.0.0", - "arrify": "^2.0.1", - "duplexify": "^4.1.1", - "ent": "^2.2.0", - "extend": "^3.0.2", - "google-auth-library": "^7.0.2", - "retry-request": "^4.1.1", - "teeny-request": "^7.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/firestore": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", - "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", - "dev": true, - "optional": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "functional-red-black-tree": "^1.0.1", - "google-gax": "^2.9.2", - "protobufjs": "^6.8.6" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@google-cloud/paginator": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", - "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", - "dev": true, - "optional": true, - "dependencies": { - "arrify": "^2.0.0", - "extend": "^3.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/projectify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", - "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/promisify": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", - "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/storage": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", - "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", - "dev": true, - "optional": true, - "dependencies": { - "@google-cloud/common": "^3.6.0", - "@google-cloud/paginator": "^3.0.0", - "@google-cloud/promisify": "^2.0.0", - "arrify": "^2.0.0", - "async-retry": "^1.3.1", - "compressible": "^2.0.12", - "date-and-time": "^1.0.0", - "duplexify": "^4.0.0", - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "gcs-resumable-upload": "^3.1.4", - "get-stream": "^6.0.0", - "hash-stream-validation": "^0.2.2", - "mime": "^2.2.0", - "mime-types": "^2.0.8", - "onetime": "^5.1.0", - "p-limit": "^3.0.1", - "pumpify": "^2.0.0", - "snakeize": "^0.1.0", - "stream-events": "^1.0.1", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@google-cloud/storage/node_modules/mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", - "dev": true, - "optional": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/@google-cloud/storage/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "optional": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@grpc/grpc-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", - "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", - "dev": true, - "optional": true, - "dependencies": { - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, - "node_modules/@grpc/grpc-js/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", - "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", - "dev": true, - "optional": true, - "dependencies": { - "@types/long": "^4.0.1", - "lodash.camelcase": "^4.3.0", - "long": "^4.0.0", - "protobufjs": "^6.10.0", - "yargs": "^16.1.1" - }, - "bin": { - "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@grpc/proto-loader/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@grpc/proto-loader/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "optional": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/@grpc/proto-loader/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@grpc/proto-loader/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "optional": true - }, - "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "optional": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@grpc/proto-loader/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "optional": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@panva/asn1.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", - "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "dev": true, - "optional": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", - "dev": true, - "optional": true - }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", - "dev": true, - "optional": true - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", - "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/formatio": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^3.1.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.3.0", - "array-from": "^2.1.1", - "lodash": "^4.17.15" - } - }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", - "dev": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", - "dev": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", - "dev": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", - "dev": true - }, - "node_modules/@types/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", - "dependencies": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "node_modules/@types/chai": { - "version": "4.2.12", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", - "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", - "dev": true - }, - "node_modules/@types/chai-as-promised": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", - "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", - "dev": true, - "dependencies": { - "@types/chai": "*" - } - }, - "node_modules/@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, - "node_modules/@types/connect": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", - "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", - "dependencies": { - "@types/express": "*" - } - }, - "node_modules/@types/express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", - "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, - "node_modules/@types/express-jwt": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", - "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", - "dev": true, - "dependencies": { - "@types/express": "*", - "@types/express-unless": "*" - } - }, - "node_modules/@types/express-serve-static-core": { - "version": "4.17.12", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", - "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", - "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" - } - }, - "node_modules/@types/express-unless": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", - "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", - "dev": true, - "dependencies": { - "@types/express": "*" - } - }, - "node_modules/@types/jsonwebtoken": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", - "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/lodash": { - "version": "4.14.161", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", - "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", - "dev": true - }, - "node_modules/@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", - "dev": true, - "optional": true - }, - "node_modules/@types/mime": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" - }, - "node_modules/@types/mocha": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", - "dev": true - }, - "node_modules/@types/mock-require": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", - "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/nock": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", - "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/node": { - "version": "8.10.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", - "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" - }, - "node_modules/@types/node-fetch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-3.0.3.tgz", - "integrity": "sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==", - "deprecated": "This is a stub types definition. node-fetch provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "node-fetch": "*" - } - }, - "node_modules/@types/qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" - }, - "node_modules/@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" - }, - "node_modules/@types/serve-static": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", - "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", - "dependencies": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" - } - }, - "node_modules/@types/sinon": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", - "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", - "dev": true - }, - "node_modules/abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", - "dev": true - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dev": true, - "optional": true, - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dependencies": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - } - }, - "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "optional": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", - "dev": true - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "node_modules/array-from": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", - "dev": true - }, - "node_modules/arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dev": true, - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } - }, - "node_modules/async-retry": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", - "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", - "dev": true, - "optional": true, - "dependencies": { - "retry": "0.12.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", - "dev": true - }, - "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/bignumber.js": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", - "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", - "dev": true, - "optional": true, - "engines": { - "node": "*" - } - }, - "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dependencies": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", - "dev": true - }, - "node_modules/buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", - "dev": true - }, - "node_modules/builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "node_modules/chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chai-as-promised": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", - "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", - "dev": true, - "dependencies": { - "check-error": "^1.0.2" - }, - "peerDependencies": { - "chai": ">= 2.1.2 < 5" - } - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/child-process-promise": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", - "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", - "dev": true, - "dependencies": { - "cross-spawn": "^4.0.2", - "node-version": "^1.0.0", - "promise-polyfill": "^6.0.1" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", - "dev": true - }, - "node_modules/compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "optional": true, - "dependencies": { - "mime-db": ">= 1.43.0 < 2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/compressible/node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "node_modules/configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "optional": true, - "dependencies": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, - "node_modules/cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "dependencies": { - "cssom": "~0.3.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/date-and-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", - "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", - "dev": true, - "optional": true - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decimal.js": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", - "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", - "dev": true - }, - "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", - "dev": true, - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "node_modules/dicer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", - "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", - "dev": true, - "dependencies": { - "streamsearch": "0.1.2" - }, - "engines": { - "node": ">=4.5.0" - } - }, - "node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", - "dev": true, - "dependencies": { - "webidl-conversions": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/domexception/node_modules/webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "optional": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/duplexify": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", - "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", - "dev": true, - "optional": true, - "dependencies": { - "end-of-stream": "^1.4.1", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1", - "stream-shift": "^1.0.0" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dev": true, - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/elliptic/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "optional": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true, - "optional": true - }, - "node_modules/es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", - "dev": true, - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/eslint-plugin-prettier": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", - "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", - "dev": true, - "dependencies": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" - }, - "engines": { - "node": ">=4.0.0" - }, - "peerDependencies": { - "prettier": ">= 0.11.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "dependencies": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/fast-text-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", - "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", - "dev": true, - "optional": true - }, - "node_modules/faye-websocket": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", - "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", - "dev": true, - "dependencies": { - "websocket-driver": ">=0.5.1" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/firebase-admin": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.0.0.tgz", - "integrity": "sha512-EOAk5ZaqXhBBvx9ZyXd28kw8glMTt3xl0g3BepGRCy0RSSUPGOzfAqjGhc65guSKgFOpT5mAUycYcJbqullKUQ==", - "dev": true, - "dependencies": { - "@firebase/database-compat": "^0.1.1", - "@firebase/database-types": "^0.7.2", - "@types/node": ">=12.12.47", - "dicer": "^0.3.0", - "jsonwebtoken": "^8.5.1", - "jwks-rsa": "^2.0.2", - "node-forge": "^0.10.0" - }, - "engines": { - "node": ">=12.7.0" - }, - "optionalDependencies": { - "@google-cloud/firestore": "^4.5.0", - "@google-cloud/storage": "^5.3.0" - } - }, - "node_modules/firebase-admin/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true - }, - "node_modules/flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "deprecated": "Fixed a prototype pollution security issue in 4.1.0, please upgrade to ^4.1.1 or ^5.0.1.", - "dev": true, - "dependencies": { - "is-buffer": "~2.0.3" - }, - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat/node_modules/is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true, - "optional": true - }, - "node_modules/gaxios": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", - "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", - "dev": true, - "optional": true, - "dependencies": { - "abort-controller": "^3.0.0", - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.3.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gcp-metadata": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", - "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", - "dev": true, - "optional": true, - "dependencies": { - "gaxios": "^4.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gcs-resumable-upload": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", - "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", - "dev": true, - "optional": true, - "dependencies": { - "abort-controller": "^3.0.0", - "configstore": "^5.0.0", - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "google-auth-library": "^7.0.0", - "pumpify": "^2.0.0", - "stream-events": "^1.0.4" - }, - "bin": { - "gcs-upload": "build/src/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/google-auth-library": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", - "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", - "dev": true, - "optional": true, - "dependencies": { - "arrify": "^2.0.0", - "base64-js": "^1.3.0", - "ecdsa-sig-formatter": "^1.0.11", - "fast-text-encoding": "^1.0.0", - "gaxios": "^4.0.0", - "gcp-metadata": "^4.2.0", - "gtoken": "^5.0.4", - "jws": "^4.0.0", - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-auth-library/node_modules/jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/google-auth-library/node_modules/jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "dependencies": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/google-auth-library/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-auth-library/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "optional": true - }, - "node_modules/google-gax": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", - "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", - "dev": true, - "optional": true, - "dependencies": { - "@grpc/grpc-js": "~1.3.0", - "@grpc/proto-loader": "^0.6.1", - "@types/long": "^4.0.0", - "abort-controller": "^3.0.0", - "duplexify": "^4.0.0", - "fast-text-encoding": "^1.0.3", - "google-auth-library": "^7.0.2", - "is-stream-ended": "^0.1.4", - "node-fetch": "^2.6.1", - "object-hash": "^2.1.1", - "protobufjs": "^6.10.2", - "retry-request": "^4.0.0" - }, - "bin": { - "compileProtos": "build/tools/compileProtos.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/google-p12-pem": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", - "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", - "dev": true, - "optional": true, - "dependencies": { - "node-forge": "^0.10.0" - }, - "bin": { - "gp12-pem": "build/src/bin/gp12-pem.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true, - "optional": true - }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, - "node_modules/gtoken": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", - "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", - "dev": true, - "optional": true, - "dependencies": { - "gaxios": "^4.0.0", - "google-p12-pem": "^3.0.3", - "jws": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gtoken/node_modules/jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/gtoken/node_modules/jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "dependencies": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hash-stream-validation": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", - "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", - "dev": true, - "optional": true - }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", - "dev": true, - "dependencies": { - "whatwg-encoding": "^1.0.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", - "dev": true - }, - "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "optional": true, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http-proxy-agent/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/http-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "optional": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "node_modules/ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-callable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", - "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", - "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-stream-ended": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", - "dev": true, - "optional": true - }, - "node_modules/is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "node_modules/jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "node_modules/jose": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", - "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", - "dev": true, - "dependencies": { - "@panva/asn1.js": "^1.0.0" - }, - "engines": { - "node": ">=10.13.0 < 13 || >=13.7.0" - }, - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/js-yaml/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "node_modules/jsdom": { - "version": "16.4.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", - "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", - "dev": true, - "dependencies": { - "abab": "^2.0.3", - "acorn": "^7.1.1", - "acorn-globals": "^6.0.0", - "cssom": "^0.4.4", - "cssstyle": "^2.2.0", - "data-urls": "^2.0.0", - "decimal.js": "^10.2.0", - "domexception": "^2.0.1", - "escodegen": "^1.14.1", - "html-encoding-sniffer": "^2.0.1", - "is-potential-custom-element-name": "^1.0.0", - "nwsapi": "^2.2.0", - "parse5": "5.1.1", - "request": "^2.88.2", - "request-promise-native": "^1.0.8", - "saxes": "^5.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.1.0", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0", - "ws": "^7.2.3", - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jsdom/node_modules/escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=4.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/jsdom/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", - "dev": true, - "optional": true, - "dependencies": { - "bignumber.js": "^9.0.0" - } - }, - "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "node_modules/jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", - "dev": true - }, - "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "dev": true, - "dependencies": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=4", - "npm": ">=1.4.28" - } - }, - "node_modules/jsonwebtoken/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/jsonwebtoken/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "node_modules/just-extend": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", - "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", - "dev": true - }, - "node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dev": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jwk-to-pem": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", - "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", - "dev": true, - "dependencies": { - "asn1.js": "^5.3.0", - "elliptic": "^6.5.4", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jwks-rsa": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", - "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", - "dev": true, - "dependencies": { - "@types/express-jwt": "0.0.42", - "debug": "^4.1.0", - "jose": "^2.0.5", - "limiter": "^1.1.5", - "lru-memoizer": "^2.1.2" - }, - "engines": { - "node": ">=10 < 13 || >=14" - } - }, - "node_modules/jwks-rsa/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/jwks-rsa/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, - "dependencies": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/limiter": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", - "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", - "dev": true - }, - "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true, - "optional": true - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "node_modules/lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", - "dev": true - }, - "node_modules/lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", - "dev": true - }, - "node_modules/lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", - "dev": true - }, - "node_modules/lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", - "dev": true - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "node_modules/lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, - "node_modules/lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", - "dev": true - }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, - "node_modules/log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "dependencies": { - "chalk": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/lolex": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", - "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", - "dev": true - }, - "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true, - "optional": true - }, - "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/lru-memoizer": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", - "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", - "dev": true, - "dependencies": { - "lodash.clonedeep": "^4.5.0", - "lru-cache": "~4.0.0" - } - }, - "node_modules/lru-memoizer/node_modules/lru-cache": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", - "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", - "dev": true, - "dependencies": { - "pseudomap": "^1.0.1", - "yallist": "^2.0.0" - } - }, - "node_modules/lunr": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "dev": true - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "optional": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "optional": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "node_modules/marked": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", - "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", - "dev": true, - "bin": { - "marked": "bin/marked" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "dependencies": { - "mime-db": "1.40.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mocha": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", - "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", - "dev": true, - "dependencies": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "2.2.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.4", - "ms": "2.1.1", - "node-environment-flags": "1.0.5", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/mocha/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/mocha/node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mocha/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/mocha/node_modules/js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/mocha/node_modules/mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "node_modules/mocha/node_modules/object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/mocha/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/mocha/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/mock-require": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", - "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", - "dev": true, - "dependencies": { - "get-caller-file": "^1.0.2", - "normalize-path": "^2.1.1" - }, - "engines": { - "node": ">=4.3.0" - } - }, - "node_modules/mock-require/node_modules/get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/nise": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", - "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", - "dev": true, - "dependencies": { - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "lolex": "^5.0.1", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/nise/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/nise/node_modules/lolex": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, - "node_modules/nise/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/nock": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", - "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", - "dev": true, - "dependencies": { - "chai": "^4.1.2", - "debug": "^4.1.0", - "deep-equal": "^1.0.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.5", - "mkdirp": "^0.5.0", - "propagate": "^1.0.0", - "qs": "^6.5.1", - "semver": "^5.5.0" - }, - "engines": { - "node": ">= 6.0" - } - }, - "node_modules/nock/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/nock/node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/nock/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/nock/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", - "dev": true, - "dependencies": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - } - }, - "node_modules/node-environment-flags/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/node-version": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", - "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-hash": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", - "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.assign/node_modules/es-abstract": { - "version": "1.18.0-next.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", - "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", - "dev": true, - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "optional": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/onigasm": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", - "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", - "dev": true, - "dependencies": { - "lru-cache": "^5.1.1" - } - }, - "node_modules/onigasm/node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/onigasm/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", - "dev": true - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "node_modules/portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "dependencies": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "engines": { - "node": ">= 0.12.0" - } - }, - "node_modules/portfinder/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/portfinder/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-polyfill": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", - "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", - "dev": true - }, - "node_modules/propagate": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", - "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", - "dev": true, - "engines": [ - "node >= 0.8.1" - ] - }, - "node_modules/protobufjs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", - "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" - } - }, - "node_modules/protobufjs/node_modules/@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", - "dev": true, - "optional": true - }, - "node_modules/proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "dependencies": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "optional": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/pumpify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", - "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", - "dev": true, - "optional": true, - "dependencies": { - "duplexify": "^4.1.1", - "inherits": "^2.0.3", - "pump": "^3.0.0" - } - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "optional": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.19" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "engines": { - "node": ">=0.12.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-native/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/request/node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/request/node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true, - "optional": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/retry-request": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", - "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", - "dev": true, - "optional": true, - "dependencies": { - "debug": "^4.1.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/retry-request/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/retry-request/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" - }, - "node_modules/saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - }, - "node_modules/serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" - }, - "node_modules/shiki": { - "version": "0.9.12", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.12.tgz", - "integrity": "sha512-VXcROdldv0/Qu0w2XvzU4IrvTeBNs/Kj/FCmtcEXGz7Tic/veQzliJj6tEiAgoKianhQstpYmbPDStHU5Opqcw==", - "dev": true, - "dependencies": { - "jsonc-parser": "^3.0.0", - "onigasm": "^2.2.5", - "vscode-textmate": "5.2.0" - } - }, - "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true, - "optional": true - }, - "node_modules/sinon": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", - "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.4.0", - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/samsam": "^3.3.3", - "diff": "^3.5.0", - "lolex": "^4.2.0", - "nise": "^1.5.2", - "supports-color": "^5.5.0" - } - }, - "node_modules/sinon/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/snakeize": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", - "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", - "dev": true, - "optional": true - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stream-events": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", - "dev": true, - "optional": true, - "dependencies": { - "stubs": "^3.0.0" - } - }, - "node_modules/stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "dev": true, - "optional": true - }, - "node_modules/streamsearch": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", - "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true - }, - "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stubs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", - "dev": true, - "optional": true - }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "node_modules/teeny-request": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", - "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", - "dev": true, - "optional": true, - "dependencies": { - "http-proxy-agent": "^4.0.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.1", - "stream-events": "^1.0.5", - "uuid": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0" - } - }, - "node_modules/thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", - "dev": true, - "dependencies": { - "thenify": ">= 3.1.0 < 4" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "dependencies": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tr46": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", - "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-node": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", - "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", - "dev": true, - "dependencies": { - "@cspotcode/source-map-support": "0.7.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.0", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/ts-node/node_modules/acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ts-node/node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ts-node/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", - "dev": true - }, - "node_modules/tslint": { - "version": "5.20.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", - "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^4.0.1", - "glob": "^7.1.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.29.0" - }, - "bin": { - "tslint": "bin/tslint" - }, - "engines": { - "node": ">=4.8.0" - }, - "peerDependencies": { - "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" - } - }, - "node_modules/tslint-config-prettier": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", - "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", - "dev": true, - "bin": { - "tslint-config-prettier-check": "bin/check.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/tslint-no-unused-expression-chai": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", - "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", - "dev": true, - "dependencies": { - "tsutils": "^3.0.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "tslint": ">=5.1.0" - } - }, - "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", - "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tslint-plugin-prettier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", - "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", - "dev": true, - "dependencies": { - "eslint-plugin-prettier": "^2.2.0", - "lines-and-columns": "^1.1.6", - "tslib": "^1.7.1" - }, - "engines": { - "node": ">= 4" - }, - "peerDependencies": { - "prettier": "^1.9.0 || ^2.0.0", - "tslint": "^5.0.0 || ^6.0.0" - } - }, - "node_modules/tslint/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/tslint/node_modules/resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "dependencies": { - "path-parse": "^1.0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tslint/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "peerDependencies": { - "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" - } - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "optional": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/typedoc": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", - "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", - "dev": true, - "dependencies": { - "glob": "^7.1.7", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", - "lunr": "^2.3.9", - "marked": "^2.1.1", - "minimatch": "^3.0.0", - "progress": "^2.0.3", - "shiki": "^0.9.3", - "typedoc-default-themes": "^0.12.10" - }, - "bin": { - "typedoc": "bin/typedoc" - }, - "engines": { - "node": ">= 12.20.0" - }, - "peerDependencies": { - "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x" - } - }, - "node_modules/typedoc-default-themes": { - "version": "0.12.10", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", - "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/typedoc/node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/uglify-js": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz", - "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==", - "dev": true, - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "optional": true, - "dependencies": { - "crypto-random-string": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true, - "optional": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "optional": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", - "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", - "dev": true - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/vscode-textmate": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", - "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", - "dev": true - }, - "node_modules/w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "dev": true, - "dependencies": { - "browser-process-hrtime": "^1.0.0" - } - }, - "node_modules/w3c-xmlserializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", - "dev": true, - "dependencies": { - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true, - "engines": { - "node": ">=10.4" - } - }, - "node_modules/websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, - "dependencies": { - "http-parser-js": ">=0.5.1", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "dev": true, - "dependencies": { - "iconv-lite": "0.4.24" - } - }, - "node_modules/whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", - "dev": true - }, - "node_modules/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", - "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^2.0.2", - "webidl-conversions": "^6.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "optional": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "dev": true, - "dependencies": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs-unparser/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/yargs-unparser/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "dependencies": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/yargs/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "node_modules/yargs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/yargs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/yargs/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - }, "dependencies": { "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", + "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", "dev": true, "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.16.7" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", + "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", "dev": true }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", + "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.16.7", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } @@ -6109,167 +55,91 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true, - "requires": {} + "dev": true }, "@firebase/component": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz", - "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.13.tgz", + "integrity": "sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w==", "dev": true, "requires": { - "@firebase/util": "1.4.0", + "@firebase/util": "1.5.2", "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - } } }, "@firebase/database": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.2.tgz", - "integrity": "sha512-Y1LZR1LIQM8YKMkeUPpAq3/e53hcfcXO+JEZ6vCzBeD6xRawqmpw6B5/DzePdCNNvjcqheXzSaR7T39eRZo/wA==", + "version": "0.12.8", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.8.tgz", + "integrity": "sha512-JBQVfFLzfhxlQbl4OU6ov9fdsddkytBQdtSSR49cz48homj38ccltAhK6seum+BI7f28cV2LFHF9672lcN+qxA==", "dev": true, "requires": { "@firebase/auth-interop-types": "0.1.6", - "@firebase/component": "0.5.7", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", + "@firebase/component": "0.5.13", + "@firebase/logger": "0.3.2", + "@firebase/util": "1.5.2", "faye-websocket": "0.11.4", "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - } } }, "@firebase/database-compat": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.2.tgz", - "integrity": "sha512-sV32QIRSNIBj/6OYtpmPzA/SfQz1/NBZbhxg9dIhGaSt9e5HaMxXRuz2lImudX0Sd/v8DKdExrxa++K6rKrRtA==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.8.tgz", + "integrity": "sha512-dhXr5CSieBuKNdU96HgeewMQCT9EgOIkfF1GNy+iRrdl7BWLxmlKuvLfK319rmIytSs/vnCzcD9uqyxTeU/A3A==", "dev": true, "requires": { - "@firebase/component": "0.5.7", - "@firebase/database": "0.12.2", - "@firebase/database-types": "0.9.1", - "@firebase/logger": "0.3.0", - "@firebase/util": "1.4.0", + "@firebase/component": "0.5.13", + "@firebase/database": "0.12.8", + "@firebase/database-types": "0.9.7", + "@firebase/logger": "0.3.2", + "@firebase/util": "1.5.2", "tslib": "^2.1.0" - }, - "dependencies": { - "@firebase/database-types": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz", - "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==", - "dev": true, - "requires": { - "@firebase/app-types": "0.7.0", - "@firebase/util": "1.4.0" - } - }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - } } }, "@firebase/database-types": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz", - "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==", + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.7.tgz", + "integrity": "sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw==", "dev": true, "requires": { - "@firebase/app-types": "0.6.3" - }, - "dependencies": { - "@firebase/app-types": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz", - "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw==", - "dev": true - } + "@firebase/app-types": "0.7.0", + "@firebase/util": "1.5.2" } }, "@firebase/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.2.tgz", + "integrity": "sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==", "dev": true, "requires": { "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - } } }, "@firebase/util": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz", - "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.5.2.tgz", + "integrity": "sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw==", "dev": true, "requires": { "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - } - } - }, - "@google-cloud/common": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.6.0.tgz", - "integrity": "sha512-aHIFTqJZmeTNO9md8XxV+ywuvXF3xBm5WNmgWeeCK+XN5X+kGW0WEX94wGwj+/MdOnrVf4dL2RvSIt9J5yJG6Q==", - "dev": true, - "optional": true, - "requires": { - "@google-cloud/projectify": "^2.0.0", - "@google-cloud/promisify": "^2.0.0", - "arrify": "^2.0.1", - "duplexify": "^4.1.1", - "ent": "^2.2.0", - "extend": "^3.0.2", - "google-auth-library": "^7.0.2", - "retry-request": "^4.1.1", - "teeny-request": "^7.0.0" } }, "@google-cloud/firestore": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.11.0.tgz", - "integrity": "sha512-Do9WJzEkFBBB+zVFvFfrrrIFEz086lrdgKQic7XsdoTgtYtq0yMu2u3kGLyxMbdasl2c2yf49FE4YvO3AYjQMQ==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.15.1.tgz", + "integrity": "sha512-2PWsCkEF1W02QbghSeRsNdYKN1qavrHBP3m72gPDMHQSYrGULOaTi7fSJquQmAtc4iPVB2/x6h80rdLHTATQtA==", "dev": true, "optional": true, "requires": { "fast-deep-equal": "^3.1.1", "functional-red-black-tree": "^1.0.1", - "google-gax": "^2.9.2", + "google-gax": "^2.24.1", "protobufjs": "^6.8.6" } }, "@google-cloud/paginator": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz", - "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz", + "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==", "dev": true, "optional": true, "requires": { @@ -6278,91 +148,86 @@ } }, "@google-cloud/projectify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz", - "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz", + "integrity": "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ==", "dev": true, "optional": true }, "@google-cloud/promisify": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz", - "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz", + "integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA==", "dev": true, "optional": true }, "@google-cloud/storage": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.8.5.tgz", - "integrity": "sha512-i0gB9CRwQeOBYP7xuvn14M40LhHCwMjceBjxE4CTvsqL519sVY5yVKxLiAedHWGwUZHJNRa7Q2CmNfkdRwVNPg==", + "version": "5.19.4", + "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.19.4.tgz", + "integrity": "sha512-Jz7ugcPHhsEmMVvIxM9uoBsdEbKIYwDkh3u07tifsIymEWs47F4/D6+/Tv/W7kLhznqjyOjVJ/0frtBeIC0lJA==", "dev": true, "optional": true, "requires": { - "@google-cloud/common": "^3.6.0", - "@google-cloud/paginator": "^3.0.0", + "@google-cloud/paginator": "^3.0.7", + "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", + "abort-controller": "^3.0.0", "arrify": "^2.0.0", - "async-retry": "^1.3.1", + "async-retry": "^1.3.3", "compressible": "^2.0.12", - "date-and-time": "^1.0.0", + "configstore": "^5.0.0", + "date-and-time": "^2.0.0", "duplexify": "^4.0.0", + "ent": "^2.2.0", "extend": "^3.0.2", "gaxios": "^4.0.0", - "gcs-resumable-upload": "^3.1.4", "get-stream": "^6.0.0", + "google-auth-library": "^7.14.1", "hash-stream-validation": "^0.2.2", - "mime": "^2.2.0", + "mime": "^3.0.0", "mime-types": "^2.0.8", - "onetime": "^5.1.0", "p-limit": "^3.0.1", "pumpify": "^2.0.0", + "retry-request": "^4.2.2", "snakeize": "^0.1.0", - "stream-events": "^1.0.1", + "stream-events": "^1.0.4", + "teeny-request": "^7.1.3", "xdg-basedir": "^4.0.0" }, "dependencies": { "mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", "dev": true, "optional": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "optional": true, - "requires": { - "yocto-queue": "^0.1.0" - } } } }, "@grpc/grpc-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.0.tgz", - "integrity": "sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.7.tgz", + "integrity": "sha512-eBM03pu9hd3VqDQG+kHahiG1x80RGkkqqRb1Pchcwqej/KkAH95gAvKs6laqaHCycYaPK+TKuNQnOz9UXYA8qw==", "dev": true, "optional": true, "requires": { + "@grpc/proto-loader": "^0.6.4", "@types/node": ">=12.12.47" }, "dependencies": { "@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", "dev": true, "optional": true } } }, "@grpc/proto-loader": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz", - "integrity": "sha512-4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw==", + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.9.tgz", + "integrity": "sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg==", "dev": true, "optional": true, "requires": { @@ -6370,103 +235,9 @@ "lodash.camelcase": "^4.3.0", "long": "^4.0.0", "protobufjs": "^6.10.0", - "yargs": "^16.1.1" + "yargs": "^16.2.0" }, "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "optional": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "optional": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "optional": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "optional": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", @@ -6482,13 +253,6 @@ "y18n": "^5.0.5", "yargs-parser": "^20.2.2" } - }, - "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "dev": true, - "optional": true } } }, @@ -6573,9 +337,9 @@ "optional": true }, "@sinonjs/commons": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", - "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", + "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -6609,9 +373,9 @@ "dev": true }, "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, "optional": true }, @@ -6640,50 +404,55 @@ "dev": true }, "@types/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", + "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", "requires": { "@types/connect": "*", "@types/node": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + } } }, "@types/chai": { - "version": "4.2.12", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.12.tgz", - "integrity": "sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz", + "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==", "dev": true }, "@types/chai-as-promised": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", - "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz", + "integrity": "sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==", "dev": true, "requires": { "@types/chai": "*" } }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, "@types/connect": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", - "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "version": "3.4.35", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", + "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", "requires": { "@types/node": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + } } }, "@types/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==", - "requires": { - "@types/express": "*" - } + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" }, "@types/express": { "version": "4.17.3", @@ -6706,50 +475,57 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.12", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz", - "integrity": "sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==", + "version": "4.17.28", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz", + "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==", "requires": { "@types/node": "*", "@types/qs": "*", "@types/range-parser": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + } } }, "@types/express-unless": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz", - "integrity": "sha512-5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.3.tgz", + "integrity": "sha512-TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw==", "dev": true, "requires": { "@types/express": "*" } }, "@types/jsonwebtoken": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.2.tgz", - "integrity": "sha512-Mkjljd9DTpkPlrmGfTJvcP4aBU7yO2QmW7wNVhV4/6AEUxYoacqU7FJU/N0yFEHTsIrE4da3rUrjrR5ejicFmA==", + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", + "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", "dev": true, "requires": { "@types/node": "*" } }, "@types/lodash": { - "version": "4.14.161", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", - "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "version": "4.14.182", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", "dev": true }, "@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", + "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==", "dev": true, "optional": true }, "@types/mime": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "@types/mocha": { "version": "5.2.7", @@ -6758,9 +534,9 @@ "dev": true }, "@types/mock-require": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.0.tgz", - "integrity": "sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.1.tgz", + "integrity": "sha512-O7U5DVGboY/Crueb5/huUCIRjKtRVRaLmRDbZJBlDQgJn966z3aiFDN+6AtYviu2ExwMkl34LjT/IiC0OPtKuQ==", "dev": true, "requires": { "@types/node": "*" @@ -6776,9 +552,10 @@ } }, "@types/node": { - "version": "8.10.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", - "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==" + "version": "8.10.66", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", + "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", + "dev": true }, "@types/node-fetch": { "version": "3.0.3", @@ -6790,22 +567,29 @@ } }, "@types/qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==" + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" }, "@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", + "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" }, "@types/serve-static": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", - "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "version": "1.13.10", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", + "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", "requires": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" + "@types/mime": "^1", + "@types/node": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + } } }, "@types/sinon": { @@ -6815,9 +599,9 @@ "dev": true }, "abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", "dev": true }, "abort-controller": { @@ -6831,18 +615,18 @@ } }, "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" + "mime-types": "~2.1.34", + "negotiator": "0.6.3" } }, "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, "acorn-globals": { @@ -6853,6 +637,14 @@ "requires": { "acorn": "^7.1.1", "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + } } }, "acorn-walk": { @@ -6866,17 +658,15 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, - "optional": true, "requires": { "debug": "4" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "optional": true, "requires": { "ms": "2.1.2" } @@ -6885,23 +675,10 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true + "dev": true } } }, - "ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "ansi-colors": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", @@ -6909,18 +686,18 @@ "dev": true }, "ansi-regex": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "^2.0.1" } }, "any-promise": { @@ -6938,7 +715,7 @@ "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" @@ -6962,15 +739,6 @@ "dev": true, "optional": true }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, "asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", @@ -6983,35 +751,29 @@ "safer-buffer": "^2.1.0" } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" } }, "async-retry": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz", - "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz", + "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==", "dev": true, "optional": true, "requires": { - "retry": "0.12.0" + "retry": "0.13.1" } }, "asynckit": { @@ -7020,22 +782,10 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", - "dev": true - }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "base64-js": { @@ -7045,19 +795,10 @@ "dev": true, "optional": true }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "bignumber.js": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", - "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz", + "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==", "dev": true, "optional": true }, @@ -7068,26 +809,28 @@ "dev": true }, "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", "requires": { - "bytes": "3.1.0", + "bytes": "3.1.2", "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" } }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -7109,7 +852,7 @@ "browser-stdout": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, "buffer-equal-constant-time": { @@ -7125,9 +868,18 @@ "dev": true }, "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } }, "camelcase": { "version": "5.3.1", @@ -7135,23 +887,18 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", "dev": true, "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", "deep-eql": "^3.0.1", "get-func-name": "^2.0.0", - "pathval": "^1.1.0", + "loupe": "^2.3.1", + "pathval": "^1.1.1", "type-detect": "^4.0.5" } }, @@ -7175,10 +922,28 @@ "supports-color": "^5.3.0" }, "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "supports-color": { @@ -7210,57 +975,30 @@ } }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "optional": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "combined-stream": { @@ -7273,9 +1011,9 @@ } }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "compressible": { @@ -7286,15 +1024,6 @@ "optional": true, "requires": { "mime-db": ">= 1.43.0 < 2" - }, - "dependencies": { - "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", - "dev": true, - "optional": true - } } }, "concat-map": { @@ -7319,38 +1048,32 @@ } }, "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "5.2.1" } }, "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=" + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, "cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha1-6sEdpRWS3Ya58G9uesKTs9+HXSk=", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "requires": { "object-assign": "^4", "vary": "^1" @@ -7402,15 +1125,6 @@ } } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "data-urls": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", @@ -7420,19 +1134,47 @@ "abab": "^2.0.3", "whatwg-mimetype": "^2.3.0", "whatwg-url": "^8.0.0" + }, + "dependencies": { + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, + "whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } + } } }, "date-and-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-1.0.0.tgz", - "integrity": "sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-2.3.1.tgz", + "integrity": "sha512-OaIRmSJXifwEN21rMVVDs0Kz8uhJ3wWPYd86atkRiqN54liaMQYEbbrgjZQea75YXOBWL4ZFb3rG/waenw1TEg==", "dev": true, "optional": true }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } @@ -7444,9 +1186,9 @@ "dev": true }, "decimal.js": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", - "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", + "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", "dev": true }, "deep-eql": { @@ -7458,19 +1200,34 @@ "type-detect": "^4.0.0" } }, + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" } }, "delayed-stream": { @@ -7480,28 +1237,28 @@ "dev": true }, "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" }, "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "dicer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", - "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.1.tgz", + "integrity": "sha512-ObioMtXnmjYs3aRtpIJt9rgQSPCIhKVkFPip+E9GUDyWl8N435znUxK/JfNwGZJ2wnn5JKQ7Ly3vOK5Q5dylGA==", "dev": true, "requires": { - "streamsearch": "0.1.2" + "streamsearch": "^1.1.0" } }, "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "domexception": { @@ -7532,9 +1289,9 @@ } }, "duplexify": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", - "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", + "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==", "dev": true, "optional": true, "requires": { @@ -7544,16 +1301,6 @@ "stream-shift": "^1.0.0" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -7581,20 +1328,12 @@ "inherits": "^2.0.4", "minimalistic-assert": "^1.0.1", "minimalistic-crypto-utils": "^1.0.1" - }, - "dependencies": { - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - } } }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "encodeurl": { @@ -7620,22 +1359,45 @@ "optional": true }, "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz", + "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==", "dev": true, "requires": { + "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "dependencies": { + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "es-to-primitive": { @@ -7667,6 +1429,19 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dev": true, + "requires": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, "eslint-plugin-prettier": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", @@ -7677,16 +1452,22 @@ "jest-docblock": "^21.0.0" } }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, "etag": { @@ -7702,37 +1483,38 @@ "optional": true }, "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.0.tgz", + "integrity": "sha512-EJEXxiTQJS3lIPrU1AE2vRuT7X7E+0KBbpm5GSoK524yl0K8X+er8zS2P14E64eqsVNoWbMCT7MpmQ+ErAhgRg==", "requires": { - "accepts": "~1.3.7", + "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.0", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "2.0.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "finalhandler": "1.2.0", "fresh": "0.5.2", + "http-errors": "2.0.0", "merge-descriptors": "1.0.1", "methods": "~1.1.2", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" @@ -7741,20 +1523,16 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, + "optional": true }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "optional": true }, "fast-diff": { "version": "1.2.0", @@ -7762,12 +1540,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -7791,16 +1563,16 @@ } }, "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", - "statuses": "~1.5.0", + "statuses": "2.0.1", "unpipe": "~1.0.0" } }, @@ -7814,68 +1586,54 @@ } }, "firebase-admin": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.0.0.tgz", - "integrity": "sha512-EOAk5ZaqXhBBvx9ZyXd28kw8glMTt3xl0g3BepGRCy0RSSUPGOzfAqjGhc65guSKgFOpT5mAUycYcJbqullKUQ==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.1.0.tgz", + "integrity": "sha512-4i4wu+EFgNfY4+D4DxXkZcmbD832ozUMNvHMkOFQrf8upyp51n6jrDJS+wLok9sd62yeqcImbnsLOympGlISPA==", "dev": true, "requires": { "@firebase/database-compat": "^0.1.1", - "@firebase/database-types": "^0.7.2", - "@google-cloud/firestore": "^4.5.0", - "@google-cloud/storage": "^5.3.0", + "@firebase/database-types": "^0.9.3", + "@google-cloud/firestore": "^4.15.1", + "@google-cloud/storage": "^5.18.3", "@types/node": ">=12.12.47", "dicer": "^0.3.0", "jsonwebtoken": "^8.5.1", "jwks-rsa": "^2.0.2", - "node-forge": "^0.10.0" + "node-forge": "^1.3.1" }, "dependencies": { "@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", "dev": true } } }, "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz", + "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==", "dev": true, "requires": { - "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true - } + "is-buffer": "~2.0.3" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fresh": { "version": "0.5.2", @@ -7891,8 +1649,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -7901,10 +1658,16 @@ "dev": true, "optional": true }, + "functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true + }, "gaxios": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.2.1.tgz", - "integrity": "sha512-s+rTywpw6CmfB8r9TXYkpix7YFeuRjnR/AqhaJrQqsNhsAqej+IAiCc3hadzQH3gHyWth30tvYjxH8EVjQt/8Q==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz", + "integrity": "sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==", "dev": true, "optional": true, "requires": { @@ -7912,13 +1675,13 @@ "extend": "^3.0.2", "https-proxy-agent": "^5.0.0", "is-stream": "^2.0.0", - "node-fetch": "^2.3.0" + "node-fetch": "^2.6.7" } }, "gcp-metadata": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz", - "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz", + "integrity": "sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==", "dev": true, "optional": true, "requires": { @@ -7926,22 +1689,6 @@ "json-bigint": "^1.0.0" } }, - "gcs-resumable-upload": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.4.tgz", - "integrity": "sha512-5dyDfHrrVcIskiw/cPssVD4HRiwoHjhk1Nd6h5W3pQ/qffDvhfy4oNCr1f3ZXFPwTnxkCbibsB+73oOM+NvmJQ==", - "dev": true, - "optional": true, - "requires": { - "abort-controller": "^3.0.0", - "configstore": "^5.0.0", - "extend": "^3.0.2", - "gaxios": "^4.0.0", - "google-auth-library": "^7.0.0", - "pumpify": "^2.0.0", - "stream-events": "^1.0.4" - } - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -7954,6 +1701,16 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -7961,19 +1718,20 @@ "dev": true, "optional": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" } }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -7985,9 +1743,9 @@ } }, "google-auth-library": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.4.tgz", - "integrity": "sha512-o8irYyeijEiecTXeoEe8UKNEzV1X+uhR4b2oNdapDMZixypp0J+eHimGOyx5Joa3UAeokGngdtDLXtq9vDqG2Q==", + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz", + "integrity": "sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==", "dev": true, "optional": true, "requires": { @@ -8002,29 +1760,6 @@ "lru-cache": "^6.0.0" }, "dependencies": { - "jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "requires": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -8045,84 +1780,60 @@ } }, "google-gax": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.12.0.tgz", - "integrity": "sha512-UDx4ZZx85vXBe6GZ0sdRSzuegLrRQdRjCxlauX+U7i5YwOoSgcSaIM71BhcdHwGPhEkvO/SSHrEfc1wpL/J6JA==", + "version": "2.30.2", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.30.2.tgz", + "integrity": "sha512-BCNCT26kb0iC52zj2SosyOZMhI5sVfXuul1h0Aw5uT9nGAbmS5eOvQ49ft53ft6XotDj11sUSDV6XESEiQqCqg==", "dev": true, "optional": true, "requires": { - "@grpc/grpc-js": "~1.3.0", + "@grpc/grpc-js": "~1.6.0", "@grpc/proto-loader": "^0.6.1", "@types/long": "^4.0.0", "abort-controller": "^3.0.0", "duplexify": "^4.0.0", "fast-text-encoding": "^1.0.3", - "google-auth-library": "^7.0.2", + "google-auth-library": "^7.14.0", "is-stream-ended": "^0.1.4", "node-fetch": "^2.6.1", - "object-hash": "^2.1.1", - "protobufjs": "^6.10.2", + "object-hash": "^3.0.0", + "proto3-json-serializer": "^0.1.8", + "protobufjs": "6.11.2", "retry-request": "^4.0.0" } }, "google-p12-pem": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz", - "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz", + "integrity": "sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==", "dev": true, "optional": true, "requires": { - "node-forge": "^0.10.0" + "node-forge": "^1.3.1" } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true, "optional": true }, "growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4=", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, "gtoken": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz", - "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz", + "integrity": "sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==", "dev": true, "optional": true, "requires": { "gaxios": "^4.0.0", - "google-p12-pem": "^3.0.3", + "google-p12-pem": "^3.1.3", "jws": "^4.0.0" - }, - "dependencies": { - "jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "dev": true, - "optional": true, - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "dev": true, - "optional": true, - "requires": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - } } }, "handlebars": { @@ -8138,37 +1849,49 @@ "wordwrap": "^1.0.0" } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" + "get-intrinsic": "^1.1.1" } }, - "has": { + "has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "has-symbols": "^1.0.2" } }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, "hash-stream-validation": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", @@ -8213,39 +1936,39 @@ } }, "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" } }, "http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", + "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", "dev": true }, "http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "optional": true, "requires": { - "@tootallnate/once": "1", + "@tootallnate/once": "2", "agent-base": "6", "debug": "4" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "optional": true, "requires": { @@ -8261,34 +1984,21 @@ } } }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, - "optional": true, "requires": { "agent-base": "6", "debug": "4" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "optional": true, "requires": { "ms": "2.1.2" } @@ -8297,8 +2007,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true + "dev": true } } }, @@ -8328,51 +2037,106 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true + "internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } }, "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "is-bigint": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "requires": { + "has-bigints": "^1.0.1" + } + }, + "is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", "dev": true }, "is-callable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", - "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, + "is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, + "is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -8381,24 +2145,34 @@ "optional": true }, "is-potential-custom-element-name": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", - "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "dev": true }, "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" } }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, "optional": true }, @@ -8409,19 +2183,44 @@ "dev": true, "optional": true }, + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true, + "optional": true + }, + "is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "isexe": { @@ -8430,12 +2229,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "jest-docblock": { "version": "21.2.0", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", @@ -8458,81 +2251,107 @@ "dev": true }, "js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", - "dev": true - } } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "jsdom": { - "version": "16.4.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", - "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", "dev": true, "requires": { - "abab": "^2.0.3", - "acorn": "^7.1.1", + "abab": "^2.0.5", + "acorn": "^8.2.4", "acorn-globals": "^6.0.0", "cssom": "^0.4.4", - "cssstyle": "^2.2.0", + "cssstyle": "^2.3.0", "data-urls": "^2.0.0", - "decimal.js": "^10.2.0", + "decimal.js": "^10.2.1", "domexception": "^2.0.1", - "escodegen": "^1.14.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", "html-encoding-sniffer": "^2.0.1", - "is-potential-custom-element-name": "^1.0.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", "nwsapi": "^2.2.0", - "parse5": "5.1.1", - "request": "^2.88.2", - "request-promise-native": "^1.0.8", - "saxes": "^5.0.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", "symbol-tree": "^3.2.4", - "tough-cookie": "^3.0.1", + "tough-cookie": "^4.0.0", "w3c-hr-time": "^1.0.2", "w3c-xmlserializer": "^2.0.0", "webidl-conversions": "^6.1.0", "whatwg-encoding": "^1.0.5", "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0", - "ws": "^7.2.3", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", "xml-name-validator": "^3.0.0" }, "dependencies": { - "escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true + }, + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { - "esprima": "^4.0.1", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "ms": "2.1.2" } }, - "esprima": { + "http-proxy-agent": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true + }, + "whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } } } }, @@ -8546,18 +2365,6 @@ "bignumber.js": "^9.0.0" } }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -8588,10 +2395,31 @@ "semver": "^5.6.0" }, "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "semver": { @@ -8602,29 +2430,18 @@ } } }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "just-extend": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", - "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", + "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, "jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", "dev": true, + "optional": true, "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.11", @@ -8643,22 +2460,22 @@ } }, "jwks-rsa": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.0.3.tgz", - "integrity": "sha512-/rkjXRWAp0cS00tunsHResw68P5iTQru8+jHufLNv3JHc4nObFEndfEUSuPugh09N+V9XYxKUqi7QrkmCHSSSg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.0.tgz", + "integrity": "sha512-GKOSDBWWBCiQTzawei6mEdRQvji5gecj8F9JwMt0ZOPnBPSmTjo5CKFvvbhE7jGPkU159Cpi0+OTLuABFcNOQQ==", "dev": true, "requires": { "@types/express-jwt": "0.0.42", - "debug": "^4.1.0", + "debug": "^4.3.4", "jose": "^2.0.5", "limiter": "^1.1.5", - "lru-memoizer": "^2.1.2" + "lru-memoizer": "^2.1.4" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -8673,12 +2490,13 @@ } }, "jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", "dev": true, + "optional": true, "requires": { - "jwa": "^1.4.1", + "jwa": "^2.0.0", "safe-buffer": "^5.0.1" } }, @@ -8699,9 +2517,9 @@ "dev": true }, "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, "locate-path": { @@ -8774,12 +2592,6 @@ "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", "dev": true }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -8802,10 +2614,19 @@ "dev": true, "optional": true }, + "loupe": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", + "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "dev": true, + "requires": { + "get-func-name": "^2.0.0" + } + }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { "pseudomap": "^1.0.2", @@ -8892,25 +2713,18 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "requires": { - "mime-db": "1.40.0" + "mime-db": "1.52.0" } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "optional": true - }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -8926,7 +2740,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -8939,9 +2753,9 @@ "dev": true }, "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", "dev": true, "requires": { "minimist": "^1.2.5" @@ -8984,6 +2798,41 @@ "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -8993,16 +2842,16 @@ "ms": "^2.1.1" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "js-yaml": { @@ -9015,33 +2864,12 @@ "esprima": "^4.0.0" } }, - "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -9062,13 +2890,15 @@ "ansi-regex": "^4.1.0" } }, - "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" } }, "y18n": { @@ -9094,6 +2924,16 @@ "y18n": "^4.0.0", "yargs-parser": "^13.1.2" } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -9132,9 +2972,9 @@ } }, "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, "neo-async": { "version": "2.6.2", @@ -9155,12 +2995,6 @@ "path-to-regexp": "^1.7.0" }, "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, "lolex": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", @@ -9199,26 +3033,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { - "ms": "^2.1.1" - } - }, - "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "ms": "2.1.2" } }, "ms": { @@ -9257,39 +3077,14 @@ "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, "requires": { "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } } }, "node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true }, "node-version": { @@ -9313,38 +3108,31 @@ "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", - "dev": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-hash": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", - "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", "dev": true, "optional": true }, "object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, "object-keys": { @@ -9354,53 +3142,32 @@ "dev": true }, "object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.18.0-next.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", - "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" } }, "object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz", + "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==", "dev": true, "requires": { + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "es-abstract": "^1.19.1" } }, "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "requires": { "ee-first": "1.1.1" } @@ -9414,63 +3181,28 @@ "wrappy": "1" } }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "optional": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "onigasm": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz", - "integrity": "sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==", - "dev": true, - "requires": { - "lru-cache": "^5.1.1" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } - } - }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "word-wrap": "~1.2.3" } }, "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "optional": true, "requires": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { @@ -9480,6 +3212,17 @@ "dev": true, "requires": { "p-limit": "^2.0.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + } } }, "p-try": { @@ -9489,9 +3232,9 @@ "dev": true }, "parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, "parseurl": { @@ -9512,9 +3255,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { @@ -9528,12 +3271,6 @@ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -9554,6 +3291,15 @@ "ms": "^2.1.1" } }, + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -9592,6 +3338,16 @@ "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", "dev": true }, + "proto3-json-serializer": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.8.tgz", + "integrity": "sha512-ACilkB6s1U1gWnl5jtICpnDai4VCxmI9GFxuEaYdxtDG2oVI3sVFIUsvUZcQbJgtPM6p+zqKbjTKQZp6Y4FpQw==", + "dev": true, + "optional": true, + "requires": { + "protobufjs": "^6.11.2" + } + }, "protobufjs": { "version": "6.11.2", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", @@ -9615,21 +3371,21 @@ }, "dependencies": { "@types/node": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz", - "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", "dev": true, "optional": true } } }, "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" } }, "pseudomap": { @@ -9670,13 +3426,16 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "requires": { + "side-channel": "^1.0.4" + } }, "range-parser": { "version": "1.2.1", @@ -9684,12 +3443,12 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", + "bytes": "3.1.2", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } @@ -9707,13 +3466,14 @@ } }, "regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", + "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", "dev": true, "requires": { + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "functions-have-names": "^1.2.2" } }, "remove-trailing-separator": { @@ -9722,90 +3482,6 @@ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - } - } - }, - "request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, - "request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "dev": true, - "requires": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "dependencies": { - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - } - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -9818,27 +3494,39 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "resolve": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "dev": true, + "requires": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, "optional": true }, "retry-request": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz", - "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz", + "integrity": "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==", "dev": true, "optional": true, "requires": { - "debug": "^4.1.1" + "debug": "^4.1.1", + "extend": "^3.0.2" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "optional": true, "requires": { @@ -9855,14 +3543,14 @@ } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "saxes": { "version": "5.0.1", @@ -9874,9 +3562,9 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -9900,41 +3588,41 @@ } }, "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "2.0.0", "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", + "ms": "2.1.3", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "dependencies": { "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" } } }, "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.1" + "send": "0.18.0" } }, "set-blocking": { @@ -9944,25 +3632,35 @@ "dev": true }, "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "shiki": { - "version": "0.9.12", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.12.tgz", - "integrity": "sha512-VXcROdldv0/Qu0w2XvzU4IrvTeBNs/Kj/FCmtcEXGz7Tic/veQzliJj6tEiAgoKianhQstpYmbPDStHU5Opqcw==", + "version": "0.9.15", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz", + "integrity": "sha512-/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", - "onigasm": "^2.2.5", + "vscode-oniguruma": "^1.6.1", "vscode-textmate": "5.2.0" } }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, "optional": true }, @@ -9981,12 +3679,6 @@ "supports-color": "^5.5.0" }, "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -10017,33 +3709,10 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, "stream-events": { "version": "1.0.5", @@ -10063,67 +3732,59 @@ "optional": true }, "streamsearch": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", - "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "dev": true }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "optional": true, "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "optional": true - } + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, - "string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, - "string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "optional": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "safe-buffer": "~5.2.0" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.1" } }, "strip-json-comments": { @@ -10139,6 +3800,21 @@ "dev": true, "optional": true }, + "supports-color": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", + "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -10146,13 +3822,13 @@ "dev": true }, "teeny-request": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz", - "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz", + "integrity": "sha512-SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw==", "dev": true, "optional": true, "requires": { - "http-proxy-agent": "^4.0.0", + "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", "stream-events": "^1.0.5", @@ -10178,29 +3854,25 @@ } }, "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", "dev": true, "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" } }, "tr46": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", - "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" }, "ts-node": { "version": "10.7.0", @@ -10223,12 +3895,6 @@ "yn": "3.1.1" }, "dependencies": { - "acorn": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", - "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", - "dev": true - }, "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -10244,9 +3910,9 @@ } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, "tslint": { @@ -10276,20 +3942,17 @@ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, - "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true } } }, @@ -10308,10 +3971,16 @@ "tsutils": "^3.0.0" }, "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "tsutils": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", - "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, "requires": { "tslib": "^1.8.1" @@ -10328,6 +3997,14 @@ "eslint-plugin-prettier": "^2.2.0", "lines-and-columns": "^1.1.6", "tslib": "^1.7.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "tsutils": { @@ -10337,23 +4014,16 @@ "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -10428,18 +4098,30 @@ "dev": true }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", + "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, "uglify-js": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz", - "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==", + "version": "3.15.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz", + "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==", "dev": true, "optional": true }, + "unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + } + }, "unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -10450,20 +4132,17 @@ "crypto-random-string": "^2.0.0" } }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, - "uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -10484,9 +4163,9 @@ "optional": true }, "v8-compile-cache-lib": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", - "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, "vary": { @@ -10494,16 +4173,11 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } + "vscode-oniguruma": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", + "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==", + "dev": true }, "vscode-textmate": { "version": "5.2.0", @@ -10530,10 +4204,9 @@ } }, "webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "websocket-driver": { "version": "0.7.4", @@ -10568,25 +4241,36 @@ "dev": true }, "whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^2.0.2", - "webidl-conversions": "^6.1.0" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" } }, + "which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "requires": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + } + }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", @@ -10600,53 +4284,65 @@ "dev": true, "requires": { "string-width": "^1.0.2 || 2" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "strip-ansi": "^4.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^3.0.0" } } } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -10667,11 +4363,10 @@ } }, "ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", - "dev": true, - "requires": {} + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", + "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", + "dev": true }, "xdg-basedir": { "version": "4.0.0", @@ -10724,22 +4419,6 @@ "yargs-parser": "^18.1.2" }, "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -10751,27 +4430,6 @@ "wrap-ansi": "^6.2.0" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -10782,12 +4440,6 @@ "path-exists": "^4.0.0" } }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -10797,6 +4449,15 @@ "p-locate": "^4.1.0" } }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -10812,26 +4473,6 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -10862,14 +4503,11 @@ } }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "optional": true }, "yargs-unparser": { "version": "1.6.0", @@ -10888,6 +4526,53 @@ "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -10908,6 +4593,17 @@ "ansi-regex": "^4.1.0" } }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, "y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", @@ -10931,6 +4627,16 @@ "y18n": "^4.0.0", "yargs-parser": "^13.1.2" } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, diff --git a/package.json b/package.json index dc47fb24e..f8cb58477 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,8 @@ "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js", "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js", - "./v2/eventarc": "./lib/v2/providers/eventarc.js" + "./v2/eventarc": "./lib/v2/providers/eventarc.js", + "./v2/identity": "./lib/v2/providers/identity.js" }, "typesVersions": { "*": { @@ -128,6 +129,9 @@ "v2/eventarc": [ "lib/v2/providers/eventarc" ], + "v2/identity": [ + "lib/v2/providers/identity" + ], "v2/options": [ "lib/v2/options" ], @@ -186,7 +190,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", - "firebase-admin": "10.0.0", + "firebase-admin": "^10.1.0", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", "jsonwebtoken": "^8.5.1", diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts index 617f0f859..046ffa8b3 100644 --- a/spec/common/providers/identity.spec.ts +++ b/spec/common/providers/identity.spec.ts @@ -22,106 +22,12 @@ import { expect } from 'chai'; import * as express from 'express'; -import * as jwt from 'jsonwebtoken'; -import * as sinon from 'sinon'; import * as identity from '../../../src/common/providers/identity'; -const PROJECT = 'my-project'; const EVENT = 'EVENT_TYPE'; -const VALID_URL = `https://us-central1-${PROJECT}.cloudfunctions.net/function-1`; const now = new Date(); describe('identity', () => { - describe('invalidPublicKeys', () => { - it('should return true if publicKeysExpireAt does not exist', () => { - expect( - identity.invalidPublicKeys({ - publicKeys: {}, - }) - ).to.be.true; - }); - - it('should return true if publicKeysExpireAt are less than equals Date.now() plus a buffer', () => { - const time = Date.now(); - expect( - identity.invalidPublicKeys( - { - publicKeys: {}, - publicKeysExpireAt: time, - }, - time - ) - ).to.be.true; - }); - - it('should return false if publicKeysExpireAt are greater than Date.now() plus a buffer', () => { - const time = Date.now(); - expect( - identity.invalidPublicKeys( - { - publicKeys: {}, - publicKeysExpireAt: time + identity.INVALID_TOKEN_BUFFER + 60000, - }, - time - ) - ).to.be.false; - }); - }); - - describe('setKeyExpirationTime', () => { - const time = Date.now(); - - it('should do nothing without cache-control', async () => { - const publicKeysCache = { - publicKeys: {}, - publicKeysExpireAt: undefined, - }; - const headers = new Map(); - const response = { - headers, - }; - - await identity.setKeyExpirationTime(response, publicKeysCache, time); - - expect(publicKeysCache.publicKeysExpireAt).to.be.undefined; - }); - - it('should do nothing with cache-control but without max-age', async () => { - const publicKeysCache = { - publicKeys: {}, - publicKeysExpireAt: undefined, - }; - const headers = new Map(); - headers.set('cache-control', 'item=val, item2=val2, item3=val3'); - const response = { - headers, - }; - - await identity.setKeyExpirationTime(response, publicKeysCache, time); - - expect(publicKeysCache.publicKeysExpireAt).to.be.undefined; - }); - - it('should set the correctly set the expiration time', async () => { - const publicKeysCache = { - publicKeys: {}, - publicKeysExpireAt: undefined, - }; - const headers = new Map(); - headers.set( - 'cache-control', - 'item=val, max-age=50, item2=val2, item3=val3' - ); - const response = { - headers, - }; - - await identity.setKeyExpirationTime(response, publicKeysCache, time); - - expect(publicKeysCache.publicKeysExpireAt).to.equal(time + 50 * 1000); - }); - }); - describe('userRecordConstructor', () => { it('will provide falsey values for fields that are not in raw wire data', () => { const record = identity.userRecordConstructor({ uid: '123' }); @@ -271,301 +177,6 @@ describe('identity', () => { }); }); - describe('getPublicKeyFromHeader', () => { - it('should throw if header.alg is not expected', () => { - expect(() => - identity.getPublicKeyFromHeader({ alg: 'RS128' }, {}) - ).to.throw( - `Provided JWT has incorrect algorithm. Expected ${identity.JWT_ALG} but got RS128.` - ); - }); - - it('should throw if header.kid is undefined', () => { - expect(() => - identity.getPublicKeyFromHeader({ alg: identity.JWT_ALG }, {}) - ).to.throw('JWT header missing "kid" claim.'); - }); - - it('should throw if the public keys do not have a property that matches header.kid', () => { - expect(() => - identity.getPublicKeyFromHeader( - { - alg: identity.JWT_ALG, - kid: '123456', - }, - {} - ) - ).to.throw( - 'Provided JWT has "kid" claim which does not correspond to a known public key. Most likely the JWT is expired.' - ); - }); - - it('should return the correct public key', () => { - expect( - identity.getPublicKeyFromHeader( - { - alg: identity.JWT_ALG, - kid: '123456', - }, - { - 123456: '7890', - 2468: '1357', - } - ) - ).to.eq('7890'); - }); - }); - - describe('isAuthorizedCloudFunctionURL', () => { - it('should return false on a bad gcf location', () => { - expect( - identity.isAuthorizedCloudFunctionURL( - `https://us-central1-europe-${PROJECT}.cloudfunctions.net/function-1`, - PROJECT - ) - ).to.be.false; - }); - - it('should return false on a bad project', () => { - expect( - identity.isAuthorizedCloudFunctionURL( - `https://us-central1-${PROJECT}-old.cloudfunctions.net/function-1`, - PROJECT - ) - ).to.be.false; - }); - - it('should return true on a good url', () => { - expect(identity.isAuthorizedCloudFunctionURL(VALID_URL, PROJECT)).to.be - .true; - }); - }); - - describe('checkDecodedToken', () => { - it('should throw on mismatching event types', () => { - expect(() => - identity.checkDecodedToken( - { - event_type: EVENT, - } as identity.DecodedPayload, - 'newEvent', - PROJECT - ) - ).to.throw(`Expected "newEvent" but received "${EVENT}".`); - }); - it('should throw on unauthorized function url', () => { - expect(() => - identity.checkDecodedToken( - { - aud: `fake-region-${PROJECT}.cloudfunctions.net/fn1`, - event_type: EVENT, - } as identity.DecodedPayload, - EVENT, - PROJECT - ) - ).to.throw('Provided JWT has incorrect "aud" (audience) claim.'); - }); - - it('should throw on a bad iss property', () => { - expect(() => - identity.checkDecodedToken( - { - aud: VALID_URL, - iss: `https://someissuer.com/a-project`, - event_type: EVENT, - } as identity.DecodedPayload, - EVENT, - PROJECT - ) - ).to.throw( - `Provided JWT has incorrect "iss" (issuer) claim. Expected "${identity.JWT_ISSUER}${PROJECT}" but got "https://someissuer.com/a-project".` - ); - }); - - it('should throw if sub is not a string', () => { - expect(() => - identity.checkDecodedToken( - ({ - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - sub: { - key: 'val', - }, - event_type: EVENT, - } as unknown) as identity.DecodedPayload, - EVENT, - PROJECT - ) - ).to.throw('Provided JWT has no "sub" (subject) claim.'); - }); - - it('should throw if sub is empty', () => { - expect(() => - identity.checkDecodedToken( - { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - sub: '', - event_type: EVENT, - } as identity.DecodedPayload, - EVENT, - PROJECT - ) - ).to.throw('Provided JWT has no "sub" (subject) claim.'); - }); - - it('should throw if sub length is larger than 128 chars', () => { - const str = 'a'.repeat(129); - expect(() => - identity.checkDecodedToken( - { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - sub: str.toString(), - event_type: EVENT, - } as identity.DecodedPayload, - EVENT, - PROJECT - ) - ).to.throw( - 'Provided JWT has "sub" (subject) claim longer than 128 characters.' - ); - }); - - it('should not throw an error and set uid to sub', () => { - expect(() => { - const sub = '123456'; - const decoded = { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - sub, - event_type: EVENT, - } as identity.DecodedPayload; - - identity.checkDecodedToken(decoded, EVENT, PROJECT); - - expect(decoded.uid).to.equal(sub); - }).to.not.throw(); - }); - }); - - describe('decodeJWT', () => { - let jwtDecodeStub: sinon.SinonStub; - - beforeEach(() => { - jwtDecodeStub = sinon - .stub(jwt, 'decode') - .throws('Unexpected call to jwt.decode'); - }); - - afterEach(() => { - sinon.verifyAndRestore(); - }); - - it('should throw HttpsError if jwt.decode errors', () => { - jwtDecodeStub.throws('An internal decode error occurred.'); - - expect(() => identity.decodeJWT('123456')).to.throw( - 'Failed to decode the JWT.' - ); - }); - - it('should error if jwt decoded returns undefined', () => { - jwtDecodeStub.returns(undefined); - - expect(() => identity.decodeJWT('123456')).to.throw( - 'The decoded JWT is not structured correctly.' - ); - }); - - it('should error if decoded jwt does not have a payload field', () => { - jwtDecodeStub.returns({ - header: { key: 'val' }, - }); - - expect(() => identity.decodeJWT('123456')).to.throw( - 'The decoded JWT is not structured correctly.' - ); - }); - - it('should return the raw decoded jwt', () => { - const decoded = { - header: { key: 'val' }, - payload: { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - event_type: EVENT, - }, - }; - jwtDecodeStub.returns(decoded); - - expect(identity.decodeJWT('123456')).to.deep.equal(decoded); - }); - }); - - describe('shouldVerifyJWT', () => { - /** Stub test that will fail when we eventually change the function */ - it('should return true', () => { - expect(identity.shouldVerifyJWT()).to.be.true; - }); - }); - - describe('verifyJWT', () => { - const time = Date.now(); - let jwtVerifyStub: sinon.SinonStub; - const keysCache = { - publicKeys: { - 123456: '7890', - 2468: '1357', - }, - publicKeysExpireAt: time + identity.INVALID_TOKEN_BUFFER + 10000, - }; - const rawDecodedJWT = { - header: { - alg: identity.JWT_ALG, - kid: '2468', - }, - payload: { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - event_type: EVENT, - }, - }; - - beforeEach(() => { - jwtVerifyStub = sinon - .stub(jwt, 'verify') - .throws('Unexpected call to jwt.verify'); - }); - - afterEach(() => { - sinon.verifyAndRestore(); - }); - - it('should error if header does not exist', () => { - const rawDecodedJwt = { payload: 'val' }; - - expect(() => - identity.verifyJWT('123456', rawDecodedJwt, keysCache, time) - ).to.throw( - 'Unable to verify JWT payload, the decoded JWT does not have a header property.' - ); - }); - - it('should return the decoded jwt', () => { - const decoded = { - aud: VALID_URL, - iss: `${identity.JWT_ISSUER}${PROJECT}`, - event_type: EVENT, - }; - jwtVerifyStub.returns(decoded); - - expect( - identity.verifyJWT('123456', rawDecodedJWT, keysCache, time) - ).to.deep.equal(decoded); - }); - }); - describe('parseMetadata', () => { const decodedMetadata = { last_sign_in_time: 1476235905, diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index 4a4a6df70..5accb339e 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -80,6 +80,7 @@ export function generateIdToken(projectId: string): string { algorithm: 'RS256', header: { kid: mockKey.key_id, + alg: 'RS256', }, }; return jwt.sign(claims, mockKey.private_key, options); diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts index 8659a1967..91e394bc7 100644 --- a/spec/v1/providers/auth.spec.ts +++ b/spec/v1/providers/auth.spec.ts @@ -135,6 +135,182 @@ describe('Auth Functions', () => { }); }); + describe('beforeCreate', () => { + it('should create the function without options', () => { + const fn = auth.user().beforeCreate((u, c) => Promise.resolve()); + + expect(fn.__trigger).to.deep.equal({ + labels: {}, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + labels: {}, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should create the function with options', () => { + const fn = functions + .region('us-east1') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .auth.user({ + blockingOptions: { + accessToken: true, + refreshToken: false, + }, + }) + .beforeCreate((u, c) => Promise.resolve()); + + expect(fn.__trigger).to.deep.equal({ + labels: {}, + regions: ['us-east1'], + availableMemoryMb: 256, + timeout: '90s', + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate', + options: { + accessToken: true, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + labels: {}, + region: ['us-east1'], + availableMemoryMb: 256, + timeoutSeconds: 90, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate', + options: { + accessToken: true, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + }); + + describe('beforeSignIn', () => { + it('should create the function without options', () => { + const fn = auth.user().beforeSignIn((u, c) => Promise.resolve()); + + expect(fn.__trigger).to.deep.equal({ + labels: {}, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + labels: {}, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should create the function with options', () => { + const fn = functions + .region('us-east1') + .runWith({ + timeoutSeconds: 90, + memory: '256MB', + }) + .auth.user({ + blockingOptions: { + accessToken: true, + refreshToken: false, + }, + }) + .beforeSignIn((u, c) => Promise.resolve()); + + expect(fn.__trigger).to.deep.equal({ + labels: {}, + regions: ['us-east1'], + availableMemoryMb: 256, + timeout: '90s', + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn', + options: { + accessToken: true, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv1', + labels: {}, + region: ['us-east1'], + availableMemoryMb: 256, + timeoutSeconds: 90, + blockingTrigger: { + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn', + options: { + accessToken: true, + idToken: false, + refreshToken: false, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + }); + describe('#_dataConstructor', () => { let cloudFunctionDelete: CloudFunction; diff --git a/spec/v2/providers/identity.spec.ts b/spec/v2/providers/identity.spec.ts new file mode 100644 index 000000000..4c8b19d3d --- /dev/null +++ b/spec/v2/providers/identity.spec.ts @@ -0,0 +1,277 @@ +// 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. +import { expect } from 'chai'; +import * as identity from '../../../src/v2/providers/identity'; + +const BEFORE_CREATE_TRIGGER = { + eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, +}; + +const BEFORE_SIGN_IN_TRIGGER = { + eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn', + options: { + accessToken: false, + idToken: false, + refreshToken: false, + }, +}; + +const opts: identity.BlockingOptions = { + accessToken: true, + refreshToken: false, + minInstances: 1, + region: 'us-west1', +}; + +describe('identity', () => { + describe('beforeUserCreated', () => { + it('should accept a handler', () => { + const fn = identity.beforeUserCreated((event) => Promise.resolve()); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + blockingTrigger: BEFORE_CREATE_TRIGGER, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should accept options and a handler', () => { + const fn = identity.beforeUserCreated(opts, (event) => Promise.resolve()); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + minInstances: 1, + region: ['us-west1'], + blockingTrigger: { + ...BEFORE_CREATE_TRIGGER, + options: { + ...BEFORE_CREATE_TRIGGER.options, + accessToken: true, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + }); + + describe('beforeUserSignedIn', () => { + it('should accept a handler', () => { + const fn = identity.beforeUserSignedIn((event) => Promise.resolve()); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + blockingTrigger: BEFORE_SIGN_IN_TRIGGER, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should accept options and a handler', () => { + const fn = identity.beforeUserSignedIn(opts, (event) => + Promise.resolve() + ); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + minInstances: 1, + region: ['us-west1'], + blockingTrigger: { + ...BEFORE_SIGN_IN_TRIGGER, + options: { + ...BEFORE_SIGN_IN_TRIGGER.options, + accessToken: true, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + }); + + describe('beforeOperation', () => { + it('should handle eventType and handler for before create events', () => { + const fn = identity.beforeOperation( + 'beforeCreate', + (event) => Promise.resolve(), + undefined + ); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + blockingTrigger: BEFORE_CREATE_TRIGGER, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should handle eventType and handler for before sign in events', () => { + const fn = identity.beforeOperation( + 'beforeSignIn', + (event) => Promise.resolve(), + undefined + ); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + blockingTrigger: BEFORE_SIGN_IN_TRIGGER, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should handle eventType, options, and handler for before create events', () => { + const fn = identity.beforeOperation('beforeCreate', opts, (event) => + Promise.resolve() + ); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + minInstances: 1, + region: ['us-west1'], + blockingTrigger: { + ...BEFORE_CREATE_TRIGGER, + options: { + ...BEFORE_CREATE_TRIGGER.options, + accessToken: true, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + + it('should handle eventType, options, and handler for before sign in events', () => { + const fn = identity.beforeOperation('beforeSignIn', opts, (event) => + Promise.resolve() + ); + + expect(fn.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + minInstances: 1, + region: ['us-west1'], + blockingTrigger: { + ...BEFORE_SIGN_IN_TRIGGER, + options: { + ...BEFORE_SIGN_IN_TRIGGER.options, + accessToken: true, + }, + }, + }); + expect(fn.__requiredAPIs).to.deep.equal([ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]); + }); + }); + + describe('getOpts', () => { + it('should parse an empty object', () => { + const internalOpts = identity.getOpts({}); + + expect(internalOpts).to.deep.equal({ + opts: {}, + accessToken: false, + idToken: false, + refreshToken: false, + }); + }); + + it('should parse global options', () => { + const internalOpts = identity.getOpts({ region: 'us-central1', cpu: 2 }); + + expect(internalOpts).to.deep.equal({ + opts: { + region: 'us-central1', + cpu: 2, + }, + accessToken: false, + idToken: false, + refreshToken: false, + }); + }); + + it('should a full options', () => { + const internalOpts = identity.getOpts({ + region: 'us-central1', + cpu: 2, + accessToken: true, + idToken: false, + refreshToken: true, + }); + + expect(internalOpts).to.deep.equal({ + opts: { + region: 'us-central1', + cpu: 2, + }, + accessToken: true, + idToken: false, + refreshToken: true, + }); + }); + }); +}); diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index ffe94e031..5941b1db3 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -264,6 +264,10 @@ export interface Resource { export interface TriggerAnnotated { __trigger: { availableMemoryMb?: number; + blockingTrigger?: { + eventType: string; + options?: Record; + }; eventTrigger?: { eventType: string; resource: string; @@ -315,6 +319,11 @@ export type HttpsFunction = TriggerAnnotated & EndpointAnnotated & ((req: Request, resp: Response) => void | Promise); +/** + * The Cloud Function type for Blocking triggers. + */ +export type BlockingFunction = HttpsFunction; + /** * The Cloud Function type for all non-HTTPS triggers. This should be exported * from your JavaScript file to define a Cloud Function. diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 76e02cd37..29f516bc7 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -505,7 +505,8 @@ interface CallableTokenStatus { auth: TokenStatus; } -function unsafeDecodeToken(token: string): unknown { +/** @internal */ +export function unsafeDecodeToken(token: string): unknown { if (!JWT_REGEX.test(token)) { return {}; } diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 8872057ad..6912b9d1b 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -22,34 +22,14 @@ import * as express from 'express'; import * as firebase from 'firebase-admin'; -import * as jwt from 'jsonwebtoken'; -import fetch from 'node-fetch'; import { logger } from '../..'; +import { apps } from '../../apps'; import { EventContext } from '../../cloud-functions'; -import { SUPPORTED_REGIONS } from '../../function-configuration'; -import { HttpsError } from './https'; +import { isDebugFeatureEnabled } from '../debug'; +import { HttpsError, unsafeDecodeToken } from './https'; export { HttpsError }; -/** @internal */ -export const INVALID_TOKEN_BUFFER = 60000; // set to 1 minute - -/** @internal */ -export const JWT_CLIENT_CERT_URL = 'https://www.googleapis.com'; -/** @internal */ -export const JWT_CLIENT_CERT_PATH = - 'robot/v1/metadata/x509/securetoken@system.gserviceaccount.com'; -/** @internal */ -export const JWT_ALG = 'RS256'; -/** @internal */ -export const JWT_ISSUER = 'https://securetoken.google.com/'; - -/** @internal */ -export interface PublicKeysCache { - publicKeys: Record; - publicKeysExpireAt?: number; -} - const DISALLOWED_CUSTOM_CLAIMS = [ 'acr', 'amr', @@ -70,6 +50,9 @@ const DISALLOWED_CUSTOM_CLAIMS = [ const CLAIMS_MAX_PAYLOAD_SIZE = 1000; +/** Shorthand auth blocking events from GCIP. */ +export type AuthBlockingEventType = 'beforeCreate' | 'beforeSignIn'; + const EVENT_MAPPING: Record = { beforeCreate: 'providers/cloud.auth/eventTypes/user.beforeCreate', beforeSignIn: 'providers/cloud.auth/eventTypes/user.beforeSignIn', @@ -342,6 +325,11 @@ export interface AuthEventContext extends EventContext { credential?: Credential; } +/** Defines the auth event for v2 blocking events */ +export interface AuthBlockingEvent extends AuthEventContext { + data: AuthUserRecord; +} + /** The handler response type for beforeCreate blocking events */ export interface BeforeCreateResponse { displayName?: string; @@ -430,64 +418,26 @@ export interface DecodedPayload { [key: string]: any; } -/** - * Helper to determine if we refresh the public keys - * @internal - */ -export function invalidPublicKeys( - keys: PublicKeysCache, - time: number = Date.now() -): boolean { - if (!keys.publicKeysExpireAt) { - return true; - } - return time + INVALID_TOKEN_BUFFER >= keys.publicKeysExpireAt; -} - -/** - * Helper to parse the response headers to obtain the expiration time. - * @internal - */ -export function setKeyExpirationTime( - response: any, - keysCache: PublicKeysCache, - time: number -): void { - if (response.headers.has('cache-control')) { - const ccHeader = response.headers.get('cache-control'); - const maxAgeEntry = ccHeader - .split(', ') - .find((item) => item.includes('max-age')); - if (maxAgeEntry) { - const maxAge = +maxAgeEntry.trim().split('=')[1]; - keysCache.publicKeysExpireAt = time + maxAge * 1000; - } - } -} - -/** - * Fetch the public keys for use in decoding and verifying the jwt sent from identity platform. - */ -async function refreshPublicKeys( - keysCache: PublicKeysCache, - time: number = Date.now() -): Promise { - const url = `${JWT_CLIENT_CERT_URL}/${JWT_CLIENT_CERT_PATH}`; - try { - const response = await fetch(url); - setKeyExpirationTime(response, keysCache, time); - const data = await response.json(); - keysCache.publicKeys = data as Record; - } catch (err) { - logger.error( - `Failed to obtain public keys for JWT verification: ${err.message}` - ); - throw new HttpsError( - 'internal', - 'Failed to obtain the public keys for JWT verification.' - ); - } -} +type HandlerV1 = ( + user: AuthUserRecord, + context: AuthEventContext +) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise; + +type HandlerV2 = ( + event: AuthBlockingEvent +) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise; /** * Checks for a valid identity platform web request, otherwise throws an HttpsError @@ -512,164 +462,19 @@ export function isValidRequest(req: express.Request): boolean { return true; } -/** @internal */ -export function getPublicKeyFromHeader( - header: Record, - publicKeys: Record -): string { - if (header.alg !== JWT_ALG) { - throw new HttpsError( - 'invalid-argument', - `Provided JWT has incorrect algorithm. Expected ${JWT_ALG} but got ${header.alg}.` - ); - } - if (!header.kid) { - throw new HttpsError('invalid-argument', 'JWT header missing "kid" claim.'); - } - if (!publicKeys.hasOwnProperty(header.kid)) { - throw new HttpsError( - 'invalid-argument', - 'Provided JWT has "kid" claim which does not correspond to a known public key. Most likely the JWT is expired.' - ); - } - - return publicKeys[header.kid]; -} - -/** - * Checks for a well forms cloud functions url - * @internal - */ -export function isAuthorizedCloudFunctionURL( - cloudFunctionUrl: string, - projectId: string -): boolean { - const re = new RegExp( - `^https://(${SUPPORTED_REGIONS.join( - '|' - )})+-${projectId}\.cloudfunctions\.net/` - ); - const res = re.exec(cloudFunctionUrl) || []; - return res.length > 0; -} - -/** - * Checks for errors in a decoded jwt - * @internal - */ -export function checkDecodedToken( - decodedJWT: DecodedPayload, - eventType: string, - projectId: string -): void { - if (decodedJWT.event_type !== eventType) { - throw new HttpsError( - 'invalid-argument', - `Expected "${eventType}" but received "${decodedJWT.event_type}".` - ); - } - if (!isAuthorizedCloudFunctionURL(decodedJWT.aud, projectId)) { - throw new HttpsError( - 'invalid-argument', - 'Provided JWT has incorrect "aud" (audience) claim.' - ); - } - if (decodedJWT.iss !== `${JWT_ISSUER}${projectId}`) { - throw new HttpsError( - 'invalid-argument', - `Provided JWT has incorrect "iss" (issuer) claim. Expected ` + - `"${JWT_ISSUER}${projectId}" but got "${decodedJWT.iss}".` - ); - } - if (typeof decodedJWT.sub !== 'string' || decodedJWT.sub.length === 0) { - throw new HttpsError( - 'invalid-argument', - 'Provided JWT has no "sub" (subject) claim.' - ); - } - if (decodedJWT.sub.length > 128) { - throw new HttpsError( - 'invalid-argument', - 'Provided JWT has "sub" (subject) claim longer than 128 characters.' - ); - } - // set uid to sub - decodedJWT.uid = decodedJWT.sub; -} - /** - * Helper function to decode the jwt, internally uses the 'jsonwebtoken' package. - * @internal + * Decode, but not verify, an Auth Blocking token. + * + * Do not use in production. Token should always be verified using the Admin SDK. + * + * This is exposed only for testing. */ -export function decodeJWT(token: string): Record { - let decoded: Record; - try { - decoded = jwt.decode(token, { complete: true }) as Record; - } catch (err) { - logger.error('Decoding the JWT failed', err); - throw new HttpsError('internal', 'Failed to decode the JWT.'); - } - if (!decoded?.payload) { - throw new HttpsError( - 'internal', - 'The decoded JWT is not structured correctly.' - ); - } +function unsafeDecodeAuthBlockingToken(token: string): DecodedPayload { + const decoded = unsafeDecodeToken(token) as DecodedPayload; + decoded.uid = decoded.sub; return decoded; } -/** - * Helper function to determine if we need to do full verification of the jwt - * @internal - */ -export function shouldVerifyJWT(): boolean { - // TODO(colerogers): add emulator support to skip verification - return true; -} - -/** - * Verifies the jwt using the 'jwt' library and decodes the token with the public keys - * Throws an error if the event types do not match - * @internal - */ -export function verifyJWT( - token: string, - rawDecodedJWT: Record, - keysCache: PublicKeysCache, - time: number = Date.now() -): DecodedPayload { - if (!rawDecodedJWT.header) { - throw new HttpsError( - 'internal', - 'Unable to verify JWT payload, the decoded JWT does not have a header property.' - ); - } - const header = rawDecodedJWT.header; - let publicKey; - try { - if (invalidPublicKeys(keysCache, time)) { - refreshPublicKeys(keysCache); - } - publicKey = getPublicKeyFromHeader(header, keysCache.publicKeys); - return jwt.verify(token, publicKey, { - algorithms: [JWT_ALG], - }) as DecodedPayload; - } catch (err) { - logger.error('Verifying the JWT failed', err); - } - // force refresh keys and retry one more time - try { - refreshPublicKeys(keysCache); - publicKey = getPublicKeyFromHeader(header, keysCache.publicKeys); - return jwt.verify(token, publicKey, { - algorithms: [JWT_ALG], - }) as DecodedPayload; - } catch (err) { - logger.error('Verifying the JWT failed again', err); - throw new HttpsError('internal', 'Failed to verify the JWT.'); - } -} - /** * Helper function to parse the decoded metadata object into a UserMetaData object * @internal @@ -1000,42 +805,9 @@ export function getUpdateMask( } /** @internal */ -export function createHandler( - handler: ( - user: AuthUserRecord, - context: AuthEventContext - ) => - | BeforeCreateResponse - | Promise - | BeforeSignInResponse - | Promise - | void - | Promise, - eventType: string, - keysCache: PublicKeysCache -): (req: express.Request, resp: express.Response) => Promise { - const wrappedHandler = wrapHandler(handler, eventType, keysCache); - return (req: express.Request, res: express.Response) => { - return new Promise((resolve) => { - res.on('finish', resolve); - resolve(wrappedHandler(req, res)); - }); - }; -} - -function wrapHandler( - handler: ( - user: AuthUserRecord, - context: AuthEventContext - ) => - | BeforeCreateResponse - | Promise - | BeforeSignInResponse - | Promise - | void - | Promise, - eventType: string, - keysCache: PublicKeysCache +export function wrapHandler( + eventType: AuthBlockingEventType, + handler: HandlerV1 | HandlerV2 ) { return async (req: express.Request, res: express.Response): Promise => { try { @@ -1044,23 +816,48 @@ function wrapHandler( logger.error('Invalid request, unable to process'); throw new HttpsError('invalid-argument', 'Bad Request'); } - const rawDecodedJWT = decodeJWT(req.body.data.jwt); - const decodedPayload = shouldVerifyJWT() - ? verifyJWT(req.body.data.jwt, rawDecodedJWT, keysCache) - : (rawDecodedJWT.payload as DecodedPayload); - checkDecodedToken(decodedPayload, eventType, projectId); + + if (!apps().admin.auth()._verifyAuthBlockingToken) { + throw new Error( + 'Cannot validate Auth Blocking token. Please update Firebase Admin SDK to >= v10.1.0' + ); + } + + const decodedPayload: DecodedPayload = isDebugFeatureEnabled( + 'skipTokenVerification' + ) + ? unsafeDecodeAuthBlockingToken(req.body.data.jwt) + : await apps() + .admin.auth() + ._verifyAuthBlockingToken(req.body.data.jwt); + const authUserRecord = parseAuthUserRecord(decodedPayload.user_record); const authEventContext = parseAuthEventContext(decodedPayload, projectId); - const authResponse = - (await handler(authUserRecord, authEventContext)) || undefined; + + let authResponse; + if (handler.length === 2) { + authResponse = + (await (handler as HandlerV1)(authUserRecord, authEventContext)) || + undefined; + } else { + authResponse = + (await (handler as HandlerV2)({ + ...authEventContext, + data: authUserRecord, + } as AuthBlockingEvent)) || undefined; + } + validateAuthResponse(eventType, authResponse); const updateMask = getUpdateMask(authResponse); - const result = { - userRecord: { - ...authResponse, - updateMask, - }, - }; + const result = + updateMask.length === 0 + ? {} + : { + userRecord: { + ...authResponse, + updateMask, + }, + }; res.status(200); res.setHeader('Content-Type', 'application/json'); @@ -1072,9 +869,10 @@ function wrapHandler( err = new HttpsError('internal', 'An unexpected error occurred.'); } - res.status(err.code); + const { status } = err.httpErrorCode; + const body = { error: err.toJSON() }; res.setHeader('Content-Type', 'application/json'); - res.send({ error: err.toJson() }); + res.status(status).send(body); } }; } diff --git a/src/function-builder.ts b/src/function-builder.ts index 88f58bb1c..f0158a3e0 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -513,7 +513,8 @@ export class FunctionBuilder { /** * Handle events related to Firebase authentication users. */ - user: () => auth._userWithOptions(this.options), + user: (userOptions?: auth.UserOptions) => + auth._userWithOptions(this.options, userOptions), }; } diff --git a/src/handler-builder.ts b/src/handler-builder.ts index efa0d9f4c..c976bf8e6 100644 --- a/src/handler-builder.ts +++ b/src/handler-builder.ts @@ -352,7 +352,7 @@ export class HandlerBuilder { get auth() { return { get user() { - return new auth.UserBuilder(() => null, {}); + return new auth.UserBuilder(() => null, {}, {}); }, }; } diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 98568ce18..283310472 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -21,42 +21,70 @@ // SOFTWARE. import { + BlockingFunction, CloudFunction, Event, EventContext, makeCloudFunction, + optionsToEndpoint, + optionsToTrigger, } from '../cloud-functions'; import { + AuthBlockingEventType, + AuthEventContext, + AuthUserRecord, + BeforeCreateResponse, + BeforeSignInResponse, + HttpsError, UserInfo, UserRecord, userRecordConstructor, UserRecordMetadata, + wrapHandler, } from '../common/providers/identity'; import { DeploymentOptions } from '../function-configuration'; // TODO: yank in next breaking change release export { UserRecord, UserInfo, UserRecordMetadata, userRecordConstructor }; +export { HttpsError }; + /** @hidden */ export const provider = 'google.firebase.auth'; /** @hidden */ export 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 function user() { - return _userWithOptions({}); +export function user(userOptions?: UserOptions) { + return _userWithOptions({}, userOptions || {}); } /** @hidden */ -export function _userWithOptions(options: DeploymentOptions) { - 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); +export function _userWithOptions( + options: DeploymentOptions, + userOptions: 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, + userOptions + ); } /** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */ @@ -68,7 +96,8 @@ export class UserBuilder { /** @hidden */ constructor( private triggerResource: () => string, - private options?: DeploymentOptions + private options: DeploymentOptions, + private userOptions?: UserOptions ) {} /** Respond to the creation of a Firebase Auth user. */ @@ -85,6 +114,32 @@ export class UserBuilder { return this.onOperation(handler, 'user.delete'); } + beforeCreate( + handler: ( + user: AuthUserRecord, + context: AuthEventContext + ) => + | BeforeCreateResponse + | void + | Promise + | Promise + ): BlockingFunction { + return this.beforeOperation(handler, 'beforeCreate'); + } + + beforeSignIn( + handler: ( + user: AuthUserRecord, + context: AuthEventContext + ) => + | BeforeSignInResponse + | void + | Promise + | Promise + ): BlockingFunction { + return this.beforeOperation(handler, 'beforeSignIn'); + } + private onOperation( handler: ( user: UserRecord, @@ -103,4 +158,69 @@ export class UserBuilder { options: this.options, }); } + + private beforeOperation( + handler: ( + user: AuthUserRecord, + context: AuthEventContext + ) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise, + eventType: AuthBlockingEventType + ): BlockingFunction { + const accessToken = this.userOptions?.blockingOptions?.accessToken || false; + const idToken = this.userOptions?.blockingOptions?.idToken || false; + const refreshToken = + this.userOptions?.blockingOptions?.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: AuthUserRecord, context: AuthEventContext) => + handler(user, context); + const func: any = wrapHandler(eventType, wrappedHandler); + + const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`; + + func.__trigger = { + labels: {}, + ...optionsToTrigger(this.options), + blockingTrigger: { + eventType: legacyEventType, + options: { + accessToken, + idToken, + refreshToken, + }, + }, + }; + + func.__endpoint = { + platform: 'gcfv1', + labels: {}, + ...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; + } } diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 7939d9c09..562d1a52f 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -70,6 +70,11 @@ export interface ManifestEndpoint { maxDoublings?: number; }; }; + + blockingTrigger?: { + eventType: string; + options?: Record; + }; } export interface ManifestRequiredAPI { diff --git a/src/types/global.d.ts b/src/types/global.d.ts new file mode 100644 index 000000000..164cd4d74 --- /dev/null +++ b/src/types/global.d.ts @@ -0,0 +1,6 @@ +export {}; + +declare global { + interface AbortSignal {} + interface AbortController {} +} diff --git a/src/v2/core.ts b/src/v2/core.ts index 1160d09ed..af02c1d0d 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -44,6 +44,10 @@ export interface TriggerAnnotation { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; + blockingTrigger?: { + eventType: string; + options?: Record; + }; // TODO: schedule } diff --git a/src/v2/index.ts b/src/v2/index.ts index ae2c5df51..31070b4dc 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -25,11 +25,22 @@ 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'; import * as tasks from './providers/tasks'; -export { alerts, https, pubsub, storage, logger, params, tasks, eventarc }; +export { + alerts, + https, + identity, + pubsub, + storage, + logger, + params, + tasks, + eventarc, +}; export { setGlobalOptions, GlobalOptions } from './options'; diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts new file mode 100644 index 000000000..798a39212 --- /dev/null +++ b/src/v2/providers/identity.ts @@ -0,0 +1,215 @@ +import { BlockingFunction } from '../../cloud-functions'; +import { + AuthBlockingEvent, + AuthBlockingEventType, + BeforeCreateResponse, + BeforeSignInResponse, + HttpsError, + wrapHandler, +} from '../../common/providers/identity'; +import * as options from '../options'; + +export { HttpsError }; + +/** Internally used when parsing the options. */ +interface InternalOptions { + opts: options.GlobalOptions; + idToken: boolean; + accessToken: boolean; + refreshToken: boolean; +} + +/** + * All function options plus idToken, accessToken, and refreshToken. + */ +export interface BlockingOptions extends options.GlobalOptions { + idToken?: boolean; + accessToken?: boolean; + refreshToken?: boolean; +} + +/** + * Handle an event that is triggered before a user is created. + */ +export function beforeUserCreated( + handler: ( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | Promise + | void + | Promise +): BlockingFunction; +export function beforeUserCreated( + opts: BlockingOptions, + handler: ( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | Promise + | void + | Promise +): BlockingFunction; +export function beforeUserCreated( + optsOrHandler: + | BlockingOptions + | (( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | Promise + | void + | Promise), + handler?: ( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | Promise + | void + | Promise +): BlockingFunction { + return beforeOperation('beforeCreate', optsOrHandler, handler); +} + +/** + * Handle an event that is triggered before a user is signed in. + */ +export function beforeUserSignedIn( + handler: ( + event: AuthBlockingEvent + ) => + | BeforeSignInResponse + | Promise + | void + | Promise +): BlockingFunction; +export function beforeUserSignedIn( + opts: BlockingOptions, + handler: ( + event: AuthBlockingEvent + ) => + | BeforeSignInResponse + | Promise + | void + | Promise +): BlockingFunction; +export function beforeUserSignedIn( + optsOrHandler: + | BlockingOptions + | (( + event: AuthBlockingEvent + ) => + | BeforeSignInResponse + | Promise + | void + | Promise), + handler?: ( + event: AuthBlockingEvent + ) => + | BeforeSignInResponse + | Promise + | void + | Promise +): BlockingFunction { + return beforeOperation('beforeSignIn', optsOrHandler, handler); +} + +/** @internal */ +export function beforeOperation( + eventType: AuthBlockingEventType, + optsOrHandler: + | BlockingOptions + | (( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise), + handler: ( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise +): BlockingFunction { + if (!handler || typeof optsOrHandler === 'function') { + handler = optsOrHandler as ( + event: AuthBlockingEvent + ) => + | BeforeCreateResponse + | BeforeSignInResponse + | void + | Promise + | Promise + | Promise; + optsOrHandler = {}; + } + + const { opts, accessToken, idToken, refreshToken } = getOpts( + optsOrHandler as BlockingOptions + ); + + // 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: AuthBlockingEvent) => handler(event); + const func: any = 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', + ...baseOptsEndpoint, + ...specificOptsEndpoint, + labels: { + ...baseOptsEndpoint?.labels, + ...specificOptsEndpoint?.labels, + }, + blockingTrigger: { + eventType: legacyEventType, + options: { + accessToken, + idToken, + refreshToken, + }, + }, + }; + + func.__requiredAPIs = [ + { + api: 'identitytoolkit.googleapis.com', + reason: 'Needed for auth blocking functions', + }, + ]; + + func.run = handler; + + return func; +} + +/** @internal */ +export function getOpts(blockingOptions: BlockingOptions): InternalOptions { + const accessToken = blockingOptions.accessToken || false; + const idToken = blockingOptions.idToken || false; + const refreshToken = blockingOptions.refreshToken || false; + const opts = { ...blockingOptions }; + delete (opts as any).accessToken; + delete (opts as any).idToken; + delete (opts as any).refreshToken; + return { + opts, + accessToken, + idToken, + refreshToken, + }; +} diff --git a/tsconfig.release.json b/tsconfig.release.json index 5f19fe3eb..b98955ee5 100644 --- a/tsconfig.release.json +++ b/tsconfig.release.json @@ -11,6 +11,7 @@ "typeRoots": ["./node_modules/@types"] }, "files": [ + "./src/types/global.d.ts", "./src/index.ts", "./src/logger/index.ts", "./src/logger/compat.ts", diff --git a/v2/identity.js b/v2/identity.js new file mode 100644 index 000000000..ac9a09d74 --- /dev/null +++ b/v2/identity.js @@ -0,0 +1,21 @@ +// 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. From 0406897773ac445e252e98020d56fef6b5ac9a69 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Fri, 29 Apr 2022 13:47:31 -0400 Subject: [PATCH 425/705] add changelog (#1086) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..6008e08a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +Adds auth blocking triggers to the auth and identity namespaces (1080). From c91fd9b001518a40fcb5bfffaee0e30d4735ac1a Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 29 Apr 2022 13:39:20 -0700 Subject: [PATCH 426/705] Add support for secrets in v2 (#1079) In addition to adding secrets to v2 `__endpoint` annotation, I'm also making following (small) changes: * Enforce that `platform` be part of trigger annotation - Firebase CLI already assumes that it's included. * Endpoint secret environment variable annotation (for v1 & v2) --- CHANGELOG.md | 3 ++- spec/v1/cloud-functions.spec.ts | 4 ++-- spec/v2/providers/fixtures.ts | 9 +++++++-- src/cloud-functions.ts | 2 +- src/v2/core.ts | 3 ++- src/v2/options.ts | 20 +++++++++++++++++--- src/v2/providers/https.ts | 21 ++++++++++----------- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6008e08a6..ddc0e009c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ -Adds auth blocking triggers to the auth and identity namespaces (1080). +- Adds auth blocking triggers to the auth and identity namespaces (1080). +- Add support for secrets for v2 triggers (#1079). diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index 5dd0a8941..fec1bd580 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -29,7 +29,7 @@ import { EventContext, makeCloudFunction, MakeCloudFunctionArgs, -} from '../../src/cloud-functions'; +} from '../../src'; describe('makeCloudFunction', () => { const cloudFunctionArgs: MakeCloudFunctionArgs = { @@ -124,7 +124,7 @@ describe('makeCloudFunction', () => { }, retry: false, }, - secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }], + secretEnvironmentVariables: [{ key: 'MY_SECRET' }], labels: {}, }); }); diff --git a/spec/v2/providers/fixtures.ts b/spec/v2/providers/fixtures.ts index 53aa852b3..7a054572e 100644 --- a/spec/v2/providers/fixtures.ts +++ b/spec/v2/providers/fixtures.ts @@ -1,3 +1,5 @@ +import { ManifestEndpoint } from '../../../src/runtime/manifest'; +import { TriggerAnnotation } from '../../../src/v2/core'; import * as options from '../../../src/v2/options'; export const FULL_OPTIONS: options.GlobalOptions = { @@ -15,9 +17,10 @@ export const FULL_OPTIONS: options.GlobalOptions = { labels: { hello: 'world', }, + secrets: ['MY_SECRET'], }; -export const FULL_TRIGGER = { +export const FULL_TRIGGER: TriggerAnnotation = { platform: 'gcfv2', regions: ['us-west1'], availableMemoryMb: 512, @@ -32,9 +35,10 @@ export const FULL_TRIGGER = { labels: { hello: 'world', }, + secrets: ['MY_SECRET'], }; -export const FULL_ENDPOINT = { +export const FULL_ENDPOINT: ManifestEndpoint = { platform: 'gcfv2', region: ['us-west1'], availableMemoryMb: 512, @@ -52,4 +56,5 @@ export const FULL_ENDPOINT = { labels: { hello: 'world', }, + secretEnvironmentVariables: [{ key: 'MY_SECRET' }], }; diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 5941b1db3..1f59f50d8 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -636,7 +636,7 @@ export function optionsToEndpoint( options, 'secretEnvironmentVariables', 'secrets', - (secrets) => secrets.map((secret) => ({ secret, key: secret })) + (secrets) => secrets.map((secret) => ({ key: secret })) ); if (options?.vpcConnector) { endpoint.vpc = { connector: options.vpcConnector }; diff --git a/src/v2/core.ts b/src/v2/core.ts index af02c1d0d..f5561d66f 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -24,6 +24,7 @@ import { ManifestEndpoint } from '../runtime/manifest'; /** @internal */ export interface TriggerAnnotation { + platform?: string; concurrency?: number; minInstances?: number; maxInstances?: number; @@ -44,11 +45,11 @@ export interface TriggerAnnotation { vpcConnectorEgressSettings?: string; serviceAccountEmail?: string; ingressSettings?: string; + secrets?: string[]; blockingTrigger?: { eventType: string; options?: Record; }; - // TODO: schedule } diff --git a/src/v2/options.ts b/src/v2/options.ts index bfbc3195d..42404bfa0 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -31,6 +31,7 @@ import { ManifestEndpoint } from '../runtime/manifest'; import { TriggerAnnotation } from './core'; import { declaredParams } from './params'; import { ParamSpec } from './params/types'; +import { HttpsOptions } from './providers/https'; /** * List of all regions supported by Cloud Functions v2 @@ -215,6 +216,11 @@ export interface GlobalOptions { * Invoker to set access control on https functions. */ invoker?: 'public' | 'private' | string | string[]; + + /* + * Secrets to bind to a functions. + */ + secrets?: string[]; } let globalOptions: GlobalOptions | undefined; @@ -251,7 +257,7 @@ export interface EventHandlerOptions extends GlobalOptions { * @internal */ export function optionsToTriggerAnnotations( - opts: GlobalOptions | EventHandlerOptions + opts: GlobalOptions | EventHandlerOptions | HttpsOptions ): TriggerAnnotation { const annotation: TriggerAnnotation = {}; copyIfPresent( @@ -263,7 +269,8 @@ export function optionsToTriggerAnnotations( 'ingressSettings', 'labels', 'vpcConnector', - 'vpcConnectorEgressSettings' + 'vpcConnectorEgressSettings', + 'secrets' ); convertIfPresent( annotation, @@ -312,7 +319,7 @@ export function optionsToTriggerAnnotations( * @internal */ export function optionsToEndpoint( - opts: GlobalOptions | EventHandlerOptions + opts: GlobalOptions | EventHandlerOptions | HttpsOptions ): ManifestEndpoint { const endpoint: ManifestEndpoint = {}; copyIfPresent( @@ -350,6 +357,13 @@ export function optionsToEndpoint( } return region; }); + convertIfPresent( + endpoint, + opts, + 'secretEnvironmentVariables', + 'secrets', + (secrets) => secrets.map((secret) => ({ key: secret })) + ); return endpoint; } diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index f6101ba1b..3cd095e94 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -33,14 +33,16 @@ import { } from '../../common/providers/https'; import { ManifestEndpoint } from '../../runtime/manifest'; import * as options from '../options'; +import { GlobalOptions, SupportedRegion } from '../options'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; -export interface HttpsOptions extends Omit { - region?: - | options.SupportedRegion - | string - | Array; +/** + * Options that can be set on an individual HTTPS Cloud Function. + */ +export interface HttpsOptions extends Omit { + /* HTTP functions can override and specify more than one regions. */ + region?: SupportedRegion | string | Array; cors?: string | boolean | RegExp | Array; } @@ -54,7 +56,6 @@ export type HttpsFunction = (( export interface CallableFunction extends HttpsFunction { run(data: CallableRequest): Return; } - export function onRequest( opts: HttpsOptions, handler: ( @@ -195,9 +196,7 @@ export function onCall>( ); // global options calls region a scalar and https allows it to be an array, // but optionsToTriggerAnnotations handles both cases. - const specificOpts = options.optionsToTriggerAnnotations( - opts as options.GlobalOptions - ); + const specificOpts = options.optionsToTriggerAnnotations(opts); return { platform: 'gcfv2', ...baseOpts, @@ -216,8 +215,8 @@ export function onCall>( const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); // global options calls region a scalar and https allows it to be an array, - // but optionsToManifestEndpoint handles both cases. - const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions); + // but optionsToEndpoint handles both cases. + const specificOpts = options.optionsToEndpoint(opts); func.__endpoint = { platform: 'gcfv2', ...baseOpts, From c4f63c719f200dca723771922727b477b2e08eb2 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Fri, 29 Apr 2022 16:23:47 -0500 Subject: [PATCH 427/705] Update types for AlertPayloads (#1087) * Update types for AlertPayloads This commit updates the typing for the AlertPayloads. There was a discrepency between the type definitions and what prod was returning. * From: `com.google.firebase.firebasealerts.*` * To: `type.googleapis.com/google.events.firebase.firebasealerts.v1.*` Co-authored-by: Daniel Lee --- src/v2/providers/alerts/billing.ts | 4 ++-- src/v2/providers/alerts/crashlytics.ts | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index a4b7a151e..8ba9b06c9 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -7,7 +7,7 @@ import * as options from '../../options'; * Payload is wrapped inside a FirebaseAlertData object. */ export interface PlanUpdatePayload { - ['@type']: 'com.google.firebase.firebasealerts.PlanUpdatePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanUpdatePayload'; billingPlan: string; principalEmail: string; } @@ -17,7 +17,7 @@ export interface PlanUpdatePayload { * Payload is wrapped inside a FirebaseAlertData object. */ export interface PlanAutomatedUpdatePayload { - ['@type']: 'com.google.firebase.firebasealerts.PlanAutomatedUpdatePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanAutomatedUpdatePayload'; billingPlan: string; } diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 6a5f36f73..4e2b4b121 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -15,7 +15,7 @@ interface Issue { * Payload is wrapped inside a FirebaseAlertData object. */ export interface NewFatalIssuePayload { - ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsNewFatalIssuePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewFatalIssuePayload'; issue: Issue; } @@ -24,7 +24,7 @@ export interface NewFatalIssuePayload { * Payload is wrapped inside a FirebaseAlertData object. */ export interface NewNonfatalIssuePayload { - ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsNewNonfatalIssuePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewNonfatalIssuePayload'; issue: Issue; } @@ -33,7 +33,7 @@ export interface NewNonfatalIssuePayload { * Payload is wrapped inside a FirebaseAlertData object. */ export interface RegressionAlertPayload { - ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsRegressionAlertPayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsRegressionAlertPayload'; type: string; issue: Issue; resolveTime: string; @@ -52,7 +52,7 @@ interface TrendingIssueDetails { * Payload is wrapped inside a FirebaseAlertData object. */ export interface StabilityDigestPayload { - ['@type']: 'com.google.firebase.firebasealerts.CrashlyticsStabilityDigestPayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsStabilityDigestPayload'; digestDate: string; trendingIssues: TrendingIssueDetails[]; } @@ -62,7 +62,7 @@ export interface StabilityDigestPayload { * Payload is wrapped inside a FirebaseAlertData object. */ export interface VelocityAlertPayload { - ['@type']: 'com.google.firebase.firebasealerts.VelocityAlertPayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsVelocityAlertPayload'; issue: Issue; createTime: string; crashCount: number; @@ -75,7 +75,7 @@ export interface VelocityAlertPayload { * Payload is wrapped inside a FirebaseAlertData object. */ export interface NewAnrIssuePayload { - ['@type']: 'com.google.firebase.firebasealerts.NewAnrIssuePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewAnrIssuePayload'; issue: Issue; } From 0bac53d7e1edbcb9c23ffc9f129245524433cc36 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Fri, 29 Apr 2022 20:06:56 -0500 Subject: [PATCH 428/705] Update AppDistribution [@type] (#1088) This is a short followup to update the App Distribution @type. [More info here](https://github.com/firebase/firebase-functions/commit/c4f63c719f200dca723771922727b477b2e08eb2) ``` type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload ``` --- src/v2/providers/alerts/appDistribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index e70e1796a..ce5512dd4 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -7,7 +7,7 @@ import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; * Payload is wrapped inside a FirebaseAlertData object. */ export interface NewTesterDevicePayload { - ['@type']: 'com.google.firebase.firebasealerts.NewTesterDevicePayload'; + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload'; testerName: string; testerEmail: string; testerDeviceModelName: string; From 1aa1865dc64d3aeab849fe7aed916f429d1231d1 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Mon, 2 May 2022 11:53:58 -0500 Subject: [PATCH 429/705] Update CloudEvent types (#1089) * Updates to exported CloudEvent Types. This commit makes several updates to the exported CloudEvent types: * Billing types include a notificationType * [Link](https://github.com/googleapis/google-cloudevents/blob/main/proto/google/events/firebase/firebasealerts/v1/cloud_event_payload.proto#L132-L133) * Crashlytics have more documentation on fields * Storage has an exported `StorageEvent` which includes the bucket. * Storage function api references `StorageEvent` to better match to expected output. * Fixed NPE issue for Storage without Config * Updated more signatures to optionally expect a bucket. --- src/v2/providers/alerts/alerts.ts | 8 +++ src/v2/providers/alerts/appDistribution.ts | 2 + src/v2/providers/alerts/billing.ts | 8 +++ src/v2/providers/alerts/crashlytics.ts | 34 +++++++++++++ src/v2/providers/storage.ts | 57 ++++++++++++---------- 5 files changed, 84 insertions(+), 25 deletions(-) diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 173267422..44edd4e55 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -6,13 +6,21 @@ import * as options from '../../options'; * The CloudEvent data emitted by Firebase Alerts. */ export interface FirebaseAlertData { + /** Time that the event has created. */ createTime: string; + /** Time that the event has ended. Optional, only present for ongoing alerts. */ endTime: string; + /** Payload of the event, which includes the details of the specific alert. */ payload: T; } interface WithAlertTypeAndApp { + /** The type of the alerts that got triggered. */ alertType: string; + /** + * The Firebase App ID that’s associated with the alert. This is optional, + * and only present when the alert is targeting at a specific Firebase App. + */ appId?: string; } /** diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index ce5512dd4..94bd81ab8 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -15,7 +15,9 @@ export interface NewTesterDevicePayload { } interface WithAlertTypeAndApp { + /** The type of the alerts that got triggered. */ alertType: string; + /** The Firebase App ID that’s associated with the alert. */ appId: string; } /** diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index 8ba9b06c9..b9aaffc09 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -8,8 +8,12 @@ import * as options from '../../options'; */ export interface PlanUpdatePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanUpdatePayload'; + /** A Firebase billing plan. */ billingPlan: string; + /** The email address of the person that triggered billing plan change */ principalEmail: string; + /** The type of the notification, e.g. upgrade, downgrade */ + notificationType: string; } /** @@ -18,10 +22,14 @@ export interface PlanUpdatePayload { */ export interface PlanAutomatedUpdatePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanAutomatedUpdatePayload'; + /** A Firebase billing plan. */ billingPlan: string; + /** The type of the notification, e.g. upgrade, downgrade */ + notificationType: string; } interface WithAlertType { + /** The type of the alerts that got triggered. */ alertType: string; } /** diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 4e2b4b121..14e8a87e8 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -16,6 +16,7 @@ interface Issue { */ export interface NewFatalIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewFatalIssuePayload'; + /** Basic information of the Crashlytics issue */ issue: Issue; } @@ -25,6 +26,7 @@ export interface NewFatalIssuePayload { */ export interface NewNonfatalIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewNonfatalIssuePayload'; + /** Basic information of the Crashlytics issue */ issue: Issue; } @@ -34,16 +36,26 @@ export interface NewNonfatalIssuePayload { */ export interface RegressionAlertPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsRegressionAlertPayload'; + /** The type of the Crashlytics issue, e.g. new fatal, new nonfatal, ANR */ type: string; + /** Basic information of the Crashlytics issue */ issue: Issue; + /** + * The time that the Crashlytics issues was most recently resolved before it + * began to reoccur. + */ resolveTime: string; } /** Generic crashlytics trending issue interface */ interface TrendingIssueDetails { + /** The type of the Crashlytics issue, e.g. new fatal, new nonfatal, ANR */ type: string; + /** Basic information of the Crashlytics issue */ issue: Issue; + /** The number of crashes that occurred with the issue */ eventCount: number; + /** The number of distinct users that were affected by the issue */ userCount: number; } @@ -53,7 +65,12 @@ interface TrendingIssueDetails { */ export interface StabilityDigestPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsStabilityDigestPayload'; + /** + * The date that the digest gets created. Issues in the digest should have the + * same date as the digest date + */ digestDate: string; + /** A stability digest containing several trending Crashlytics issues */ trendingIssues: TrendingIssueDetails[]; } @@ -63,10 +80,24 @@ export interface StabilityDigestPayload { */ export interface VelocityAlertPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsVelocityAlertPayload'; + /** Basic information of the Crashlytics issue */ issue: Issue; + /** The time that the Crashlytics issue gets created */ createTime: string; + /** + * The number of user sessions for the given app version that had this + * specific crash issue in the time period used to trigger the velocity alert. + */ crashCount: number; + /** + * The percentage of user sessions for the given app version that had this + * specific crash issue in the time period used to trigger the velocity alert. + */ crashPercentage: number; + /** + * The first app version where this issue was seen, and not necessarily the + * version that has triggered the alert. + */ firstVersion: string; } @@ -76,11 +107,14 @@ export interface VelocityAlertPayload { */ export interface NewAnrIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewAnrIssuePayload'; + /** Basic information of the Crashlytics issue */ issue: Issue; } interface WithAlertTypeAndApp { + /** The type of the alerts that got triggered. */ alertType: string; + /** The Firebase App ID that’s associated with the alert. */ appId: string; } /** diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index f4ce5b004..6c815615e 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -174,6 +174,13 @@ export interface CustomerEncryption { keySha256?: string; } +interface WithBucket { + /** The name of the bucket containing this object. */ + bucket: string; +} + +export type StorageEvent = CloudEvent; + /** @internal */ export const archivedEvent = 'google.cloud.storage.object.v1.archived'; /** @internal */ @@ -191,100 +198,100 @@ export interface StorageOptions extends options.EventHandlerOptions { /** Handle a storage object archived */ export function onObjectArchived( - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectArchived( bucket: string, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectArchived( opts: StorageOptions, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectArchived( buketOrOptsOrHandler: | string | StorageOptions - | ((event: CloudEvent) => any | Promise), - handler?: (event: CloudEvent) => any | Promise + | ((event: StorageEvent) => any | Promise), + handler?: (event: StorageEvent) => any | Promise ): CloudFunction { return onOperation(archivedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object finalized */ export function onObjectFinalized( - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectFinalized( bucket: string, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectFinalized( opts: StorageOptions, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectFinalized( buketOrOptsOrHandler: | string | StorageOptions - | ((event: CloudEvent) => any | Promise), - handler?: (event: CloudEvent) => any | Promise + | ((event: StorageEvent) => any | Promise), + handler?: (event: StorageEvent) => any | Promise ): CloudFunction { return onOperation(finalizedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object deleted */ export function onObjectDeleted( - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectDeleted( bucket: string, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectDeleted( opts: StorageOptions, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectDeleted( buketOrOptsOrHandler: | string | StorageOptions - | ((event: CloudEvent) => any | Promise), - handler?: (event: CloudEvent) => any | Promise + | ((event: StorageEvent) => any | Promise), + handler?: (event: StorageEvent) => any | Promise ): CloudFunction { return onOperation(deletedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object metadata updated */ export function onObjectMetadataUpdated( - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectMetadataUpdated( bucket: string, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectMetadataUpdated( opts: StorageOptions, - handler: (event: CloudEvent) => any | Promise + handler: (event: StorageEvent) => any | Promise ): CloudFunction; export function onObjectMetadataUpdated( buketOrOptsOrHandler: | string | StorageOptions - | ((event: CloudEvent) => any | Promise), - handler?: (event: CloudEvent) => any | Promise + | ((event: StorageEvent) => any | Promise), + handler?: (event: StorageEvent) => any | Promise ): CloudFunction { return onOperation(metadataUpdatedEvent, buketOrOptsOrHandler, handler); } @@ -295,12 +302,12 @@ export function onOperation( bucketOrOptsOrHandler: | string | StorageOptions - | ((event: CloudEvent) => any | Promise), - handler: (event: CloudEvent) => any | Promise + | ((event: StorageEvent) => any | Promise), + handler: (event: StorageEvent) => any | Promise ): CloudFunction { if (typeof bucketOrOptsOrHandler === 'function') { handler = bucketOrOptsOrHandler as ( - event: CloudEvent + event: StorageEvent ) => any | Promise; bucketOrOptsOrHandler = {}; } @@ -310,7 +317,7 @@ export function onOperation( ); const func = (raw: CloudEvent) => { - return handler(raw as CloudEvent); + return handler(raw as StorageEvent); }; func.run = handler; @@ -382,7 +389,7 @@ export function getOptsAndBucket( bucket = bucketOrOpts; opts = {}; } else { - bucket = bucketOrOpts.bucket || firebaseConfig().storageBucket; + bucket = bucketOrOpts.bucket || firebaseConfig()?.storageBucket; opts = { ...bucketOrOpts }; delete (opts as any).bucket; } From af511569ff494892a0f7e4d4781e5c5eb9d54381 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 2 May 2022 23:26:36 -0700 Subject: [PATCH 430/705] Generate documentation with api-extractor (#1071) This picks up where https://github.com/firebase/firebase-functions/pull/984 had left off. This gets us started with generating docs using api-extractor. By no means it's complete - I wanted us to generate the doc and see the output as we incrementally improve the reference docs. Separately, I'm going to be pushing out PRs to suppress many warnings generated by api-extractor (e.g. mostly on missing documentation/annotation). To generate reference doc for v2, run the following command: ``` $ npm i $ npm run build $ npm run docgen:v2 ``` Documents should be generated in `docgen/v2/markdown` folder. --- .gitignore | 4 + docgen/api-extractor.base.json | 364 ++++++++++++++++++++++ docgen/api-extractor.v1.json | 14 + docgen/api-extractor.v2.json | 14 + docgen/tsconfig.json | 3 - package-lock.json | 540 ++++++++++++++++++++++++++++++++- package.json | 9 + 7 files changed, 941 insertions(+), 7 deletions(-) create mode 100644 docgen/api-extractor.base.json create mode 100644 docgen/api-extractor.v1.json create mode 100644 docgen/api-extractor.v2.json delete mode 100644 docgen/tsconfig.json diff --git a/.gitignore b/.gitignore index b5a890408..ee22dbd83 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,10 @@ .vscode/ coverage docgen/html +docgen/*/temp +docgen/*/markdown +docgen/*/*.json +docgen/*/*.md firebase-functions-*.tgz integration_test/.firebaserc integration_test/*.log diff --git a/docgen/api-extractor.base.json b/docgen/api-extractor.base.json new file mode 100644 index 000000000..2938a396f --- /dev/null +++ b/docgen/api-extractor.base.json @@ -0,0 +1,364 @@ +/** + * Config file for API Extractor. For more info, please visit: https://api-extractor.com + */ +{ + "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", + + /** + * Optionally specifies another JSON config file that this file extends from. This provides a way for + * standard settings to be shared across multiple projects. + * + * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains + * the "extends" field. Otherwise, the first path segment is interpreted as an NPM package name, and will be + * resolved using NodeJS require(). + * + * SUPPORTED TOKENS: none + * DEFAULT VALUE: "" + */ + // "extends": "./shared/api-extractor-base.json" + // "extends": "my-package/include/api-extractor-base.json" + + /** + * Determines the "" token that can be used with other config file settings. The project folder + * typically contains the tsconfig.json and package.json config files, but the path is user-defined. + * + * The path is resolved relative to the folder of the config file that contains the setting. + * + * The default value for "projectFolder" is the token "", which means the folder is determined by traversing + * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder + * that contains a tsconfig.json file. If a tsconfig.json file cannot be found in this way, then an error + * will be reported. + * + * SUPPORTED TOKENS: + * DEFAULT VALUE: "" + */ + "projectFolder": "..", + + /** + * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis. API Extractor + * analyzes the symbols exported by this module. + * + * The file extension must be ".d.ts" and not ".ts". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + */ + "mainEntryPointFilePath": "/lib/index.d.ts", + + /** + * A list of NPM package names whose exports should be treated as part of this package. + * + * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1", + * and another NPM package "library2" is embedded in this bundle. Some types from library2 may become part + * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly + * imports library2. To avoid this, we can specify: + * + * "bundledPackages": [ "library2" ], + * + * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been + * local files for library1. + */ + "bundledPackages": [], + + /** + * Determines how the TypeScript compiler engine will be invoked by API Extractor. + */ + "compiler": { + /** + * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * Note: This setting will be ignored if "overrideTsconfig" is used. + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/tsconfig.json" + */ + "tsconfigFilePath": "/tsconfig.release.json" + /** + * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk. + * The object must conform to the TypeScript tsconfig schema: + * + * http://json.schemastore.org/tsconfig + * + * If omitted, then the tsconfig.json file will be read from the "projectFolder". + * + * DEFAULT VALUE: no overrideTsconfig section + */ + // "overrideTsconfig": { + // . . . + // } + /** + * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended + * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when + * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses + * for its analysis. Where possible, the underlying issue should be fixed rather than relying on skipLibCheck. + * + * DEFAULT VALUE: false + */ + // "skipLibCheck": true, + }, + + /** + * Configures how the API report file (*.api.md) will be generated. + */ + "apiReport": { + /** + * (REQUIRED) Whether to generate an API report. + */ + "enabled": true, + + /** + * The filename for the API report files. It will be combined with "reportFolder" or "reportTempFolder" to produce + * a full file path. + * + * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/". + * + * SUPPORTED TOKENS: , + * DEFAULT VALUE: ".api.md" + */ + // "reportFileName": ".api.md", + + /** + * Specifies the folder where the API report file is written. The file name portion is determined by + * the "reportFileName" setting. + * + * The API report file is normally tracked by Git. Changes to it can be used to trigger a branch policy, + * e.g. for an API review. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/etc/" + */ + "reportFolder": "/docgen/etc/", + + /** + * Specifies the folder where the temporary report file is written. The file name portion is determined by + * the "reportFileName" setting. + * + * After the temporary file is written to disk, it is compared with the file in the "reportFolder". + * If they are different, a production build will fail. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/temp/" + */ + "reportTempFolder": "/docgen/temp/" + }, + + /** + * Configures how the doc model file (*.api.json) will be generated. + */ + "docModel": { + /** + * (REQUIRED) Whether to generate a doc model file. + */ + "enabled": true, + + /** + * The output path for the doc model file. The file extension should be ".api.json". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/temp/.api.json" + */ + "apiJsonFilePath": "/docgen/.api.json" + }, + + /** + * Configures how the .d.ts rollup file will be generated. + */ + "dtsRollup": { + /** + * (REQUIRED) Whether to generate the .d.ts rollup file. + */ + "enabled": true + + /** + * Specifies the output path for a .d.ts rollup file to be generated without any trimming. + * This file will include all declarations that are exported by the main entry point. + * + * If the path is an empty string, then this file will not be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/dist/.d.ts" + */ + // "untrimmedFilePath": "/dist/.d.ts", + + /** + * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release. + * This file will include only declarations that are marked as "@public" or "@beta". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "betaTrimmedFilePath": "/dist/-beta.d.ts", + + /** + * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release. + * This file will include only declarations that are marked as "@public". + * + * If the path is an empty string, then this file will not be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "publicTrimmedFilePath": "/dist/-public.d.ts", + + /** + * When a declaration is trimmed, by default it will be replaced by a code comment such as + * "Excluded from this release type: exampleMember". Set "omitTrimmingComments" to true to remove the + * declaration completely. + * + * DEFAULT VALUE: false + */ + // "omitTrimmingComments": true + }, + + /** + * Configures how the tsdoc-metadata.json file will be generated. + */ + "tsdocMetadata": { + /** + * Whether to generate the tsdoc-metadata.json file. + * + * DEFAULT VALUE: true + */ + // "enabled": true, + /** + * Specifies where the TSDoc metadata file should be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * The default value is "", which causes the path to be automatically inferred from the "tsdocMetadata", + * "typings" or "main" fields of the project's package.json. If none of these fields are set, the lookup + * falls back to "tsdoc-metadata.json" in the package folder. + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "tsdocMetadataFilePath": "/dist/tsdoc-metadata.json" + }, + + /** + * Specifies what type of newlines API Extractor should use when writing output files. By default, the output files + * will be written with Windows-style newlines. To use POSIX-style newlines, specify "lf" instead. + * To use the OS's default newline kind, specify "os". + * + * DEFAULT VALUE: "crlf" + */ + // "newlineKind": "crlf", + + /** + * Configures how API Extractor reports error and warning messages produced during analysis. + * + * There are three sources of messages: compiler messages, API Extractor messages, and TSDoc messages. + */ + "messages": { + /** + * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing + * the input .d.ts files. + * + * TypeScript message identifiers start with "TS" followed by an integer. For example: "TS2551" + * + * DEFAULT VALUE: A single "default" entry with logLevel=warning. + */ + "compilerMessageReporting": { + /** + * Configures the default routing for messages that don't match an explicit rule in this table. + */ + "default": { + /** + * Specifies whether the message should be written to the the tool's output log. Note that + * the "addToApiReportFile" property may supersede this option. + * + * Possible values: "error", "warning", "none" + * + * Errors cause the build to fail and return a nonzero exit code. Warnings cause a production build fail + * and return a nonzero exit code. For a non-production build (e.g. when "api-extractor run" includes + * the "--local" option), the warning is displayed but the build will not fail. + * + * DEFAULT VALUE: "warning" + */ + "logLevel": "warning" + + /** + * When addToApiReportFile is true: If API Extractor is configured to write an API report file (.api.md), + * then the message will be written inside that file; otherwise, the message is instead logged according to + * the "logLevel" option. + * + * DEFAULT VALUE: false + */ + // "addToApiReportFile": false + } + + // "TS2551": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + }, + + /** + * Configures handling of messages reported by API Extractor during its analysis. + * + * API Extractor message identifiers start with "ae-". For example: "ae-extra-release-tag" + * + * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings + */ + "extractorMessageReporting": { + "default": { + "logLevel": "warning" + // "addToApiReportFile": false + } + + // "ae-extra-release-tag": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + }, + + /** + * Configures handling of messages reported by the TSDoc parser when analyzing code comments. + * + * TSDoc message identifiers start with "tsdoc-". For example: "tsdoc-link-tag-unescaped-text" + * + * DEFAULT VALUE: A single "default" entry with logLevel=warning. + */ + "tsdocMessageReporting": { + "default": { + "logLevel": "warning" + // "addToApiReportFile": false + } + + // "tsdoc-link-tag-unescaped-text": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + } + } +} diff --git a/docgen/api-extractor.v1.json b/docgen/api-extractor.v1.json new file mode 100644 index 000000000..f03058f13 --- /dev/null +++ b/docgen/api-extractor.v1.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", + "extends": "./api-extractor.base.json", + "mainEntryPointFilePath": "/lib/index.d.ts", + "docModel": { + "enabled": true, + "apiJsonFilePath": "/docgen/v1/firebase-functions.api.json" + }, + "apiReport": { + "enabled": true, + "reportTempFolder": "/docgen/v1/temp", + "reportFolder": "/docgen/v1" + } +} diff --git a/docgen/api-extractor.v2.json b/docgen/api-extractor.v2.json new file mode 100644 index 000000000..2cf0596b7 --- /dev/null +++ b/docgen/api-extractor.v2.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", + "extends": "./api-extractor.base.json", + "mainEntryPointFilePath": "/lib/v2/index.d.ts", + "docModel": { + "enabled": true, + "apiJsonFilePath": "/docgen/v2/firebase-functions.api.json" + }, + "apiReport": { + "enabled": true, + "reportTempFolder": "/docgen/v2/temp", + "reportFolder": "/docgen/v2" + } +} diff --git a/docgen/tsconfig.json b/docgen/tsconfig.json deleted file mode 100644 index 3c43903cf..000000000 --- a/docgen/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tsconfig.json" -} diff --git a/package-lock.json b/package-lock.json index 4e1d204b0..5b5f7fc85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,6 +45,48 @@ "@cspotcode/source-map-consumer": "0.8.0" } }, + "@firebase/api-documenter": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@firebase/api-documenter/-/api-documenter-0.1.2.tgz", + "integrity": "sha512-aDofRZebqbMzrbo5WAi9f21qUTzhIub7yOszirik3AwujqOzcUr1F7lIFrI41686JD1Zw56lLL/B5EWZTwvVjA==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0", + "@rushstack/ts-command-line": "4.7.8", + "api-extractor-model-me": "0.1.1", + "colors": "~1.2.1", + "js-yaml": "4.0.0", + "resolve": "~1.17.0", + "tslib": "^2.1.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "js-yaml": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", + "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, "@firebase/app-types": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", @@ -256,6 +298,296 @@ } } }, + "@microsoft/api-documenter": { + "version": "7.17.11", + "resolved": "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.17.11.tgz", + "integrity": "sha512-VdCu4eG5RISGEiG/hFO3jaN3gEgMZVXZRFpch/PQzrLO3Vh2QhZTz2LsZ2SYyb7UwBZCK9Z76ULv5cGoflylNA==", + "dev": true, + "requires": { + "@microsoft/api-extractor-model": "7.17.2", + "@microsoft/tsdoc": "0.14.1", + "@rushstack/node-core-library": "3.45.4", + "@rushstack/ts-command-line": "4.10.10", + "colors": "~1.2.1", + "js-yaml": "~3.13.1", + "resolve": "~1.17.0" + }, + "dependencies": { + "@microsoft/tsdoc": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", + "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", + "dev": true + }, + "@rushstack/node-core-library": { + "version": "3.45.4", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", + "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", + "dev": true, + "requires": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "@rushstack/ts-command-line": { + "version": "4.10.10", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.10.tgz", + "integrity": "sha512-F+MH7InPDXqX40qvvcEsnvPpmg566SBpfFqj2fcCh8RjM6AyOoWlXc8zx7giBD3ZN85NVAEjZAgrcLU0z+R2yg==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "validator": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "dev": true + }, + "z-schema": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", + "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", + "dev": true, + "requires": { + "commander": "^2.20.3", + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + } + } + } + }, + "@microsoft/api-extractor": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.23.0.tgz", + "integrity": "sha512-fbdX05RVE1EMA7nvyRHuS9nx1pryhjgURDx6pQlE/9yOXQ5PO7MpYdfWGaRsQwyYuU3+tPxgro819c0R3AK6KA==", + "dev": true, + "requires": { + "@microsoft/api-extractor-model": "7.17.2", + "@microsoft/tsdoc": "0.14.1", + "@microsoft/tsdoc-config": "~0.16.1", + "@rushstack/node-core-library": "3.45.4", + "@rushstack/rig-package": "0.3.11", + "@rushstack/ts-command-line": "4.10.10", + "colors": "~1.2.1", + "lodash": "~4.17.15", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "source-map": "~0.6.1", + "typescript": "~4.6.3" + }, + "dependencies": { + "@microsoft/tsdoc": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", + "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", + "dev": true + }, + "@rushstack/node-core-library": { + "version": "3.45.4", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", + "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", + "dev": true, + "requires": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "@rushstack/ts-command-line": { + "version": "4.10.10", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.10.tgz", + "integrity": "sha512-F+MH7InPDXqX40qvvcEsnvPpmg566SBpfFqj2fcCh8RjM6AyOoWlXc8zx7giBD3ZN85NVAEjZAgrcLU0z+R2yg==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "validator": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "dev": true + }, + "z-schema": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", + "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", + "dev": true, + "requires": { + "commander": "^2.20.3", + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + } + } + } + }, + "@microsoft/api-extractor-model": { + "version": "7.17.2", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.17.2.tgz", + "integrity": "sha512-fYfCeBeLm7jnZligC64qHiH4/vzswFLDfyPpX+uKO36OI2kIeMHrYG0zaezmuinKvE4vg1dAz38zZeDbPvBKGg==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.14.1", + "@microsoft/tsdoc-config": "~0.16.1", + "@rushstack/node-core-library": "3.45.4" + }, + "dependencies": { + "@microsoft/tsdoc": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", + "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", + "dev": true + }, + "@rushstack/node-core-library": { + "version": "3.45.4", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", + "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", + "dev": true, + "requires": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "validator": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "dev": true + }, + "z-schema": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", + "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", + "dev": true, + "requires": { + "commander": "^2.20.3", + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + } + } + } + }, + "@microsoft/tsdoc": { + "version": "0.12.24", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", + "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", + "dev": true + }, + "@microsoft/tsdoc-config": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.1.tgz", + "integrity": "sha512-2RqkwiD4uN6MLnHFljqBlZIXlt/SaUT6cuogU1w2ARw4nKuuppSmR0+s+NC+7kXBQykd9zzu0P4HtBpZT5zBpQ==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.14.1", + "ajv": "~6.12.6", + "jju": "~1.4.0", + "resolve": "~1.19.0" + }, + "dependencies": { + "@microsoft/tsdoc": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", + "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", + "dev": true + }, + "resolve": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "dev": true, + "requires": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + } + } + } + }, "@panva/asn1.js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", @@ -336,6 +668,79 @@ "dev": true, "optional": true }, + "@rushstack/node-core-library": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", + "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", + "dev": true, + "requires": { + "@types/node": "10.17.13", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~3.18.3" + }, + "dependencies": { + "@types/node": { + "version": "10.17.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", + "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "@rushstack/rig-package": { + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.11.tgz", + "integrity": "sha512-uI1/g5oQPtyrT9nStoyX/xgZSLa2b+srRFaDk3r1eqC7zA5th4/bvTGl2QfV3C9NcP+coSqmk5mFJkUfH6i3Lw==", + "dev": true, + "requires": { + "resolve": "~1.17.0", + "strip-json-comments": "~3.1.1" + }, + "dependencies": { + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + } + } + }, + "@rushstack/ts-command-line": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", + "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, "@sinonjs/commons": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", @@ -403,6 +808,12 @@ "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", "dev": true }, + "@types/argparse": { + "version": "1.0.38", + "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", + "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==", + "dev": true + }, "@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -679,6 +1090,18 @@ } } }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ansi-colors": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", @@ -706,6 +1129,16 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", "dev": true }, + "api-extractor-model-me": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", + "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0" + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -1001,6 +1434,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "colors": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", + "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "dev": true + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1531,8 +1970,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "optional": true + "dev": true }, "fast-diff": { "version": "1.2.0", @@ -1540,6 +1978,12 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -1640,6 +2084,17 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1815,8 +2270,7 @@ "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true, - "optional": true + "dev": true }, "growl": { "version": "1.10.5", @@ -2019,6 +2473,12 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "import-lazy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", + "dev": true + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -2235,6 +2695,12 @@ "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", "dev": true }, + "jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", + "dev": true + }, "jose": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", @@ -2365,6 +2831,12 @@ "bignumber.js": "^9.0.0" } }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -2377,6 +2849,15 @@ "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", "dev": true }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, "jsonwebtoken": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", @@ -2550,6 +3031,12 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, "lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -2562,6 +3049,12 @@ "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", "dev": true }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, "lodash.isinteger": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", @@ -3737,6 +4230,12 @@ "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "dev": true }, + "string-argv": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", + "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", + "dev": true + }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -3853,6 +4352,12 @@ "thenify": ">= 3.1.0 < 4" } }, + "timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", + "dev": true + }, "toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -4143,6 +4648,15 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4168,6 +4682,12 @@ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, + "validator": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", + "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", + "dev": true + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -4652,6 +5172,18 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "optional": true + }, + "z-schema": { + "version": "3.18.4", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", + "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", + "dev": true, + "requires": { + "commander": "^2.7.1", + "lodash.get": "^4.0.0", + "lodash.isequal": "^4.0.0", + "validator": "^8.0.0" + } } } } diff --git a/package.json b/package.json index f8cb58477..20f8c6ce0 100644 --- a/package.json +++ b/package.json @@ -157,6 +157,12 @@ }, "scripts": { "apidocs": "node docgen/generate-docs.js", + "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local", + "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && api-documenter-fire toc -i docgen/v1 -o docgen/v1/markdown/toc -p /docs/reference/functions", + "docgen:v1": "npm run docgen:v1:extract && npm run docgen:v1:gen", + "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", + "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && api-documenter-fire toc -i docgen/v2 -o docgen/v2/markdown/toc -p /docs/reference/functions/v2", + "docgen:v2": "npm run docgen:v2:extract && npm run docgen:v2:gen", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", @@ -177,6 +183,9 @@ "node-fetch": "^2.6.7" }, "devDependencies": { + "@firebase/api-documenter": "^0.1.2", + "@microsoft/api-documenter": "^7.13.45", + "@microsoft/api-extractor": "^7.18.7", "@types/chai": "^4.1.7", "@types/chai-as-promised": "^7.1.0", "@types/jsonwebtoken": "^8.3.2", From ea634a8cee8b55b0a873e9a1aa2eda776556524f Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Mon, 2 May 2022 23:33:13 -0700 Subject: [PATCH 431/705] Change type info to be inheritance friendly. (#1091) Unwind the cleverness of CloudEvent. Types now match the approved format of the Python API. CloudFunction now templatizes the CloudEvent rather than the EventType so that we can keep typing to include subtypes of events both in code complete and in firebase-functions-test. --- src/v2/core.ts | 24 ++------- src/v2/providers/alerts/alerts.ts | 21 ++++---- src/v2/providers/alerts/appDistribution.ts | 21 ++++---- src/v2/providers/alerts/billing.ts | 23 ++++---- src/v2/providers/alerts/crashlytics.ts | 62 ++++++++++------------ src/v2/providers/pubsub.ts | 6 +-- src/v2/providers/storage.ts | 38 +++++++------ 7 files changed, 82 insertions(+), 113 deletions(-) diff --git a/src/v2/core.ts b/src/v2/core.ts index f5561d66f..54d61ff1c 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -57,7 +57,7 @@ export interface TriggerAnnotation { * 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 { +export interface CloudEvent { /** Version of the CloudEvents spec for this event. */ readonly specversion: '1.0'; @@ -78,32 +78,14 @@ interface CloudEventBase { /** 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; } -/** - * A CloudEvent with custom extension attributes - */ -export type CloudEvent = CloudEventBase & Ext; /** A handler for CloudEvents. */ -export interface CloudFunction { +export interface CloudFunction> { (raw: CloudEvent): any | Promise; __trigger?: unknown; __endpoint: ManifestEndpoint; - run(event: CloudEvent): any | Promise; + run(event: EventType): any | Promise; } diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 44edd4e55..df800fadb 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -14,7 +14,10 @@ export interface FirebaseAlertData { payload: T; } -interface WithAlertTypeAndApp { +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export interface AlertEvent extends CloudEvent> { /** The type of the alerts that got triggered. */ alertType: string; /** @@ -22,14 +25,10 @@ interface WithAlertTypeAndApp { * and only present when the alert is targeting at a specific Firebase App. */ appId?: string; + + /** Data for an AlertEvent is a FirebaseAlertData with a given payload. */ + data: FirebaseAlertData; } -/** - * A custom CloudEvent for Firebase Alerts (with custom extension attributes). - */ -export type AlertEvent = CloudEvent< - FirebaseAlertData, - WithAlertTypeAndApp ->; /** @internal */ export const eventType = 'google.firebase.firebasealerts.alerts.v1.published'; @@ -63,13 +62,11 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { export function onAlertPublished( alertTypeOrOpts: AlertType | FirebaseAlertOptions, handler: (event: AlertEvent) => any | Promise -): CloudFunction> { +): CloudFunction> { const [opts, alertType, appId] = getOptsAndAlertTypeAndApp(alertTypeOrOpts); const func = (raw: CloudEvent) => { - return handler( - raw as CloudEvent, WithAlertTypeAndApp> - ); + return handler(raw as AlertEvent); }; func.run = handler; diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 94bd81ab8..014b1d937 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -14,19 +14,16 @@ export interface NewTesterDevicePayload { testerDeviceIdentifier: string; } -interface WithAlertTypeAndApp { +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export interface AppDistributionEvent + extends CloudEvent> { /** The type of the alerts that got triggered. */ alertType: string; /** The Firebase App ID that’s associated with the alert. */ appId: string; } -/** - * A custom CloudEvent for Firebase Alerts (with custom extension attributes). - */ -export type AppDistributionEvent = CloudEvent< - FirebaseAlertData, - WithAlertTypeAndApp ->; /** @internal */ export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice'; @@ -45,19 +42,19 @@ export function onNewTesterIosDevicePublished( handler: ( event: AppDistributionEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewTesterIosDevicePublished( appId: string, handler: ( event: AppDistributionEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewTesterIosDevicePublished( opts: AppDistributionOptions, handler: ( event: AppDistributionEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewTesterIosDevicePublished( appIdOrOptsOrHandler: | string @@ -68,7 +65,7 @@ export function onNewTesterIosDevicePublished( handler?: ( event: AppDistributionEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { if (typeof appIdOrOptsOrHandler === 'function') { handler = appIdOrOptsOrHandler as ( event: AppDistributionEvent diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index b9aaffc09..4439546a5 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -28,14 +28,13 @@ export interface PlanAutomatedUpdatePayload { notificationType: string; } -interface WithAlertType { - /** The type of the alerts that got triggered. */ - alertType: string; -} /** * A custom CloudEvent for billing Firebase Alerts (with custom extension attributes). */ -export type BillingEvent = CloudEvent, WithAlertType>; +export interface BillingEvent extends CloudEvent> { + /** The type of the alerts that got triggered. */ + alertType: string; +} /** @internal */ export const planUpdateAlert = 'billing.planUpdate'; @@ -47,17 +46,17 @@ export const planAutomatedUpdateAlert = 'billing.planAutomatedUpdate'; */ export function onPlanUpdatePublished( handler: (event: BillingEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onPlanUpdatePublished( opts: options.EventHandlerOptions, handler: (event: BillingEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onPlanUpdatePublished( optsOrHandler: | options.EventHandlerOptions | ((event: BillingEvent) => any | Promise), handler?: (event: BillingEvent) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( planUpdateAlert, optsOrHandler, @@ -72,13 +71,13 @@ export function onPlanAutomatedUpdatePublished( handler: ( event: BillingEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onPlanAutomatedUpdatePublished( opts: options.EventHandlerOptions, handler: ( event: BillingEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onPlanAutomatedUpdatePublished( optsOrHandler: | options.EventHandlerOptions @@ -86,7 +85,7 @@ export function onPlanAutomatedUpdatePublished( handler?: ( event: BillingEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( planAutomatedUpdateAlert, optsOrHandler, @@ -101,7 +100,7 @@ export function onOperation( | options.EventHandlerOptions | ((event: BillingEvent) => any | Promise), handler: (event: BillingEvent) => any | Promise -): CloudFunction> { +): CloudFunction> { if (typeof optsOrHandler === 'function') { handler = optsOrHandler as (event: BillingEvent) => any | Promise; optsOrHandler = {}; diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 14e8a87e8..c9c208e57 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -111,19 +111,15 @@ export interface NewAnrIssuePayload { issue: Issue; } -interface WithAlertTypeAndApp { +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + */ +export interface CrashlyticsEvent extends CloudEvent> { /** The type of the alerts that got triggered. */ alertType: string; /** The Firebase App ID that’s associated with the alert. */ appId: string; } -/** - * A custom CloudEvent for Firebase Alerts (with custom extension attributes). - */ -export type CrashlyticsEvent = CloudEvent< - FirebaseAlertData, - WithAlertTypeAndApp ->; /** @internal */ export const newFatalIssueAlert = 'crashlytics.newFatalIssue'; @@ -150,15 +146,15 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions { */ export function onNewFatalIssuePublished( handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewFatalIssuePublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewFatalIssuePublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewFatalIssuePublished( appIdOrOptsOrHandler: | string @@ -167,7 +163,7 @@ export function onNewFatalIssuePublished( handler?: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( newFatalIssueAlert, appIdOrOptsOrHandler, @@ -182,19 +178,19 @@ export function onNewNonfatalIssuePublished( handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewNonfatalIssuePublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewNonfatalIssuePublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewNonfatalIssuePublished( appIdOrOptsOrHandler: | string @@ -205,7 +201,7 @@ export function onNewNonfatalIssuePublished( handler?: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( newNonfatalIssueAlert, appIdOrOptsOrHandler, @@ -220,19 +216,19 @@ export function onRegressionAlertPublished( handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onRegressionAlertPublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onRegressionAlertPublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onRegressionAlertPublished( appIdOrOptsOrHandler: | string @@ -241,7 +237,7 @@ export function onRegressionAlertPublished( handler?: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( regressionAlert, appIdOrOptsOrHandler, @@ -256,19 +252,19 @@ export function onStabilityDigestPublished( handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onStabilityDigestPublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onStabilityDigestPublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onStabilityDigestPublished( appIdOrOptsOrHandler: | string @@ -277,7 +273,7 @@ export function onStabilityDigestPublished( handler?: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( stabilityDigestAlert, appIdOrOptsOrHandler, @@ -290,15 +286,15 @@ export function onStabilityDigestPublished( */ export function onVelocityAlertPublished( handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onVelocityAlertPublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onVelocityAlertPublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onVelocityAlertPublished( appIdOrOptsOrHandler: | string @@ -307,7 +303,7 @@ export function onVelocityAlertPublished( handler?: ( event: CrashlyticsEvent ) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( velocityAlert, appIdOrOptsOrHandler, @@ -320,22 +316,22 @@ export function onVelocityAlertPublished( */ export function onNewAnrIssuePublished( handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewAnrIssuePublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewAnrIssuePublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction>; +): CloudFunction>; export function onNewAnrIssuePublished( appIdOrOptsOrHandler: | string | CrashlyticsOptions | ((event: CrashlyticsEvent) => any | Promise), handler?: (event: CrashlyticsEvent) => any | Promise -): CloudFunction> { +): CloudFunction> { return onOperation( newAnrIssueAlert, appIdOrOptsOrHandler, @@ -351,7 +347,7 @@ export function onOperation( | CrashlyticsOptions | ((event: CrashlyticsEvent) => any | Promise), handler: (event: CrashlyticsEvent) => any | Promise -): CloudFunction> { +): CloudFunction> { if (typeof appIdOrOptsOrHandler === 'function') { handler = appIdOrOptsOrHandler as ( event: CrashlyticsEvent diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 9f06fb083..62a5ba4a1 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -101,18 +101,18 @@ export interface PubSubOptions extends options.EventHandlerOptions { export function onMessagePublished( topic: string, handler: (event: CloudEvent>) => any | Promise -): CloudFunction>; +): CloudFunction>>; /** Handle a message being published to a Pub/Sub topic. */ export function onMessagePublished( options: PubSubOptions, handler: (event: CloudEvent>) => any | Promise -): CloudFunction>; +): CloudFunction>>; export function onMessagePublished( topicOrOptions: string | PubSubOptions, handler: (event: CloudEvent>) => any | Promise -): CloudFunction> { +): CloudFunction>> { let topic: string; let opts: options.EventHandlerOptions; if (typeof topicOrOptions === 'string') { diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 6c815615e..7c5fe01b1 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -174,13 +174,11 @@ export interface CustomerEncryption { keySha256?: string; } -interface WithBucket { +export interface StorageEvent extends CloudEvent { /** The name of the bucket containing this object. */ bucket: string; } -export type StorageEvent = CloudEvent; - /** @internal */ export const archivedEvent = 'google.cloud.storage.object.v1.archived'; /** @internal */ @@ -199,17 +197,17 @@ export interface StorageOptions extends options.EventHandlerOptions { /** Handle a storage object archived */ export function onObjectArchived( handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectArchived( bucket: string, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectArchived( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectArchived( buketOrOptsOrHandler: @@ -217,24 +215,24 @@ export function onObjectArchived( | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise -): CloudFunction { +): CloudFunction { return onOperation(archivedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object finalized */ export function onObjectFinalized( handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectFinalized( bucket: string, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectFinalized( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectFinalized( buketOrOptsOrHandler: @@ -242,24 +240,24 @@ export function onObjectFinalized( | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise -): CloudFunction { +): CloudFunction { return onOperation(finalizedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object deleted */ export function onObjectDeleted( handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectDeleted( bucket: string, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectDeleted( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectDeleted( buketOrOptsOrHandler: @@ -267,24 +265,24 @@ export function onObjectDeleted( | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise -): CloudFunction { +): CloudFunction { return onOperation(deletedEvent, buketOrOptsOrHandler, handler); } /** Handle a storage object metadata updated */ export function onObjectMetadataUpdated( handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectMetadataUpdated( bucket: string, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectMetadataUpdated( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise -): CloudFunction; +): CloudFunction; export function onObjectMetadataUpdated( buketOrOptsOrHandler: @@ -292,7 +290,7 @@ export function onObjectMetadataUpdated( | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise -): CloudFunction { +): CloudFunction { return onOperation(metadataUpdatedEvent, buketOrOptsOrHandler, handler); } @@ -304,7 +302,7 @@ export function onOperation( | StorageOptions | ((event: StorageEvent) => any | Promise), handler: (event: StorageEvent) => any | Promise -): CloudFunction { +): CloudFunction { if (typeof bucketOrOptsOrHandler === 'function') { handler = bucketOrOptsOrHandler as ( event: StorageEvent From 27bc77faa7efaca01777ac3e7ee571e4886bb37b Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 3 May 2022 13:32:26 -0700 Subject: [PATCH 432/705] MB -> MiB; GB -> GiB (#1090) Change memory options to use the new V2 standard suffix that makes it clear we use base 2 units instead of base 10. --- spec/v2/providers/fixtures.ts | 2 +- src/v2/options.ts | 47 ++++++++++++++--------------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/spec/v2/providers/fixtures.ts b/spec/v2/providers/fixtures.ts index 7a054572e..f330efed1 100644 --- a/spec/v2/providers/fixtures.ts +++ b/spec/v2/providers/fixtures.ts @@ -4,7 +4,7 @@ import * as options from '../../../src/v2/options'; export const FULL_OPTIONS: options.GlobalOptions = { region: 'us-west1', - memory: '512MB', + memory: '512MiB', timeoutSeconds: 60, minInstances: 1, maxInstances: 3, diff --git a/src/v2/options.ts b/src/v2/options.ts index 42404bfa0..c4e3cd7de 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -75,27 +75,27 @@ export const MAX_CONCURRENCY = 1_000; * List of available memory options supported by Cloud Functions. */ export const SUPPORTED_MEMORY_OPTIONS = [ - '128MB', - '256MB', - '512MB', - '1GB', - '2GB', - '4GB', - '8GB', - '16GB', - '32GB', + '128MiB', + '256MiB', + '512MiB', + '1GiB', + '2GiB', + '4GiB', + '8GiB', + '16GiB', + '32GiB', ] as const; const MemoryOptionToMB: Record = { - '128MB': 128, - '256MB': 256, - '512MB': 512, - '1GB': 1024, - '2GB': 2048, - '4GB': 4096, - '8GB': 8192, - '16GB': 16384, - '32GB': 32768, + '128MiB': 128, + '256MiB': 256, + '512MiB': 512, + '1GiB': 1024, + '2GiB': 2048, + '4GiB': 4096, + '8GiB': 8192, + '16GiB': 16384, + '32GiB': 32768, }; /** @@ -340,16 +340,7 @@ export function optionsToEndpoint( endpoint.vpc = vpc; } convertIfPresent(endpoint, opts, 'availableMemoryMb', 'memory', (mem) => { - const memoryLookup = { - '128MB': 128, - '256MB': 256, - '512MB': 512, - '1GB': 1024, - '2GB': 2048, - '4GB': 4096, - '8GB': 8192, - }; - return memoryLookup[mem]; + return MemoryOptionToMB[mem]; }); convertIfPresent(endpoint, opts, 'region', 'region', (region) => { if (typeof region === 'string') { From e463f85c677d69acb083b9d0295b9e1b3c84e060 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 4 May 2022 11:40:34 -0700 Subject: [PATCH 433/705] Change typing info to fix compiler error (#1093) --- integration_test/functions/src/index.ts | 2 +- integration_test/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 57654c8d1..e8c6918a5 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -115,7 +115,7 @@ async function updateRemoteConfig( } } -function v1Tests(testId: string, accessToken: string): Array> { +function v1Tests(testId: string, accessToken: string): Array> { return [ // A database write to trigger the Firebase Realtime Database tests. admin diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 6ae86f25f..814ddc492 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -114,7 +114,7 @@ function cleanup { build_sdk delete_all_functions -for version in 12 14 16; do +for version in 14 16; do create_package_json $TIMESTAMP $version "^10.0.0" install_deps announce "Re-deploying the same functions to Node $version runtime ..." From e147a02653f8643d2171f16ad102df642c5cd44b Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 5 May 2022 17:21:24 +0900 Subject: [PATCH 434/705] Remove all errors when generating reference doc using api-extractor (#1095) As is, generating reference doc for v2 sdk produces tons of errors. Most common errors are: 1) Exported type definition depending on unexported type definition 2) Using `@hidden` tag which is unsupported in api-extractor I solve both of these issues here. I selected to use `@alpha` tag for params related types - that would prevent it from showing up in reference docs. --- docgen/api-extractor.v2.json | 20 ++ package-lock.json | 394 +++++++++++++++++++----------- package.json | 3 +- src/cloud-functions.ts | 31 ++- src/common/providers/https.ts | 32 +-- src/logger/index.ts | 14 +- src/providers/pubsub.ts | 24 +- src/v2/options.ts | 13 +- src/v2/params/index.ts | 40 +-- src/v2/params/types.ts | 10 +- src/v2/providers/alerts/alerts.ts | 4 +- src/v2/providers/pubsub.ts | 6 +- 12 files changed, 370 insertions(+), 221 deletions(-) diff --git a/docgen/api-extractor.v2.json b/docgen/api-extractor.v2.json index 2cf0596b7..492c8bae6 100644 --- a/docgen/api-extractor.v2.json +++ b/docgen/api-extractor.v2.json @@ -10,5 +10,25 @@ "enabled": true, "reportTempFolder": "/docgen/v2/temp", "reportFolder": "/docgen/v2" + }, + "messages": { + "compilerMessageReporting": { + "default": { + "logLevel": "warning" + } + }, + "extractorMessageReporting": { + "default": { + "logLevel": "warning" + }, + "ae-missing-release-tag": { + "logLevel": "none" + } + }, + "tsdocMessageReporting": { + "default": { + "logLevel": "error" + } + } } } diff --git a/package-lock.json b/package-lock.json index 5b5f7fc85..2bd402d37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,12 +61,122 @@ "tslib": "^2.1.0" }, "dependencies": { + "@microsoft/tsdoc": { + "version": "0.12.24", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", + "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", + "dev": true + }, + "@rushstack/node-core-library": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", + "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", + "dev": true, + "requires": { + "@types/node": "10.17.13", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~3.18.3" + } + }, + "@rushstack/ts-command-line": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", + "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + }, + "dependencies": { + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + } + } + }, + "@types/argparse": { + "version": "1.0.38", + "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", + "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==", + "dev": true + }, + "@types/node": { + "version": "10.17.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", + "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", + "dev": true + }, + "api-extractor-model-me": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", + "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0" + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "colors": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", + "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "dev": true + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "optional": true + }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + }, + "import-lazy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", + "dev": true + }, + "jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", + "dev": true + }, "js-yaml": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", @@ -76,6 +186,42 @@ "argparse": "^2.0.1" } }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -84,6 +230,69 @@ "requires": { "path-parse": "^1.0.6" } + }, + "semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "string-argv": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", + "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", + "dev": true + }, + "timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", + "dev": true + }, + "tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "dev": true + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, + "validator": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", + "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "z-schema": { + "version": "3.18.4", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", + "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", + "dev": true, + "requires": { + "commander": "^2.7.1", + "lodash.get": "^4.0.0", + "lodash.isequal": "^4.0.0", + "validator": "^8.0.0" + } } } }, @@ -552,12 +761,6 @@ } } }, - "@microsoft/tsdoc": { - "version": "0.12.24", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", - "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", - "dev": true - }, "@microsoft/tsdoc-config": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.1.tgz", @@ -668,40 +871,6 @@ "dev": true, "optional": true }, - "@rushstack/node-core-library": { - "version": "3.36.0", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", - "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", - "dev": true, - "requires": { - "@types/node": "10.17.13", - "colors": "~1.2.1", - "fs-extra": "~7.0.1", - "import-lazy": "~4.0.0", - "jju": "~1.4.0", - "resolve": "~1.17.0", - "semver": "~7.3.0", - "timsort": "~0.3.0", - "z-schema": "~3.18.3" - }, - "dependencies": { - "@types/node": { - "version": "10.17.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", - "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", - "dev": true - }, - "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - } - } - }, "@rushstack/rig-package": { "version": "0.3.11", "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.11.tgz", @@ -729,18 +898,6 @@ } } }, - "@rushstack/ts-command-line": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", - "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", - "dev": true, - "requires": { - "@types/argparse": "1.0.38", - "argparse": "~1.0.9", - "colors": "~1.2.1", - "string-argv": "~0.3.1" - } - }, "@sinonjs/commons": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", @@ -1129,16 +1286,6 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", "dev": true }, - "api-extractor-model-me": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", - "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", - "dev": true, - "requires": { - "@microsoft/tsdoc": "0.12.24", - "@rushstack/node-core-library": "3.36.0" - } - }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -2290,19 +2437,6 @@ "jws": "^4.0.0" } }, - "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, - "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3180,9 +3314,9 @@ "dev": true }, "marked": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", - "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", + "version": "4.0.15", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.15.tgz", + "integrity": "sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q==", "dev": true }, "media-typer": { @@ -3469,12 +3603,6 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, "nise": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", @@ -3813,12 +3941,6 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, "promise-polyfill": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", @@ -4130,9 +4252,9 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "shiki": { - "version": "0.9.15", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz", - "integrity": "sha512-/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", + "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", @@ -4564,20 +4686,16 @@ } }, "typedoc": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", - "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", + "version": "0.22.15", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.15.tgz", + "integrity": "sha512-CMd1lrqQbFvbx6S9G6fL4HKp3GoIuhujJReWqlIvSb2T26vGai+8Os3Mde7Pn832pXYemd9BMuuYWhFpL5st0Q==", "dev": true, "requires": { - "glob": "^7.1.7", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", + "glob": "^7.2.0", "lunr": "^2.3.9", - "marked": "^2.1.1", - "minimatch": "^3.0.0", - "progress": "^2.0.3", - "shiki": "^0.9.3", - "typedoc-default-themes": "^0.12.10" + "marked": "^4.0.12", + "minimatch": "^5.0.1", + "shiki": "^0.10.1" }, "dependencies": { "glob": { @@ -4592,29 +4710,47 @@ "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } + } + }, + "minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + } } } } }, - "typedoc-default-themes": { - "version": "0.12.10", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", - "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", - "dev": true - }, "typescript": { "version": "4.6.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, - "uglify-js": { - "version": "3.15.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz", - "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==", - "dev": true, - "optional": true - }, "unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -4682,12 +4818,6 @@ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, - "validator": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", - "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", - "dev": true - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -4845,12 +4975,6 @@ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -5172,18 +5296,6 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "optional": true - }, - "z-schema": { - "version": "3.18.4", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", - "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", - "dev": true, - "requires": { - "commander": "^2.7.1", - "lodash.get": "^4.0.0", - "lodash.isequal": "^4.0.0", - "validator": "^8.0.0" - } } } } diff --git a/package.json b/package.json index 20f8c6ce0..86e128cad 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,6 @@ "mock-require": "^3.0.3", "mz": "^2.7.0", "nock": "^10.0.6", - "node-fetch": "^2.6.7", "portfinder": "^1.0.28", "prettier": "^1.18.2", "semver": "^7.3.5", @@ -218,7 +217,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "0.21.2", + "typedoc": "^0.22.15", "typescript": "^4.3.5", "yargs": "^15.3.1" }, diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 1f59f50d8..6018e4caa 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -39,13 +39,13 @@ import { } from './common/encoding'; import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest'; -/** @hidden */ +/* @internal */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); /** - * @hidden - * * Wire format for an event. + * + * @internal */ export interface Event { context: { @@ -181,20 +181,21 @@ export interface ChangeJson { */ before?: any; /** - * @hidden * Comma-separated string that represents names of fields that changed. + * + * @internal */ fieldMask?: string; } export namespace Change { - /** @hidden */ + /** @internal */ function reinterpretCast(x: any) { return x as T; } /** - * @hidden + * @internal * Factory method for creating a Change from a `before` object and an `after` * object. */ @@ -203,7 +204,7 @@ export namespace Change { } /** - * @hidden + * @internal * Factory method for creating a Change from a JSON and an optional customizer * function to be applied to both the `before` and the `after` fields. */ @@ -222,7 +223,7 @@ export namespace Change { ); } - /** @hidden */ + /** @internal */ export function applyFieldMask( sparseBefore: any, after: any, @@ -257,7 +258,6 @@ export interface Resource { } /** - * @hidden * TriggerAnnotated is used internally by the firebase CLI to understand what * type of Cloud Function to deploy. */ @@ -290,7 +290,6 @@ export interface TriggerAnnotated { } /** - * @hidden * EndpointAnnotated is used to generate the manifest that conforms to the container contract. */ export interface EndpointAnnotated { @@ -336,7 +335,7 @@ export type CloudFunction = Runnable & EndpointAnnotated & ((input: any, context?: any) => PromiseLike | any); -/** @hidden */ +/** @internal */ export interface MakeCloudFunctionArgs { after?: (raw: Event) => void; before?: (raw: Event) => void; @@ -356,7 +355,7 @@ export interface MakeCloudFunctionArgs { triggerResource: () => string; } -/** @hidden */ +/** @internal */ export function makeCloudFunction({ after = () => {}, before = () => {}, @@ -499,7 +498,7 @@ export function makeCloudFunction({ return cloudFunction; } -/** @hidden */ +/** @internal */ function _makeParams( context: EventContext, triggerResourceGetter: () => string @@ -527,7 +526,7 @@ function _makeParams( return params; } -/** @hidden */ +/** @internal */ function _makeAuth(event: Event, authType: string) { if (authType === 'UNAUTHENTICATED') { return null; @@ -538,7 +537,7 @@ function _makeAuth(event: Event, authType: string) { }; } -/** @hidden */ +/** @internal */ function _detectAuthType(event: Event) { if (_.get(event, 'context.auth.admin')) { return 'ADMIN'; @@ -549,7 +548,7 @@ function _detectAuthType(event: Event) { return 'UNAUTHENTICATED'; } -/** @hidden */ +/** @internal */ export function optionsToTrigger(options: DeploymentOptions) { const trigger: any = {}; copyIfPresent( diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 29f516bc7..be50df1d4 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -34,7 +34,9 @@ import { TaskContext } from './tasks'; const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/; -/** @hidden */ +/** + * Represents incoming request object. + */ export interface Request extends express.Request { rawBody: Buffer; } @@ -228,7 +230,9 @@ export type FunctionsErrorCode = | 'data-loss' | 'unauthenticated'; -/** @hidden */ +/** + * Canonical name of HTTP status. + */ export type CanonicalErrorCodeName = | 'OK' | 'CANCELLED' @@ -248,7 +252,6 @@ export type CanonicalErrorCodeName = | 'UNAVAILABLE' | 'DATA_LOSS'; -/** @hidden */ interface HttpErrorCode { canonicalName: CanonicalErrorCodeName; status: number; @@ -283,7 +286,6 @@ const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, }; -/** @hidden */ interface HttpErrorWireFormat { details?: unknown; message: string; @@ -309,7 +311,7 @@ export class HttpsError extends Error { /** * A wire format representation of a provided error code. * - * @hidden + * @internal */ public readonly httpErrorCode: HttpErrorCode; @@ -341,7 +343,6 @@ export class HttpsError extends Error { } } -/** @hidden */ // The allowed interface for an HTTP request to a Callable function. interface HttpRequest extends Request { body: { @@ -349,15 +350,17 @@ interface HttpRequest extends Request { }; } -/** @hidden */ // The format for an HTTP body response from a Callable function. interface HttpResponseBody { result?: any; error?: HttpsError; } -/** @hidden */ -// Returns true if req is a properly formatted callable request. +/** + * Returns true if req is a properly formatted callable request. + * + * @internal + */ export function isValidRequest(req: Request): req is HttpRequest { // The body must not be empty. if (!req.body) { @@ -400,16 +403,15 @@ export function isValidRequest(req: Request): req is HttpRequest { return true; } -/** @hidden */ const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value'; -/** @hidden */ const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value'; /** * Encodes arbitrary data in our special format for JSON. * This is exposed only for testing. + * + * @internal */ -/** @hidden */ export function encode(data: any): any { if (data === null || typeof data === 'undefined') { return null; @@ -448,8 +450,9 @@ export function encode(data: any): any { /** * Decodes our special format for JSON into native types. * This is exposed only for testing. + * + * @internal */ -/** @hidden */ export function decode(data: any): any { if (data === null) { return data; @@ -494,12 +497,9 @@ export function decode(data: any): any { * * Users are encouraged to setup log-based metric based on these values, and * changing their values may cause their metrics to break. - * */ -/** @hidden */ type TokenStatus = 'MISSING' | 'VALID' | 'INVALID'; -/** @hidden */ interface CallableTokenStatus { app: TokenStatus; auth: TokenStatus; diff --git a/src/logger/index.ts b/src/logger/index.ts index deb7c1762..5ea3e9e36 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -30,7 +30,6 @@ export interface LogEntry { [key: string]: any; } -/** @internal */ function removeCircular(obj: any, refs: any[] = []): any { if (typeof obj !== 'object' || !obj) { return obj; @@ -62,7 +61,7 @@ function removeCircular(obj: any, refs: any[] = []): any { /** * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). - * @param entry The `LogEntry` including severity, message, and any additional structured metadata. + * @param entry - The `LogEntry` including severity, message, and any additional structured metadata. */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { @@ -94,7 +93,7 @@ export function write(entry: LogEntry) { /** * Writes a `DEBUG` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. */ export function debug(...args: any[]) { write(entryFromArgs('DEBUG', args)); @@ -103,7 +102,7 @@ export function debug(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. */ export function log(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -112,7 +111,7 @@ export function log(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. */ export function info(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -121,7 +120,7 @@ export function info(...args: any[]) { /** * Writes a `WARNING` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. */ export function warn(...args: any[]) { write(entryFromArgs('WARNING', args)); @@ -130,13 +129,12 @@ export function warn(...args: any[]) { /** * Writes an `ERROR` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. */ export function error(...args: any[]) { write(entryFromArgs('ERROR', args)); } -/** @hidden */ function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry { let entry = {}; const lastArg = args[args.length - 1]; diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index 9cd88bd86..c7e205642 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -30,23 +30,23 @@ import { ScheduleRetryConfig, } from '../function-configuration'; -/** @hidden */ +/** @internal */ export const provider = 'google.pubsub'; -/** @hidden */ +/** @internal */ export const service = 'pubsub.googleapis.com'; /** * Registers a Cloud Function triggered when a Google Cloud Pub/Sub message * is sent to a specified topic. * - * @param topic The Pub/Sub topic to watch for message events. + * @param topic - The Pub/Sub topic to watch for message events. * @return Pub/Sub topic builder interface. */ export function topic(topic: string) { return _topicWithOptions(topic, {}); } -/** @hidden */ +/** @internal */ export function _topicWithOptions( topic: string, options: DeploymentOptions @@ -69,7 +69,7 @@ export function _topicWithOptions( * Access via [`functions.pubsub.topic()`](providers_pubsub_.html#topic). */ export class TopicBuilder { - /** @hidden */ + /** @internal */ constructor( private triggerResource: () => string, private options: DeploymentOptions @@ -79,7 +79,7 @@ export class TopicBuilder { * Event handler that fires every time a Cloud Pub/Sub message is * published. * - * @param handler Event handler that runs every time a Cloud Pub/Sub message + * @param handler - Event handler that runs every time a Cloud Pub/Sub message * is published. * @return A Cloud Function that you can export and deploy. */ @@ -101,14 +101,14 @@ export class TopicBuilder { /** * Registers a Cloud Function to run at specified times. * - * @param schedule The schedule, in Unix Crontab or AppEngine syntax. + * @param schedule - The schedule, in Unix Crontab or AppEngine syntax. * @return ScheduleBuilder interface. */ export function schedule(schedule: string): ScheduleBuilder { return _scheduleWithOptions(schedule, {}); } -/** @hidden */ +/** @internal */ export function _scheduleWithOptions( schedule: string, options: DeploymentOptions @@ -136,7 +136,7 @@ export function _scheduleWithOptions( * Access via [`functions.pubsub.schedule()`](providers_pubsub_.html#schedule). */ export class ScheduleBuilder { - /** @hidden */ + /** @internal */ constructor( private triggerResource: () => string, private options: DeploymentOptions @@ -156,7 +156,7 @@ export class ScheduleBuilder { * Event handler for scheduled functions. Triggered whenever the associated * scheduler job sends a Pub/Sub message. * - * @param handler Handler that fires whenever the associated + * @param handler - Handler that fires whenever the associated * scheduler job sends a Pub/Sub message. * @return A Cloud Function that you can export and deploy. */ @@ -177,7 +177,7 @@ export class ScheduleBuilder { /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data Payload of a Pub/Sub message. + * @param data - Payload of a Pub/Sub message. */ export class Message { /** @@ -190,7 +190,7 @@ export class Message { */ readonly attributes: { [key: string]: string }; - /** @hidden */ + /** @internal */ private _json: any; constructor(data: any) { diff --git a/src/v2/options.ts b/src/v2/options.ts index c4e3cd7de..88d1be69e 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -168,14 +168,14 @@ export interface GlobalOptions { /** * Number of requests a function can serve at once. * 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). + * 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. */ concurrency?: number | null; /** * Fractional number of CPUs to allocate to a function. - * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes. + * 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 @@ -227,7 +227,7 @@ let globalOptions: GlobalOptions | undefined; /** * Sets default options for all functions written using the v2 SDK. - * @param options Options to set as default + * @param options - Options to set as default */ export function setGlobalOptions(options: GlobalOptions) { if (globalOptions) { @@ -239,6 +239,7 @@ export function setGlobalOptions(options: GlobalOptions) { /** * Get the currently set default options. * Used only for trigger generation. + * * @internal */ export function getGlobalOptions(): GlobalOptions { @@ -254,6 +255,7 @@ export interface EventHandlerOptions extends GlobalOptions { /** * Apply GlobalOptions to trigger definitions. + * * @internal */ export function optionsToTriggerAnnotations( @@ -316,6 +318,7 @@ export function optionsToTriggerAnnotations( /** * Apply GlobalOptions to endpoint manifest. + * * @internal */ export function optionsToEndpoint( @@ -359,9 +362,7 @@ export function optionsToEndpoint( return endpoint; } -/** - * @hidden - */ +/* @internal */ export function __getSpec(): { globalOptions: GlobalOptions; params: ParamSpec[]; diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index f4ea32b53..29acab37a 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -1,4 +1,3 @@ -/** @hidden */ import { BooleanParam, FloatParam, @@ -10,14 +9,15 @@ import { StringParam, } from './types'; +/* @alpha */ export { ParamOptions }; +/* @alpha */ export const declaredParams: Param[] = []; /** * Use a helper to manage the list such that params are uniquely * registered once only but order is preserved. - * @internal */ function registerParam(param: Param) { for (let i = 0; i < declaredParams.length; i++) { @@ -31,9 +31,11 @@ function registerParam(param: Param) { /** * Declare a string param. * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a `string` return type for `.value`. + * + * @alpha */ export function defineString( name: string, @@ -47,9 +49,11 @@ export function defineString( /** * Declare a boolean param. * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a `boolean` return type for `.value`. + * + * @alpha */ export function defineBoolean( name: string, @@ -63,9 +67,11 @@ export function defineBoolean( /** * Declare an integer param. * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a `number` return type for `.value`. + * + * @alpha */ export function defineInt( name: string, @@ -79,9 +85,11 @@ export function defineInt( /** * Declare a float param. * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a `number` return type for `.value`. + * + * @alpha */ export function defineFloat( name: string, @@ -95,9 +103,11 @@ export function defineFloat( /** * Declare a list param (array of strings). * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a `string[]` return type for `.value`. + * + * @alpha */ export function defineList( name: string, @@ -112,9 +122,11 @@ export function defineList( * Declare a JSON param. The associated environment variable will be treated * as a JSON string when loading its value. * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. + * @param name - The name of the environment variable to use to load the param. + * @param options - Configuration options for the param. * @returns A Param with a specifiable return type for `.value`. + * + * @alpha */ export function defineJSON( name: string, diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index c345cf654..e0cc3c701 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -1,6 +1,6 @@ -/** @hidden */ type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; +/* @alpha */ export interface ParamSpec { name: string; default?: T; @@ -9,11 +9,13 @@ export interface ParamSpec { valueType?: ParamValueType; } +/* @alpha */ export type ParamOptions = Omit< ParamSpec, 'name' | 'valueType' >; +/* @alpha */ export class Param { static valueType: ParamValueType = 'string'; @@ -51,10 +53,12 @@ export class Param { } } +/* @alpha */ export class StringParam extends Param { // identical to the abstract class, just explicitly a string } +/* @alpha */ export class IntParam extends Param { static valueType: ParamValueType = 'int'; @@ -74,6 +78,7 @@ export class IntParam extends Param { } } +/* @alpha */ export class FloatParam extends Param { static valueType: ParamValueType = 'float'; @@ -92,6 +97,7 @@ export class FloatParam extends Param { } } +/* @alpha */ export class BooleanParam extends Param { static valueType: ParamValueType = 'boolean'; @@ -114,6 +120,7 @@ export class BooleanParam extends Param { } } +/* @alpha */ export class ListParam extends Param { static valueType: ParamValueType = 'list'; @@ -137,6 +144,7 @@ export class ListParam extends Param { } } +/* @alpha */ export class JSONParam extends Param { static valueType: ParamValueType = 'json'; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index df800fadb..ee83a734e 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -56,8 +56,8 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { /** * Declares a function that can handle Firebase Alerts from CloudEvents. - * @param alertTypeOrOpts the alert type or Firebase Alert function configuration. - * @param handler a function that can handle the Firebase Alert inside a CloudEvent. + * @param alertTypeOrOpts - the alert type or Firebase Alert function configuration. + * @param handler - a function that can handle the Firebase Alert inside a CloudEvent. */ export function onAlertPublished( alertTypeOrOpts: AlertType | FirebaseAlertOptions, diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 62a5ba4a1..abda5f6d8 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -6,7 +6,7 @@ import * as options from '../options'; /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data Payload of a Pub/Sub message. + * @param data - Payload of a Pub/Sub message. */ export class Message { /** @@ -34,7 +34,7 @@ export class Message { */ readonly orderingKey: string; - /** @hidden */ + /** @internal */ private _json: T; constructor(data: any) { @@ -68,7 +68,7 @@ export class Message { /** * Returns a JSON-serializable representation of this object. * - * @return A JSON-serializable representation of this object. + * @returns A JSON-serializable representation of this object. */ toJSON(): any { const json: Record = { From 7cbc9c7303f6beae31c00d945b4ca1aff5fd2c4f Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Thu, 5 May 2022 09:52:20 -0500 Subject: [PATCH 435/705] Update changelog for v3.21.0 (#1092) * Update changelog for v3.20.1 -> v3.21.0 --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddc0e009c..ccd110162 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,9 @@ -- Adds auth blocking triggers to the auth and identity namespaces (1080). -- Add support for secrets for v2 triggers (#1079). +- Adds CPU option and enhances internal data structures (#1077) +- Add auth blocking handlers (#1080) +- Add support for secrets in v2 (#1079) +- Update types for AlertPayloads (#1087) +- Update AppDistribution `[@type]` (#1088) +- Update CloudEvent types (#1089) +- Generate documentation with api-extractor (#1071) +- Change type info to be inheritance friendly. (#1091) +- Changes the memory options from MB to MiB and GB to GiB for greater clarity (#1090) From 6d0a912df02534d0698802aa0210f726618de292 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 6 May 2022 01:46:10 +0900 Subject: [PATCH 436/705] Revert "Remove all errors when generating reference doc using api-extractor (#1095)" (#1096) Reverts firebase/firebase-functions#1095 It turns out that @hidden -> @internal is not a safe transformation for exported values since our `tsconfig.json` specifies `stripInternal: true`. Temporarily rolling back change - I'll send out a smaller patch that contains subset of changes in #1095 --- docgen/api-extractor.v2.json | 20 -- package-lock.json | 394 +++++++++++------------------- package.json | 3 +- src/cloud-functions.ts | 31 +-- src/common/providers/https.ts | 32 +-- src/logger/index.ts | 14 +- src/providers/pubsub.ts | 24 +- src/v2/options.ts | 13 +- src/v2/params/index.ts | 40 ++- src/v2/params/types.ts | 10 +- src/v2/providers/alerts/alerts.ts | 4 +- src/v2/providers/pubsub.ts | 6 +- 12 files changed, 221 insertions(+), 370 deletions(-) diff --git a/docgen/api-extractor.v2.json b/docgen/api-extractor.v2.json index 492c8bae6..2cf0596b7 100644 --- a/docgen/api-extractor.v2.json +++ b/docgen/api-extractor.v2.json @@ -10,25 +10,5 @@ "enabled": true, "reportTempFolder": "/docgen/v2/temp", "reportFolder": "/docgen/v2" - }, - "messages": { - "compilerMessageReporting": { - "default": { - "logLevel": "warning" - } - }, - "extractorMessageReporting": { - "default": { - "logLevel": "warning" - }, - "ae-missing-release-tag": { - "logLevel": "none" - } - }, - "tsdocMessageReporting": { - "default": { - "logLevel": "error" - } - } } } diff --git a/package-lock.json b/package-lock.json index 2bd402d37..5b5f7fc85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,122 +61,12 @@ "tslib": "^2.1.0" }, "dependencies": { - "@microsoft/tsdoc": { - "version": "0.12.24", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", - "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", - "dev": true - }, - "@rushstack/node-core-library": { - "version": "3.36.0", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", - "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", - "dev": true, - "requires": { - "@types/node": "10.17.13", - "colors": "~1.2.1", - "fs-extra": "~7.0.1", - "import-lazy": "~4.0.0", - "jju": "~1.4.0", - "resolve": "~1.17.0", - "semver": "~7.3.0", - "timsort": "~0.3.0", - "z-schema": "~3.18.3" - } - }, - "@rushstack/ts-command-line": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", - "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", - "dev": true, - "requires": { - "@types/argparse": "1.0.38", - "argparse": "~1.0.9", - "colors": "~1.2.1", - "string-argv": "~0.3.1" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - } - } - }, - "@types/argparse": { - "version": "1.0.38", - "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", - "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==", - "dev": true - }, - "@types/node": { - "version": "10.17.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", - "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", - "dev": true - }, - "api-extractor-model-me": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", - "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", - "dev": true, - "requires": { - "@microsoft/tsdoc": "0.12.24", - "@rushstack/node-core-library": "3.36.0" - } - }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "colors": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", - "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", - "dev": true - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "optional": true - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true - }, - "jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", - "dev": true - }, "js-yaml": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", @@ -186,42 +76,6 @@ "argparse": "^2.0.1" } }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -230,69 +84,6 @@ "requires": { "path-parse": "^1.0.6" } - }, - "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "string-argv": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", - "dev": true - }, - "timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, - "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "validator": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", - "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "z-schema": { - "version": "3.18.4", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", - "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", - "dev": true, - "requires": { - "commander": "^2.7.1", - "lodash.get": "^4.0.0", - "lodash.isequal": "^4.0.0", - "validator": "^8.0.0" - } } } }, @@ -761,6 +552,12 @@ } } }, + "@microsoft/tsdoc": { + "version": "0.12.24", + "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", + "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", + "dev": true + }, "@microsoft/tsdoc-config": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.1.tgz", @@ -871,6 +668,40 @@ "dev": true, "optional": true }, + "@rushstack/node-core-library": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", + "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", + "dev": true, + "requires": { + "@types/node": "10.17.13", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~3.18.3" + }, + "dependencies": { + "@types/node": { + "version": "10.17.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", + "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, "@rushstack/rig-package": { "version": "0.3.11", "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.11.tgz", @@ -898,6 +729,18 @@ } } }, + "@rushstack/ts-command-line": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", + "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, "@sinonjs/commons": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", @@ -1286,6 +1129,16 @@ "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", "dev": true }, + "api-extractor-model-me": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", + "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", + "dev": true, + "requires": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0" + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -2437,6 +2290,19 @@ "jws": "^4.0.0" } }, + "handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3314,9 +3180,9 @@ "dev": true }, "marked": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.15.tgz", - "integrity": "sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", + "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", "dev": true }, "media-typer": { @@ -3603,6 +3469,12 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, "nise": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", @@ -3941,6 +3813,12 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "promise-polyfill": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", @@ -4252,9 +4130,9 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "shiki": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", - "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", + "version": "0.9.15", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz", + "integrity": "sha512-/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", @@ -4686,16 +4564,20 @@ } }, "typedoc": { - "version": "0.22.15", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.15.tgz", - "integrity": "sha512-CMd1lrqQbFvbx6S9G6fL4HKp3GoIuhujJReWqlIvSb2T26vGai+8Os3Mde7Pn832pXYemd9BMuuYWhFpL5st0Q==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", + "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", "dev": true, "requires": { - "glob": "^7.2.0", + "glob": "^7.1.7", + "handlebars": "^4.7.7", + "lodash": "^4.17.21", "lunr": "^2.3.9", - "marked": "^4.0.12", - "minimatch": "^5.0.1", - "shiki": "^0.10.1" + "marked": "^2.1.1", + "minimatch": "^3.0.0", + "progress": "^2.0.3", + "shiki": "^0.9.3", + "typedoc-default-themes": "^0.12.10" }, "dependencies": { "glob": { @@ -4710,47 +4592,29 @@ "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - } - } - }, - "minimatch": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", - "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - } } } } }, + "typedoc-default-themes": { + "version": "0.12.10", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", + "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", + "dev": true + }, "typescript": { "version": "4.6.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, + "uglify-js": { + "version": "3.15.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz", + "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==", + "dev": true, + "optional": true + }, "unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -4818,6 +4682,12 @@ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, + "validator": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", + "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", + "dev": true + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -4975,6 +4845,12 @@ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -5296,6 +5172,18 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "optional": true + }, + "z-schema": { + "version": "3.18.4", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", + "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", + "dev": true, + "requires": { + "commander": "^2.7.1", + "lodash.get": "^4.0.0", + "lodash.isequal": "^4.0.0", + "validator": "^8.0.0" + } } } } diff --git a/package.json b/package.json index 86e128cad..20f8c6ce0 100644 --- a/package.json +++ b/package.json @@ -208,6 +208,7 @@ "mock-require": "^3.0.3", "mz": "^2.7.0", "nock": "^10.0.6", + "node-fetch": "^2.6.7", "portfinder": "^1.0.28", "prettier": "^1.18.2", "semver": "^7.3.5", @@ -217,7 +218,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "^0.22.15", + "typedoc": "0.21.2", "typescript": "^4.3.5", "yargs": "^15.3.1" }, diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 6018e4caa..1f59f50d8 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -39,13 +39,13 @@ import { } from './common/encoding'; import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest'; -/* @internal */ +/** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); /** - * Wire format for an event. + * @hidden * - * @internal + * Wire format for an event. */ export interface Event { context: { @@ -181,21 +181,20 @@ export interface ChangeJson { */ before?: any; /** + * @hidden * Comma-separated string that represents names of fields that changed. - * - * @internal */ fieldMask?: string; } export namespace Change { - /** @internal */ + /** @hidden */ function reinterpretCast(x: any) { return x as T; } /** - * @internal + * @hidden * Factory method for creating a Change from a `before` object and an `after` * object. */ @@ -204,7 +203,7 @@ export namespace Change { } /** - * @internal + * @hidden * Factory method for creating a Change from a JSON and an optional customizer * function to be applied to both the `before` and the `after` fields. */ @@ -223,7 +222,7 @@ export namespace Change { ); } - /** @internal */ + /** @hidden */ export function applyFieldMask( sparseBefore: any, after: any, @@ -258,6 +257,7 @@ export interface Resource { } /** + * @hidden * TriggerAnnotated is used internally by the firebase CLI to understand what * type of Cloud Function to deploy. */ @@ -290,6 +290,7 @@ export interface TriggerAnnotated { } /** + * @hidden * EndpointAnnotated is used to generate the manifest that conforms to the container contract. */ export interface EndpointAnnotated { @@ -335,7 +336,7 @@ export type CloudFunction = Runnable & EndpointAnnotated & ((input: any, context?: any) => PromiseLike | any); -/** @internal */ +/** @hidden */ export interface MakeCloudFunctionArgs { after?: (raw: Event) => void; before?: (raw: Event) => void; @@ -355,7 +356,7 @@ export interface MakeCloudFunctionArgs { triggerResource: () => string; } -/** @internal */ +/** @hidden */ export function makeCloudFunction({ after = () => {}, before = () => {}, @@ -498,7 +499,7 @@ export function makeCloudFunction({ return cloudFunction; } -/** @internal */ +/** @hidden */ function _makeParams( context: EventContext, triggerResourceGetter: () => string @@ -526,7 +527,7 @@ function _makeParams( return params; } -/** @internal */ +/** @hidden */ function _makeAuth(event: Event, authType: string) { if (authType === 'UNAUTHENTICATED') { return null; @@ -537,7 +538,7 @@ function _makeAuth(event: Event, authType: string) { }; } -/** @internal */ +/** @hidden */ function _detectAuthType(event: Event) { if (_.get(event, 'context.auth.admin')) { return 'ADMIN'; @@ -548,7 +549,7 @@ function _detectAuthType(event: Event) { return 'UNAUTHENTICATED'; } -/** @internal */ +/** @hidden */ export function optionsToTrigger(options: DeploymentOptions) { const trigger: any = {}; copyIfPresent( diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index be50df1d4..29f516bc7 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -34,9 +34,7 @@ import { TaskContext } from './tasks'; const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/; -/** - * Represents incoming request object. - */ +/** @hidden */ export interface Request extends express.Request { rawBody: Buffer; } @@ -230,9 +228,7 @@ export type FunctionsErrorCode = | 'data-loss' | 'unauthenticated'; -/** - * Canonical name of HTTP status. - */ +/** @hidden */ export type CanonicalErrorCodeName = | 'OK' | 'CANCELLED' @@ -252,6 +248,7 @@ export type CanonicalErrorCodeName = | 'UNAVAILABLE' | 'DATA_LOSS'; +/** @hidden */ interface HttpErrorCode { canonicalName: CanonicalErrorCodeName; status: number; @@ -286,6 +283,7 @@ const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = { 'data-loss': { canonicalName: 'DATA_LOSS', status: 500 }, }; +/** @hidden */ interface HttpErrorWireFormat { details?: unknown; message: string; @@ -311,7 +309,7 @@ export class HttpsError extends Error { /** * A wire format representation of a provided error code. * - * @internal + * @hidden */ public readonly httpErrorCode: HttpErrorCode; @@ -343,6 +341,7 @@ export class HttpsError extends Error { } } +/** @hidden */ // The allowed interface for an HTTP request to a Callable function. interface HttpRequest extends Request { body: { @@ -350,17 +349,15 @@ interface HttpRequest extends Request { }; } +/** @hidden */ // The format for an HTTP body response from a Callable function. interface HttpResponseBody { result?: any; error?: HttpsError; } -/** - * Returns true if req is a properly formatted callable request. - * - * @internal - */ +/** @hidden */ +// Returns true if req is a properly formatted callable request. export function isValidRequest(req: Request): req is HttpRequest { // The body must not be empty. if (!req.body) { @@ -403,15 +400,16 @@ export function isValidRequest(req: Request): req is HttpRequest { return true; } +/** @hidden */ const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value'; +/** @hidden */ const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value'; /** * Encodes arbitrary data in our special format for JSON. * This is exposed only for testing. - * - * @internal */ +/** @hidden */ export function encode(data: any): any { if (data === null || typeof data === 'undefined') { return null; @@ -450,9 +448,8 @@ export function encode(data: any): any { /** * Decodes our special format for JSON into native types. * This is exposed only for testing. - * - * @internal */ +/** @hidden */ export function decode(data: any): any { if (data === null) { return data; @@ -497,9 +494,12 @@ export function decode(data: any): any { * * Users are encouraged to setup log-based metric based on these values, and * changing their values may cause their metrics to break. + * */ +/** @hidden */ type TokenStatus = 'MISSING' | 'VALID' | 'INVALID'; +/** @hidden */ interface CallableTokenStatus { app: TokenStatus; auth: TokenStatus; diff --git a/src/logger/index.ts b/src/logger/index.ts index 5ea3e9e36..deb7c1762 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -30,6 +30,7 @@ export interface LogEntry { [key: string]: any; } +/** @internal */ function removeCircular(obj: any, refs: any[] = []): any { if (typeof obj !== 'object' || !obj) { return obj; @@ -61,7 +62,7 @@ function removeCircular(obj: any, refs: any[] = []): any { /** * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). - * @param entry - The `LogEntry` including severity, message, and any additional structured metadata. + * @param entry The `LogEntry` including severity, message, and any additional structured metadata. */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { @@ -93,7 +94,7 @@ export function write(entry: LogEntry) { /** * Writes a `DEBUG` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args - Arguments, concatenated into the log message with space separators. + * @param args Arguments, concatenated into the log message with space separators. */ export function debug(...args: any[]) { write(entryFromArgs('DEBUG', args)); @@ -102,7 +103,7 @@ export function debug(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args - Arguments, concatenated into the log message with space separators. + * @param args Arguments, concatenated into the log message with space separators. */ export function log(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -111,7 +112,7 @@ export function log(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args - Arguments, concatenated into the log message with space separators. + * @param args Arguments, concatenated into the log message with space separators. */ export function info(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -120,7 +121,7 @@ export function info(...args: any[]) { /** * Writes a `WARNING` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args - Arguments, concatenated into the log message with space separators. + * @param args Arguments, concatenated into the log message with space separators. */ export function warn(...args: any[]) { write(entryFromArgs('WARNING', args)); @@ -129,12 +130,13 @@ export function warn(...args: any[]) { /** * Writes an `ERROR` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args - Arguments, concatenated into the log message with space separators. + * @param args Arguments, concatenated into the log message with space separators. */ export function error(...args: any[]) { write(entryFromArgs('ERROR', args)); } +/** @hidden */ function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry { let entry = {}; const lastArg = args[args.length - 1]; diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index c7e205642..9cd88bd86 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -30,23 +30,23 @@ import { ScheduleRetryConfig, } from '../function-configuration'; -/** @internal */ +/** @hidden */ export const provider = 'google.pubsub'; -/** @internal */ +/** @hidden */ export const service = 'pubsub.googleapis.com'; /** * Registers a Cloud Function triggered when a Google Cloud Pub/Sub message * is sent to a specified topic. * - * @param topic - The Pub/Sub topic to watch for message events. + * @param topic The Pub/Sub topic to watch for message events. * @return Pub/Sub topic builder interface. */ export function topic(topic: string) { return _topicWithOptions(topic, {}); } -/** @internal */ +/** @hidden */ export function _topicWithOptions( topic: string, options: DeploymentOptions @@ -69,7 +69,7 @@ export function _topicWithOptions( * Access via [`functions.pubsub.topic()`](providers_pubsub_.html#topic). */ export class TopicBuilder { - /** @internal */ + /** @hidden */ constructor( private triggerResource: () => string, private options: DeploymentOptions @@ -79,7 +79,7 @@ export class TopicBuilder { * Event handler that fires every time a Cloud Pub/Sub message is * published. * - * @param handler - Event handler that runs every time a Cloud Pub/Sub message + * @param handler Event handler that runs every time a Cloud Pub/Sub message * is published. * @return A Cloud Function that you can export and deploy. */ @@ -101,14 +101,14 @@ export class TopicBuilder { /** * Registers a Cloud Function to run at specified times. * - * @param schedule - The schedule, in Unix Crontab or AppEngine syntax. + * @param schedule The schedule, in Unix Crontab or AppEngine syntax. * @return ScheduleBuilder interface. */ export function schedule(schedule: string): ScheduleBuilder { return _scheduleWithOptions(schedule, {}); } -/** @internal */ +/** @hidden */ export function _scheduleWithOptions( schedule: string, options: DeploymentOptions @@ -136,7 +136,7 @@ export function _scheduleWithOptions( * Access via [`functions.pubsub.schedule()`](providers_pubsub_.html#schedule). */ export class ScheduleBuilder { - /** @internal */ + /** @hidden */ constructor( private triggerResource: () => string, private options: DeploymentOptions @@ -156,7 +156,7 @@ export class ScheduleBuilder { * Event handler for scheduled functions. Triggered whenever the associated * scheduler job sends a Pub/Sub message. * - * @param handler - Handler that fires whenever the associated + * @param handler Handler that fires whenever the associated * scheduler job sends a Pub/Sub message. * @return A Cloud Function that you can export and deploy. */ @@ -177,7 +177,7 @@ export class ScheduleBuilder { /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data - Payload of a Pub/Sub message. + * @param data Payload of a Pub/Sub message. */ export class Message { /** @@ -190,7 +190,7 @@ export class Message { */ readonly attributes: { [key: string]: string }; - /** @internal */ + /** @hidden */ private _json: any; constructor(data: any) { diff --git a/src/v2/options.ts b/src/v2/options.ts index 88d1be69e..c4e3cd7de 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -168,14 +168,14 @@ export interface GlobalOptions { /** * Number of requests a function can serve at once. * 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). + * 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. */ concurrency?: number | null; /** * Fractional number of CPUs to allocate to a function. - * Defaults to 1 for functions with \<= 2GB RAM and increases for larger memory sizes. + * 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 @@ -227,7 +227,7 @@ let globalOptions: GlobalOptions | undefined; /** * Sets default options for all functions written using the v2 SDK. - * @param options - Options to set as default + * @param options Options to set as default */ export function setGlobalOptions(options: GlobalOptions) { if (globalOptions) { @@ -239,7 +239,6 @@ export function setGlobalOptions(options: GlobalOptions) { /** * Get the currently set default options. * Used only for trigger generation. - * * @internal */ export function getGlobalOptions(): GlobalOptions { @@ -255,7 +254,6 @@ export interface EventHandlerOptions extends GlobalOptions { /** * Apply GlobalOptions to trigger definitions. - * * @internal */ export function optionsToTriggerAnnotations( @@ -318,7 +316,6 @@ export function optionsToTriggerAnnotations( /** * Apply GlobalOptions to endpoint manifest. - * * @internal */ export function optionsToEndpoint( @@ -362,7 +359,9 @@ export function optionsToEndpoint( return endpoint; } -/* @internal */ +/** + * @hidden + */ export function __getSpec(): { globalOptions: GlobalOptions; params: ParamSpec[]; diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index 29acab37a..f4ea32b53 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -1,3 +1,4 @@ +/** @hidden */ import { BooleanParam, FloatParam, @@ -9,15 +10,14 @@ import { StringParam, } from './types'; -/* @alpha */ export { ParamOptions }; -/* @alpha */ export const declaredParams: Param[] = []; /** * Use a helper to manage the list such that params are uniquely * registered once only but order is preserved. + * @internal */ function registerParam(param: Param) { for (let i = 0; i < declaredParams.length; i++) { @@ -31,11 +31,9 @@ function registerParam(param: Param) { /** * Declare a string param. * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a `string` return type for `.value`. - * - * @alpha */ export function defineString( name: string, @@ -49,11 +47,9 @@ export function defineString( /** * Declare a boolean param. * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a `boolean` return type for `.value`. - * - * @alpha */ export function defineBoolean( name: string, @@ -67,11 +63,9 @@ export function defineBoolean( /** * Declare an integer param. * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a `number` return type for `.value`. - * - * @alpha */ export function defineInt( name: string, @@ -85,11 +79,9 @@ export function defineInt( /** * Declare a float param. * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a `number` return type for `.value`. - * - * @alpha */ export function defineFloat( name: string, @@ -103,11 +95,9 @@ export function defineFloat( /** * Declare a list param (array of strings). * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a `string[]` return type for `.value`. - * - * @alpha */ export function defineList( name: string, @@ -122,11 +112,9 @@ export function defineList( * Declare a JSON param. The associated environment variable will be treated * as a JSON string when loading its value. * - * @param name - The name of the environment variable to use to load the param. - * @param options - Configuration options for the param. + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. * @returns A Param with a specifiable return type for `.value`. - * - * @alpha */ export function defineJSON( name: string, diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index e0cc3c701..c345cf654 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -1,6 +1,6 @@ +/** @hidden */ type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; -/* @alpha */ export interface ParamSpec { name: string; default?: T; @@ -9,13 +9,11 @@ export interface ParamSpec { valueType?: ParamValueType; } -/* @alpha */ export type ParamOptions = Omit< ParamSpec, 'name' | 'valueType' >; -/* @alpha */ export class Param { static valueType: ParamValueType = 'string'; @@ -53,12 +51,10 @@ export class Param { } } -/* @alpha */ export class StringParam extends Param { // identical to the abstract class, just explicitly a string } -/* @alpha */ export class IntParam extends Param { static valueType: ParamValueType = 'int'; @@ -78,7 +74,6 @@ export class IntParam extends Param { } } -/* @alpha */ export class FloatParam extends Param { static valueType: ParamValueType = 'float'; @@ -97,7 +92,6 @@ export class FloatParam extends Param { } } -/* @alpha */ export class BooleanParam extends Param { static valueType: ParamValueType = 'boolean'; @@ -120,7 +114,6 @@ export class BooleanParam extends Param { } } -/* @alpha */ export class ListParam extends Param { static valueType: ParamValueType = 'list'; @@ -144,7 +137,6 @@ export class ListParam extends Param { } } -/* @alpha */ export class JSONParam extends Param { static valueType: ParamValueType = 'json'; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index ee83a734e..df800fadb 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -56,8 +56,8 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { /** * Declares a function that can handle Firebase Alerts from CloudEvents. - * @param alertTypeOrOpts - the alert type or Firebase Alert function configuration. - * @param handler - a function that can handle the Firebase Alert inside a CloudEvent. + * @param alertTypeOrOpts the alert type or Firebase Alert function configuration. + * @param handler a function that can handle the Firebase Alert inside a CloudEvent. */ export function onAlertPublished( alertTypeOrOpts: AlertType | FirebaseAlertOptions, diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index abda5f6d8..62a5ba4a1 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -6,7 +6,7 @@ import * as options from '../options'; /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data - Payload of a Pub/Sub message. + * @param data Payload of a Pub/Sub message. */ export class Message { /** @@ -34,7 +34,7 @@ export class Message { */ readonly orderingKey: string; - /** @internal */ + /** @hidden */ private _json: T; constructor(data: any) { @@ -68,7 +68,7 @@ export class Message { /** * Returns a JSON-serializable representation of this object. * - * @returns A JSON-serializable representation of this object. + * @return A JSON-serializable representation of this object. */ toJSON(): any { const json: Record = { From e25ddfb2016503936717ad9b06ff4506fcb8fdec Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 5 May 2022 20:01:36 +0000 Subject: [PATCH 437/705] 3.21.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b5f7fc85..e2500d647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.20.1", + "version": "3.21.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 20f8c6ce0..557cd8fa4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.20.1", + "version": "3.21.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 74323273b52ec4cf71e844f54f4c69b06c75262a Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Thu, 5 May 2022 20:01:39 +0000 Subject: [PATCH 438/705] [firebase-release] Removed change log and reset repo after 3.21.0 release --- CHANGELOG.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd110162..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +0,0 @@ -- Adds CPU option and enhances internal data structures (#1077) -- Add auth blocking handlers (#1080) -- Add support for secrets in v2 (#1079) -- Update types for AlertPayloads (#1087) -- Update AppDistribution `[@type]` (#1088) -- Update CloudEvent types (#1089) -- Generate documentation with api-extractor (#1071) -- Change type info to be inheritance friendly. (#1091) -- Changes the memory options from MB to MiB and GB to GiB for greater clarity (#1090) From 5a141758e4be0c08ba3adb997cc914c7d3cfccee Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Fri, 6 May 2022 16:21:35 -0400 Subject: [PATCH 439/705] exporting interfaces and adding tsdoc comments (#1100) --- src/v2/providers/alerts/appDistribution.ts | 4 ++++ src/v2/providers/alerts/crashlytics.ts | 8 ++++++-- src/v2/providers/storage.ts | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 014b1d937..e22f847c0 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -8,9 +8,13 @@ import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; */ export interface NewTesterDevicePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload'; + /** Name of the tester */ testerName: string; + /** Email of the tester */ testerEmail: string; + /** The device model name */ testerDeviceModelName: string; + /** The device ID */ testerDeviceIdentifier: string; } diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index c9c208e57..1cbe13760 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -3,10 +3,14 @@ import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; /** Generic crashlytics issue interface */ -interface Issue { +export interface Issue { + /** The ID of the crashlytics issue */ id: string; + /** The title of the crashlytics issue */ title: string; + /** The subtitle of the crashlytics issue */ subtitle: string; + /** The application version of the crashlytics issue */ appVersion: string; } @@ -48,7 +52,7 @@ export interface RegressionAlertPayload { } /** Generic crashlytics trending issue interface */ -interface TrendingIssueDetails { +export interface TrendingIssueDetails { /** The type of the Crashlytics issue, e.g. new fatal, new nonfatal, ANR */ type: string; /** Basic information of the Crashlytics issue */ diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 7c5fe01b1..cc6f0a5ec 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -174,6 +174,7 @@ export interface CustomerEncryption { keySha256?: string; } +/** A CloudEvent that contains StorageObjectData */ export interface StorageEvent extends CloudEvent { /** The name of the bucket containing this object. */ bucket: string; From 129591cc10c7f0960c3ad2f65671688dda8a359f Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Mon, 9 May 2022 12:29:38 -0500 Subject: [PATCH 440/705] Combine `npm run build` with `docgen` scripts (#1105) * Combine `npm run build` with `docgen` scripts * Remove duplicate instances of `npm run build` from docgen process * Also ignore the dist/ directory --- .gitignore | 1 + package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ee22dbd83..017bc9f40 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .tmp .vscode/ coverage +dist/ docgen/html docgen/*/temp docgen/*/markdown diff --git a/package.json b/package.json index 557cd8fa4..0b2911c92 100644 --- a/package.json +++ b/package.json @@ -159,10 +159,10 @@ "apidocs": "node docgen/generate-docs.js", "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local", "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && api-documenter-fire toc -i docgen/v1 -o docgen/v1/markdown/toc -p /docs/reference/functions", - "docgen:v1": "npm run docgen:v1:extract && npm run docgen:v1:gen", + "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && api-documenter-fire toc -i docgen/v2 -o docgen/v2/markdown/toc -p /docs/reference/functions/v2", - "docgen:v2": "npm run docgen:v2:extract && npm run docgen:v2:gen", + "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", From 18e7f1636a6b504ffbe85e4a9419f61339406ada Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Mon, 9 May 2022 15:15:35 -0500 Subject: [PATCH 441/705] Update docs for auth (#1108) * Update docs for auth Update docs for auth --- src/providers/auth.ts | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/providers/auth.ts b/src/providers/auth.ts index 283310472..fcc612e76 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -54,7 +54,10 @@ export const provider = 'google.firebase.auth'; /** @hidden */ export const service = 'firebaseauth.googleapis.com'; -/** Resource level options */ +/** + * Resource level options + * @public + */ export interface UserOptions { blockingOptions?: { idToken?: boolean; @@ -64,9 +67,12 @@ export interface UserOptions { } /** - * Handle events related to Firebase authentication users. + * Handles events related to Firebase authentication users. + * @param userOptions - Resource level options + * @returns UserBuilder - Builder used to create Cloud Functions for Firebase Auth user lifecycle events + * @public */ -export function user(userOptions?: UserOptions) { +export function user(userOptions?: UserOptions): UserBuilder { return _userWithOptions({}, userOptions || {}); } @@ -87,7 +93,10 @@ export function _userWithOptions( ); } -/** Builder used to create Cloud Functions for Firebase Auth user lifecycle events. */ +/** + * Builder used to create Cloud Functions for Firebase Auth user lifecycle events. + * @public + */ export class UserBuilder { private static dataConstructor(raw: Event): UserRecord { return userRecordConstructor(raw.data); @@ -100,14 +109,20 @@ export class UserBuilder { private userOptions?: UserOptions ) {} - /** Respond to the creation of a Firebase Auth user. */ + /** + * Responds to the creation of a Firebase Auth user. + * @public + */ onCreate( handler: (user: UserRecord, context: EventContext) => PromiseLike | any ): CloudFunction { return this.onOperation(handler, 'user.create'); } - /** Respond to the deletion of a Firebase Auth user. */ + /** + * Responds to the deletion of a Firebase Auth user. + * @public + */ onDelete( handler: (user: UserRecord, context: EventContext) => PromiseLike | any ): CloudFunction { From fd0e372aebaf02850fccf608324092a949f8f697 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Mon, 9 May 2022 16:14:42 -0500 Subject: [PATCH 442/705] Update docs for logger (#1103) Update docs for logger --- src/logger/index.ts | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/logger/index.ts b/src/logger/index.ts index deb7c1762..9bb43725f 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -8,6 +8,7 @@ import { /** * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity). + * @public */ export type LogSeverity = | 'DEBUG' @@ -23,6 +24,7 @@ export type LogSeverity = * `LogEntry` represents a [structured Cloud Logging](https://cloud.google.com/logging/docs/structured-logging) * entry. All keys aside from `severity` and `message` are * included in the `jsonPayload` of the logged entry. + * @public */ export interface LogEntry { severity: LogSeverity; @@ -62,7 +64,8 @@ function removeCircular(obj: any, refs: any[] = []): any { /** * Writes a `LogEntry` to `stdout`/`stderr` (depending on severity). - * @param entry The `LogEntry` including severity, message, and any additional structured metadata. + * @param entry - The `LogEntry` including severity, message, and any additional structured metadata. + * @public */ export function write(entry: LogEntry) { if (SUPPORTS_STRUCTURED_LOGS) { @@ -94,7 +97,8 @@ export function write(entry: LogEntry) { /** * Writes a `DEBUG` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. + * @public */ export function debug(...args: any[]) { write(entryFromArgs('DEBUG', args)); @@ -103,7 +107,8 @@ export function debug(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. + * @public */ export function log(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -112,7 +117,8 @@ export function log(...args: any[]) { /** * Writes an `INFO` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. + * @public */ export function info(...args: any[]) { write(entryFromArgs('INFO', args)); @@ -121,7 +127,8 @@ export function info(...args: any[]) { /** * Writes a `WARNING` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. + * @public */ export function warn(...args: any[]) { write(entryFromArgs('WARNING', args)); @@ -130,7 +137,8 @@ export function warn(...args: any[]) { /** * Writes an `ERROR` severity log. If the last argument provided is a plain object, * it is added to the `jsonPayload` in the Cloud Logging entry. - * @param args Arguments, concatenated into the log message with space separators. + * @param args - Arguments, concatenated into the log message with space separators. + * @public */ export function error(...args: any[]) { write(entryFromArgs('ERROR', args)); From 09b28897bc9477a3fbb507320d65001e56a53b14 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 10 May 2022 07:12:48 +0900 Subject: [PATCH 443/705] Fix toc.yaml for V2 reference docs (#1097) toc.ts is a short script to generate `toc.yaml` based on the generated markdown file. --- docgen/toc.ts | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +- 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 docgen/toc.ts diff --git a/docgen/toc.ts b/docgen/toc.ts new file mode 100644 index 000000000..d552a9cba --- /dev/null +++ b/docgen/toc.ts @@ -0,0 +1,124 @@ +/** + * @license + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Forked of https://github.com/firebase/firebase-js-sdk/blob/5ce06766303b92fea969c58172a7c1ab8695e21e/repo-scripts/api-documenter/src/toc.ts. + */ +import { writeFileSync } from 'fs'; +import { resolve } from 'path'; + +import yargs from 'yargs'; +import * as yaml from 'js-yaml'; +import { FileSystem } from '@rushstack/node-core-library'; + +export interface TocGenerationOptions { + inputFolder: string; + outputFolder: string; + g3Path: string; +} + +interface TocItem { + title: string; + path: string; + section?: TocItem[]; + status?: 'experimental'; +} + +function fileExt(f: string) { + const parts = f.split('.'); + if (parts.length < 2) { + return ''; + } + return parts.pop(); +} + +export function generateToc({ + inputFolder, + g3Path, + outputFolder, +}: TocGenerationOptions) { + const asObj = FileSystem.readFolder(inputFolder) + .filter((f) => fileExt(f) === 'md') + .reduce((acc, f) => { + const parts = f.split('.'); + parts.pop(); // Get rid of file extenion (.md) + + let cursor = acc; + for (const p of parts) { + cursor[p] = cursor[p] || {}; + cursor = cursor[p]; + } + return acc; + }, {} as any); + + function toToc(obj, prefix = ''): TocItem[] { + const toc: TocItem[] = []; + for (const key of Object.keys(obj)) { + const path = prefix?.length ? `${prefix}.${key}` : key; + const section = toToc(obj[key], path); + const tic: TocItem = { + title: key, + path: `${g3Path}/${path}.md`, + }; + if (section.length > 0) { + tic.section = section; + } + toc.push(tic); + } + return toc; + } + + const toc: TocItem[] = [ + { + title: 'firebase-functions', + status: 'experimental', + path: `${g3Path}/firebase-functions.md`, + }, + ...toToc(asObj['firebase-functions'], 'firebase-functions'), + ]; + + writeFileSync( + resolve(outputFolder, 'toc.yaml'), + yaml.dump( + { toc }, + { + quotingType: '"', + } + ) + ); +} + +const { input, output, path } = yargs(process.argv.slice(2)) + .option('input', { + alias: 'i', + describe: 'input folder containing the *.api.json files to be processed.', + default: './input', + }) + .option('output', { + alias: 'o', + describe: 'destination for the generated toc content.', + default: './toc', + }) + .option('path', { + alias: 'p', + describe: 'specifies the path where the reference docs resides (e.g. g3)', + default: '/', + }) + .help().argv; + +FileSystem.ensureFolder(output); +generateToc({ inputFolder: input, g3Path: path, outputFolder: output }); diff --git a/package.json b/package.json index 0b2911c92..aca2baeba 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,8 @@ "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && api-documenter-fire toc -i docgen/v1 -o docgen/v1/markdown/toc -p /docs/reference/functions", "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", - "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && api-documenter-fire toc -i docgen/v2 -o docgen/v2/markdown/toc -p /docs/reference/functions/v2", + "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", + "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && npm run docgen:v2:toc", "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", @@ -196,6 +197,7 @@ "@types/node": "^8.10.50", "@types/node-fetch": "^3.0.3", "@types/sinon": "^7.0.13", + "api-extractor-model-me": "^0.1.1", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", From 27b4c102f8d0c51ccdc9d3e6505411167a8c4aca Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Tue, 10 May 2022 10:32:17 -0500 Subject: [PATCH 444/705] Update docs for v2 storage (#1104) * Update docs for v2 storage --- src/v2/providers/storage.ts | 174 +++++++++++++++++++++++++++++++++--- 1 file changed, 162 insertions(+), 12 deletions(-) diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index cc6f0a5ec..27e6d01dc 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -192,107 +192,257 @@ export const metadataUpdatedEvent = /** StorageOptions extend EventHandlerOptions with a bucket name */ export interface StorageOptions extends options.EventHandlerOptions { + /** The name of the bucket containing this object. */ bucket?: string; } -/** Handle a storage object archived */ +/** + * Event handler sent only when a bucket has enabled object versioning. + * This event indicates that the live version of an object has become an + * archived version, either because it was archived or because it was + * overwritten by the upload of an object of the same name. + * + * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs. + */ export function onObjectArchived( handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler sent only when a bucket has enabled object versioning. + * This event indicates that the live version of an object has become an + * archived version, either because it was archived or because it was + * overwritten by the upload of an object of the same name. + * + * @param bucket - The name of the bucket containing this object. + * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs. + */ export function onObjectArchived( bucket: string, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler sent only when a bucket has enabled object versioning. + * This event indicates that the live version of an object has become an + * archived version, either because it was archived or because it was + * overwritten by the upload of an object of the same name. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs. + */ export function onObjectArchived( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler sent only when a bucket has enabled object versioning. + * This event indicates that the live version of an object has become an + * archived version, either because it was archived or because it was + * overwritten by the upload of an object of the same name. + * + * @param bucketOrOptsOrHandler - Options or string that may (or may not) define the bucket to be used. + * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs. + */ export function onObjectArchived( - buketOrOptsOrHandler: + bucketOrOptsOrHandler: | string | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise ): CloudFunction { - return onOperation(archivedEvent, buketOrOptsOrHandler, handler); + return onOperation(archivedEvent, bucketOrOptsOrHandler, handler); } -/** Handle a storage object finalized */ +/** + * Event handler which fires every time a Google Cloud Storage object + * creation occurs. + * + * Sent when a new object (or a new generation of an existing object) + * is successfully created in the bucket. This includes copying or rewriting + * an existing object. A failed upload does not trigger this event. + * + * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs. + */ export function onObjectFinalized( handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage object + * creation occurs. + * + * Sent when a new object (or a new generation of an existing object) + * is successfully created in the bucket. This includes copying or rewriting + * an existing object. A failed upload does not trigger this event. + * + * @param bucket - The name of the bucket containing this object. + * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs. + */ export function onObjectFinalized( bucket: string, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage object + * creation occurs. + * + * Sent when a new object (or a new generation of an existing object) + * is successfully created in the bucket. This includes copying or rewriting + * an existing object. A failed upload does not trigger this event. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs. + */ export function onObjectFinalized( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage object + * creation occurs. + * + * Sent when a new object (or a new generation of an existing object) + * is successfully created in the bucket. This includes copying or rewriting + * an existing object. A failed upload does not trigger this event. + * + * @param bucketOrOptsOrHandler - Options or string that may (or may not) define the bucket to be used. + * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs. + */ export function onObjectFinalized( - buketOrOptsOrHandler: + bucketOrOptsOrHandler: | string | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise ): CloudFunction { - return onOperation(finalizedEvent, buketOrOptsOrHandler, handler); + return onOperation(finalizedEvent, bucketOrOptsOrHandler, handler); } -/** Handle a storage object deleted */ +/** + * Event handler which fires every time a Google Cloud Storage deletion occurs. + * + * Sent when an object has been permanently deleted. This includes objects + * that are overwritten or are deleted as part of the bucket's lifecycle + * configuration. For buckets with object versioning enabled, this is not + * sent when an object is archived, even if archival occurs + * via the `storage.objects.delete` method. + * + * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs. + */ export function onObjectDeleted( handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage deletion occurs. + * + * Sent when an object has been permanently deleted. This includes objects + * that are overwritten or are deleted as part of the bucket's lifecycle + * configuration. For buckets with object versioning enabled, this is not + * sent when an object is archived, even if archival occurs + * via the `storage.objects.delete` method. + * + * @param bucket - The name of the bucket containing this object. + * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs. + */ export function onObjectDeleted( bucket: string, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage deletion occurs. + * + * Sent when an object has been permanently deleted. This includes objects + * that are overwritten or are deleted as part of the bucket's lifecycle + * configuration. For buckets with object versioning enabled, this is not + * sent when an object is archived, even if archival occurs + * via the `storage.objects.delete` method. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs. + */ export function onObjectDeleted( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time a Google Cloud Storage deletion occurs. + * + * Sent when an object has been permanently deleted. This includes objects + * that are overwritten or are deleted as part of the bucket's lifecycle + * configuration. For buckets with object versioning enabled, this is not + * sent when an object is archived, even if archival occurs + * via the `storage.objects.delete` method. + * + * @param bucketOrOptsOrHandler - Options or string that may (or may not) define the bucket to be used. + * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs. + */ export function onObjectDeleted( - buketOrOptsOrHandler: + bucketOrOptsOrHandler: | string | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise ): CloudFunction { - return onOperation(deletedEvent, buketOrOptsOrHandler, handler); + return onOperation(deletedEvent, bucketOrOptsOrHandler, handler); } -/** Handle a storage object metadata updated */ +/** + * Event handler which fires every time the metadata of an existing object + * changes. + * + * @param bucketOrOptsOrHandler - Options or string that may (or may not) define the bucket to be used. + * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs. + */ export function onObjectMetadataUpdated( handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time the metadata of an existing object + * changes. + * + * @param bucket - The name of the bucket containing this object. + * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs. + */ export function onObjectMetadataUpdated( bucket: string, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time the metadata of an existing object + * changes. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs. + */ export function onObjectMetadataUpdated( opts: StorageOptions, handler: (event: StorageEvent) => any | Promise ): CloudFunction; +/** + * Event handler which fires every time the metadata of an existing object + * changes. + * + * @param bucketOrOptsOrHandler - Options or string that may (or may not) define the bucket to be used. + * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs. + */ export function onObjectMetadataUpdated( - buketOrOptsOrHandler: + bucketOrOptsOrHandler: | string | StorageOptions | ((event: StorageEvent) => any | Promise), handler?: (event: StorageEvent) => any | Promise ): CloudFunction { - return onOperation(metadataUpdatedEvent, buketOrOptsOrHandler, handler); + return onOperation(metadataUpdatedEvent, bucketOrOptsOrHandler, handler); } /** @internal */ From 2164615a296463b128897446e6d2ab64e2212a57 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Tue, 10 May 2022 10:39:51 -0500 Subject: [PATCH 445/705] Update pubsub docs (#1106) * Update pubsub docs --- src/providers/pubsub.ts | 12 ++++---- src/v2/providers/pubsub.ts | 57 ++++++++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/providers/pubsub.ts b/src/providers/pubsub.ts index 9cd88bd86..18517bee0 100644 --- a/src/providers/pubsub.ts +++ b/src/providers/pubsub.ts @@ -39,8 +39,8 @@ export const service = 'pubsub.googleapis.com'; * Registers a Cloud Function triggered when a Google Cloud Pub/Sub message * is sent to a specified topic. * - * @param topic The Pub/Sub topic to watch for message events. - * @return Pub/Sub topic builder interface. + * @param topic - The Pub/Sub topic to watch for message events. + * @returns Pub/Sub topic builder interface. */ export function topic(topic: string) { return _topicWithOptions(topic, {}); @@ -79,7 +79,7 @@ export class TopicBuilder { * Event handler that fires every time a Cloud Pub/Sub message is * published. * - * @param handler Event handler that runs every time a Cloud Pub/Sub message + * @param handler - Event handler that runs every time a Cloud Pub/Sub message * is published. * @return A Cloud Function that you can export and deploy. */ @@ -101,7 +101,7 @@ export class TopicBuilder { /** * Registers a Cloud Function to run at specified times. * - * @param schedule The schedule, in Unix Crontab or AppEngine syntax. + * @param schedule - The schedule, in Unix Crontab or AppEngine syntax. * @return ScheduleBuilder interface. */ export function schedule(schedule: string): ScheduleBuilder { @@ -156,7 +156,7 @@ export class ScheduleBuilder { * Event handler for scheduled functions. Triggered whenever the associated * scheduler job sends a Pub/Sub message. * - * @param handler Handler that fires whenever the associated + * @param handler - Handler that fires whenever the associated * scheduler job sends a Pub/Sub message. * @return A Cloud Function that you can export and deploy. */ @@ -177,7 +177,7 @@ export class ScheduleBuilder { /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data Payload of a Pub/Sub message. + * @param data - Payload of a Pub/Sub message. */ export class Message { /** diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 62a5ba4a1..137d0fd73 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -3,10 +3,27 @@ import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +/** + * A PubSub Topic is: + *
        + *
      • A resource that you can publish messages to and then consume those messages via subscriptions. + *
      • An isolated data stream for Pub/Sub messages. + *
      • Messages are published to a topic. + *
      • Messages are listened to via a subscription. + *
      • Each subscription listens to the messages published to exactly one topic. + */ +export type PubSubTopic = string; + +/** + * Resource that listens to the messages published by exactly one topic. + */ +export type PubSubSubscription = string; + /** * Interface representing a Google Cloud Pub/Sub message. * - * @param data Payload of a Pub/Sub message. + * @param data - Payload of a Pub/Sub message. + * @typeParam T - Type representing `Message.data`'s JSON format */ export class Message { /** @@ -68,7 +85,7 @@ export class Message { /** * Returns a JSON-serializable representation of this object. * - * @return A JSON-serializable representation of this object. + * @returns A JSON-serializable representation of this object. */ toJSON(): any { const json: Record = { @@ -86,29 +103,51 @@ export class Message { } } -/** The interface published in a Pub/Sub publish subscription. */ +/** + * The interface published in a Pub/Sub publish subscription. + * @typeParam T - Type representing `Message.data`'s JSON format + */ export interface MessagePublishedData { + /** Google Cloud Pub/Sub message. */ readonly message: Message; - readonly subscription: string; + /** A subscription resource. */ + readonly subscription: PubSubSubscription; } /** PubSubOptions extend EventHandlerOptions but must include a topic. */ export interface PubSubOptions extends options.EventHandlerOptions { - topic: string; + /** The Pub/Sub topic to watch for message events */ + topic: PubSubTopic; } -/** Handle a message being published to a Pub/Sub topic. */ +/** + * Handle a message being published to a Pub/Sub topic. + * @param topic - The Pub/Sub topic to watch for message events. + * @param handler - runs every time a Cloud Pub/Sub message is published + * @typeParam T - Type representing `Message.data`'s JSON format + */ export function onMessagePublished( - topic: string, + topic: PubSubTopic, handler: (event: CloudEvent>) => any | Promise ): CloudFunction>>; -/** Handle a message being published to a Pub/Sub topic. */ +/** + * 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 function onMessagePublished( options: PubSubOptions, handler: (event: CloudEvent>) => any | Promise ): CloudFunction>>; +/** + * Handle a message being published to a Pub/Sub topic. + * @param topicOrOptions - A string representing the PubSub topic or an option (which contains the topic) + * @param handler - runs every time a Cloud Pub/Sub message is published + * @typeParam T - Type representing `Message.data`'s JSON format + */ export function onMessagePublished( topicOrOptions: string | PubSubOptions, handler: (event: CloudEvent>) => any | Promise @@ -127,7 +166,7 @@ export function onMessagePublished( const func = (raw: CloudEvent) => { const messagePublishedData = raw.data as { message: unknown; - subscription: string; + subscription: PubSubSubscription; }; messagePublishedData.message = new Message(messagePublishedData.message); return handler(raw as CloudEvent>); From bba43ab576948bdccd074a8000ccc1dfbfb539e1 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Tue, 10 May 2022 10:45:13 -0500 Subject: [PATCH 446/705] Update docs for identity (#1107) * Update docs for identity --- src/v2/providers/identity.ts | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index 798a39212..e59db6590 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -11,7 +11,7 @@ import * as options from '../options'; export { HttpsError }; -/** Internally used when parsing the options. */ +/** @hidden Internally used when parsing the options. */ interface InternalOptions { opts: options.GlobalOptions; idToken: boolean; @@ -29,7 +29,8 @@ export interface BlockingOptions extends options.GlobalOptions { } /** - * Handle an event that is triggered before a user is created. + * Handles an event that is triggered before a user is created. + * @param handler - Event handler which is run every time before a user is created */ export function beforeUserCreated( handler: ( @@ -40,6 +41,12 @@ export function beforeUserCreated( | void | Promise ): BlockingFunction; + +/** + * Handles an event that is triggered before a user is created. + * @param opts - Object containing function options + * @param handler - Event handler which is run every time before a user is created + */ export function beforeUserCreated( opts: BlockingOptions, handler: ( @@ -50,6 +57,12 @@ export function beforeUserCreated( | void | Promise ): BlockingFunction; + +/** + * Handles an event that is triggered before a user is created + * @param optsOrHandler - Either an object containing function options, or an event handler (run before user creation) + * @param handler? - If defined, an event handler which is run every time before a user is created + */ export function beforeUserCreated( optsOrHandler: | BlockingOptions @@ -72,7 +85,8 @@ export function beforeUserCreated( } /** - * Handle an event that is triggered before a user is signed in. + * Handles an event that is triggered before a user is signed in. + * @param handler - Event handler which is run every time before a user is signed in */ export function beforeUserSignedIn( handler: ( @@ -83,6 +97,12 @@ export function beforeUserSignedIn( | void | Promise ): BlockingFunction; + +/** + * Handles an event that is triggered before a user is signed in. + * @param opts - Object containing function options + * @param handler - Event handler which is run every time before a user is signed in + */ export function beforeUserSignedIn( opts: BlockingOptions, handler: ( @@ -93,6 +113,12 @@ export function beforeUserSignedIn( | void | Promise ): BlockingFunction; + +/** + * Handles an event that is triggered before a user is signed in. + * @param optsOrHandler - Either an object containing function options, or an event handler (run before user signin) + * @param handler - Event handler which is run every time before a user is signed in + */ export function beforeUserSignedIn( optsOrHandler: | BlockingOptions @@ -114,7 +140,7 @@ export function beforeUserSignedIn( return beforeOperation('beforeSignIn', optsOrHandler, handler); } -/** @internal */ +/** @hidden */ export function beforeOperation( eventType: AuthBlockingEventType, optsOrHandler: @@ -197,7 +223,7 @@ export function beforeOperation( return func; } -/** @internal */ +/** @hidden */ export function getOpts(blockingOptions: BlockingOptions): InternalOptions { const accessToken = blockingOptions.accessToken || false; const idToken = blockingOptions.idToken || false; From 4825fb4fa0abdc33120a94b8c691a79f80234908 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 10 May 2022 09:01:34 -0700 Subject: [PATCH 447/705] Docs review for v2.https (#1109) * Docs review for v2.https * PR fixes * pr feedback * pr feedback --- src/common/providers/https.ts | 54 ++++++++++++++++++++++++----------- src/v2/providers/https.ts | 46 +++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts index 29f516bc7..b3bed0e6d 100644 --- a/src/common/providers/https.ts +++ b/src/common/providers/https.ts @@ -36,6 +36,7 @@ const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/; /** @hidden */ export interface Request extends express.Request { + /** The wire format representation of the request body. */ rawBody: Buffer; } @@ -176,37 +177,53 @@ export interface CallableRequest { * https://github.com/grpc/grpc/blob/master/doc/statuscodes.md * * Possible values: - * - 'cancelled': The operation was cancelled (typically by the caller). - * - 'unknown': Unknown error or an error from a different error domain. - * - 'invalid-argument': Client specified an invalid argument. Note that this - * differs from 'failed-precondition'. 'invalid-argument' indicates + * + * - `cancelled`: The operation was cancelled (typically by the caller). + * + * - `unknown`: Unknown error or an error from a different error domain. + * + * - `invalid-argument`: Client specified an invalid argument. Note that this + * differs from `failed-precondition`. `invalid-argument` indicates * arguments that are problematic regardless of the state of the system * (e.g. an invalid field name). - * - 'deadline-exceeded': Deadline expired before operation could complete. + * + * - `deadline-exceeded`: Deadline expired before operation could complete. * For operations that change the state of the system, this error may be * returned even if the operation has completed successfully. For example, * a successful response from a server could have been delayed long enough * for the deadline to expire. - * - 'not-found': Some requested document was not found. - * - 'already-exists': Some document that we attempted to create already + * + * - `not-found`: Some requested document was not found. + * + * - `already-exists`: Some document that we attempted to create already * exists. - * - 'permission-denied': The caller does not have permission to execute the + * + * - `permission-denied`: The caller does not have permission to execute the * specified operation. - * - 'resource-exhausted': Some resource has been exhausted, perhaps a + * + * - `resource-exhausted`: Some resource has been exhausted, perhaps a * per-user quota, or perhaps the entire file system is out of space. - * - 'failed-precondition': Operation was rejected because the system is not + * + * - `failed-precondition`: Operation was rejected because the system is not * in a state required for the operation's execution. - * - 'aborted': The operation was aborted, typically due to a concurrency + * + * - `aborted`: The operation was aborted, typically due to a concurrency * issue like transaction aborts, etc. - * - 'out-of-range': Operation was attempted past the valid range. - * - 'unimplemented': Operation is not implemented or not supported/enabled. - * - 'internal': Internal errors. Means some invariants expected by + * + * - `out-of-range`: Operation was attempted past the valid range. + * + * - `unimplemented`: Operation is not implemented or not supported/enabled. + * + * - `internal`: Internal errors. Means some invariants expected by * underlying system has been broken. If you see one of these errors, * something is very broken. - * - 'unavailable': The service is currently unavailable. This is most likely + * + * - `unavailable`: The service is currently unavailable. This is most likely * a transient condition and may be corrected by retrying with a backoff. - * - 'data-loss': Unrecoverable data loss or corruption. - * - 'unauthenticated': The request does not have valid authentication + * + * - `data-loss`: Unrecoverable data loss or corruption. + * + * - `unauthenticated`: The request does not have valid authentication * credentials for the operation. */ export type FunctionsErrorCode = @@ -326,6 +343,9 @@ export class HttpsError extends Error { this.httpErrorCode = errorCodeMap[code]; } + /** + * Returns a JSON-serializable representation of this object. + */ public toJSON(): HttpErrorWireFormat { const { details, diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 3cd095e94..12e4063a0 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -38,24 +38,50 @@ import { GlobalOptions, SupportedRegion } from '../options'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; /** - * Options that can be set on an individual HTTPS Cloud Function. + * Options that can be set on an individual HTTPS function. */ export interface HttpsOptions extends Omit { - /* HTTP functions can override and specify more than one regions. */ + /** HTTP functions can override global options and can specify multiple regions to deploy to. */ region?: SupportedRegion | string | Array; + /** If true, allows CORS on requests to this function. + * If this is a `string` or `RegExp`, allows requests from domains that match the provided value. + * If this is an `Array`, allows requests from domains matching at least one entry of the array. + * Defaults to true for {@link CallableFunction}s and false otherwise. + */ cors?: string | boolean | RegExp | Array; } +/** + * Handles HTTPS requests. + */ export type HttpsFunction = (( + /** An Express request object representing the HTTPS call to the function. */ req: Request, + /** An Express response object, for this function to respond to callers. */ res: express.Response ) => void | Promise) & { + /** @alpha */ __trigger?: unknown; + /** @alpha */ __endpoint: ManifestEndpoint; }; + +/** + * Creates a callable method for clients to call using a Firebase SDK. + */ export interface CallableFunction extends HttpsFunction { + /** Executes the handler function with the provided data as input. Used for unit testing. + * @param data - An input for the handler function. + * @returns The output of the handler function. + */ run(data: CallableRequest): Return; } +/** + * Handles HTTPS requests. + * @param opts - Options to set on this function + * @param handler - A function that takes a {@link Request} and response object, same signature as an Express app. + * @returns A function that you can export and deploy. + */ export function onRequest( opts: HttpsOptions, handler: ( @@ -63,6 +89,11 @@ export function onRequest( response: express.Response ) => void | Promise ): HttpsFunction; +/** + * Handles HTTPS requests. + * @param handler - A function that takes a {@link Request} and response object, same signature as an Express app. + * @returns A function that you can export and deploy. + */ export function onRequest( handler: ( request: Request, @@ -160,10 +191,21 @@ export function onRequest( return handler as HttpsFunction; } +/** + * Declares a callable method for clients to call using a Firebase SDK. + * @param opts - Options to set on this function. + * @param handler - A function that takes a {@link CallableRequest}. + * @returns A function that you can export and deploy. + */ export function onCall>( opts: HttpsOptions, handler: (request: CallableRequest) => Return ): CallableFunction; +/** + * Declares a callable method for clients to call using a Firebase SDK. + * @param handler - A function that takes a {@link CallableRequest}. + * @returns A function that you can export and deploy. + */ export function onCall>( handler: (request: CallableRequest) => Return ): CallableFunction; From 8d45c40ce66a8aefbf28d43e9154b1955f3b61a2 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 10 May 2022 09:03:20 -0700 Subject: [PATCH 448/705] Docs pass for v2.eventarc (#1110) * Docs pass for v2.eventarc * formats * Style pass * PR feedback --- src/v2/providers/eventarc.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index fd56e714f..17750d34a 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -28,7 +28,7 @@ import * as options from '../options'; /** Options that can be set on an Eventarc trigger. */ export interface EventarcTriggerOptions extends options.EventHandlerOptions { /** - * Type of the event. + * Type of the event to trigger on. */ eventType: string; @@ -54,14 +54,26 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { filters?: Record; } +/** + * A function that takes a {@link CloudEvent}. + */ export type CloudEventHandler = (event: CloudEvent) => any | Promise; -/** Handle an Eventarc event published on the default channel. */ +/** Handles an Eventarc event published on the default channel. + * @param eventType - Type of the event to trigger on. + * @param handler - A function to execute when triggered. + * @returns A function that you can export and deploy. + */ export function onCustomEventPublished( eventType: string, handler: CloudEventHandler ): CloudFunction>; +/** Handles an Eventarc event. + * @param opts - Options to set on this function + * @param handler - A function to execute when triggered. + * @returns A function that you can export and deploy. + */ export function onCustomEventPublished( opts: EventarcTriggerOptions, handler: CloudEventHandler From ff4fc3f88e8d35115e8f47fcf81224385d73ff0c Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Tue, 10 May 2022 12:16:58 -0500 Subject: [PATCH 449/705] Update docs for pubsub to show `string` for topic + subscription (#1114) The generated docs show the typing as `PubSubTopic` and `PubSubSubscription`. But to the end user they just need to know its a string. --- src/v2/providers/pubsub.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 137d0fd73..bfcd8c699 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -12,12 +12,12 @@ import * as options from '../options'; *
      • Messages are listened to via a subscription. *
      • Each subscription listens to the messages published to exactly one topic. */ -export type PubSubTopic = string; +export type Topic = string; /** * Resource that listens to the messages published by exactly one topic. */ -export type PubSubSubscription = string; +export type Subscription = string; /** * Interface representing a Google Cloud Pub/Sub message. @@ -111,13 +111,13 @@ export interface MessagePublishedData { /** Google Cloud Pub/Sub message. */ readonly message: Message; /** A subscription resource. */ - readonly subscription: PubSubSubscription; + readonly subscription: string; } /** PubSubOptions extend EventHandlerOptions but must include a topic. */ export interface PubSubOptions extends options.EventHandlerOptions { /** The Pub/Sub topic to watch for message events */ - topic: PubSubTopic; + topic: string; } /** @@ -127,7 +127,7 @@ export interface PubSubOptions extends options.EventHandlerOptions { * @typeParam T - Type representing `Message.data`'s JSON format */ export function onMessagePublished( - topic: PubSubTopic, + topic: string, handler: (event: CloudEvent>) => any | Promise ): CloudFunction>>; @@ -166,7 +166,7 @@ export function onMessagePublished( const func = (raw: CloudEvent) => { const messagePublishedData = raw.data as { message: unknown; - subscription: PubSubSubscription; + subscription: string; }; messagePublishedData.message = new Message(messagePublishedData.message); return handler(raw as CloudEvent>); From c5a0fb5007ccfa5bff9e7ba7b8017cf28dec24a7 Mon Sep 17 00:00:00 2001 From: joehan Date: Tue, 10 May 2022 10:30:43 -0700 Subject: [PATCH 450/705] Fixing broken @link tags for https docs (#1115) --- src/v2/providers/https.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 12e4063a0..d4d3d07c7 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -46,7 +46,7 @@ export interface HttpsOptions extends Omit { /** If true, allows CORS on requests to this function. * If this is a `string` or `RegExp`, allows requests from domains that match the provided value. * If this is an `Array`, allows requests from domains matching at least one entry of the array. - * Defaults to true for {@link CallableFunction}s and false otherwise. + * Defaults to true for {@link https.CallableFunction} and false otherwise. */ cors?: string | boolean | RegExp | Array; } @@ -79,7 +79,7 @@ export interface CallableFunction extends HttpsFunction { /** * Handles HTTPS requests. * @param opts - Options to set on this function - * @param handler - A function that takes a {@link Request} and response object, same signature as an Express app. + * @param handler - A function that takes a {@link https.Request} and response object, same signature as an Express app. * @returns A function that you can export and deploy. */ export function onRequest( @@ -91,7 +91,7 @@ export function onRequest( ): HttpsFunction; /** * Handles HTTPS requests. - * @param handler - A function that takes a {@link Request} and response object, same signature as an Express app. + * @param handler - A function that takes a {@link https.Request} and response object, same signature as an Express app. * @returns A function that you can export and deploy. */ export function onRequest( @@ -194,7 +194,7 @@ export function onRequest( /** * Declares a callable method for clients to call using a Firebase SDK. * @param opts - Options to set on this function. - * @param handler - A function that takes a {@link CallableRequest}. + * @param handler - A function that takes a {@link https.CallableRequest}. * @returns A function that you can export and deploy. */ export function onCall>( @@ -203,7 +203,7 @@ export function onCall>( ): CallableFunction; /** * Declares a callable method for clients to call using a Firebase SDK. - * @param handler - A function that takes a {@link CallableRequest}. + * @param handler - A function that takes a {@link https.CallableRequest}. * @returns A function that you can export and deploy. */ export function onCall>( From 67094673da5b5add0c3eb224736fddc15a786050 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 11:20:08 -0700 Subject: [PATCH 451/705] Update docs for root namespace (#1101) * Attempted fix; not sure why some things aren't showing up * Update docs; pull params namespace * Don't try to use bulleted list in field comments; they don't render * Yank @beta tags; run formatter * PR feedback --- src/v2/core.ts | 20 +++++++++- src/v2/index.ts | 23 +++++------ src/v2/options.ts | 98 +++++++++++++++-------------------------------- 3 files changed, 60 insertions(+), 81 deletions(-) diff --git a/src/v2/core.ts b/src/v2/core.ts index 54d61ff1c..533349b55 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -56,6 +56,8 @@ export interface TriggerAnnotation { /** * 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 + * @typeParam T - The type of the event data. + * @beta */ export interface CloudEvent { /** Version of the CloudEvents spec for this event. */ @@ -80,12 +82,28 @@ export interface CloudEvent { data: T; } -/** A handler for CloudEvents. */ +/** + * A handler for CloudEvents. + * @typeParam EventType - The kind of event this function handles. + * Always a subclass of CloudEvent<> + * @beta + */ export interface CloudFunction> { (raw: CloudEvent): any | Promise; + /** @alpha */ __trigger?: unknown; + /** @alpha */ __endpoint: ManifestEndpoint; + /** + * The callback passed to the CloudFunction constructor. + * Use run to test a CloudFunction + * @param event - The parsed event to handle. + * @returns Any return value. Google Cloud Functions awaits any promise + * before shutting down your function. Resolved return values + * are only used for unit testing purposes. + * @beta + */ run(event: EventType): any | Promise; } diff --git a/src/v2/index.ts b/src/v2/index.ts index 31070b4dc..fd89e52fa 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -21,7 +21,6 @@ // SOFTWARE. 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'; @@ -30,18 +29,16 @@ import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; -export { - alerts, - https, - identity, - pubsub, - storage, - logger, - params, - tasks, - eventarc, -}; +export { alerts, https, identity, pubsub, storage, logger, tasks, eventarc }; -export { setGlobalOptions, GlobalOptions } from './options'; +export { + setGlobalOptions, + GlobalOptions, + SupportedRegion, + MemoryOption, + VpcEgressSetting, + IngressSetting, + EventHandlerOptions, +} from './options'; export { CloudFunction, CloudEvent } from './core'; diff --git a/src/v2/options.ts b/src/v2/options.ts index c4e3cd7de..d3155f3c3 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -36,55 +36,28 @@ import { HttpsOptions } from './providers/https'; /** * List of all regions supported by Cloud Functions v2 */ -export const SUPPORTED_REGIONS = [ - 'asia-northeast1', - 'europe-north1', - 'europe-west1', - 'europe-west4', - 'us-central1', - 'us-east1', - 'us-west1', -] as const; - -/** - * A region known to be supported by CloudFunctions v2 - */ -export type SupportedRegion = typeof SUPPORTED_REGIONS[number]; - -/** - * Cloud Functions v2 min timeout value. - */ -export const MIN_TIMEOUT_SECONDS = 1; - -/** - * Cloud Functions v2 max timeout value for event handlers. - */ -export const MAX_EVENT_TIMEOUT_SECONDS = 540; - -/** - * Cloud Functions v2 max timeout for HTTPS functions. - */ -export const MAX_HTTPS_TIMEOUT_SECONDS = 36_000; - -/** - * Maximum number of requests to serve on a single instance. - */ -export const MAX_CONCURRENCY = 1_000; +export type SupportedRegion = + | 'asia-northeast1' + | 'europe-north1' + | 'europe-west1' + | 'europe-west4' + | 'us-central1' + | 'us-east1' + | 'us-west1'; /** * List of available memory options supported by Cloud Functions. */ -export const SUPPORTED_MEMORY_OPTIONS = [ - '128MiB', - '256MiB', - '512MiB', - '1GiB', - '2GiB', - '4GiB', - '8GiB', - '16GiB', - '32GiB', -] as const; +export type MemoryOption = + | '128MiB' + | '256MiB' + | '512MiB' + | '1GiB' + | '2GiB' + | '4GiB' + | '8GiB' + | '16GiB' + | '32GiB'; const MemoryOptionToMB: Record = { '128MiB': 128, @@ -98,34 +71,18 @@ const MemoryOptionToMB: Record = { '32GiB': 32768, }; -/** - * A supported memory option. - */ -export type MemoryOption = typeof SUPPORTED_MEMORY_OPTIONS[number]; - /** * List of available options for VpcConnectorEgressSettings. */ -export const SUPPORTED_VPC_EGRESS_SETTINGS = [ - 'PRIVATE_RANGES_ONLY', - 'ALL_TRAFFIC', -] as const; - -/** - * A valid VPC Egress setting. - */ -export type VpcEgressSetting = typeof SUPPORTED_VPC_EGRESS_SETTINGS[number]; +export type VpcEgressSetting = 'PRIVATE_RANGES_ONLY' | 'ALL_TRAFFIC'; /** * List of available options for IngressSettings. */ -export const SUPPORTED_INGRESS_SETTINGS = [ - 'ALLOW_ALL', - 'ALLOW_INTERNAL_ONLY', - 'ALLOW_INTERNAL_AND_GCLB', -] as const; - -export type IngressSetting = typeof SUPPORTED_INGRESS_SETTINGS[number]; +export type IngressSetting = + | 'ALLOW_ALL' + | 'ALLOW_INTERNAL_ONLY' + | 'ALLOW_INTERNAL_AND_GCLB'; /** * GlobalOptions are options that can be set across an entire project. @@ -148,6 +105,11 @@ export interface GlobalOptions { * 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 + * 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 | null; @@ -170,6 +132,7 @@ export interface GlobalOptions { * 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 | null; @@ -246,7 +209,7 @@ export function getGlobalOptions(): GlobalOptions { } /** - * Options that can be set on an individual event-handling Cloud Function. + * Additional fields that can be set on any event-handling Cloud Function. */ export interface EventHandlerOptions extends GlobalOptions { retry?: boolean; @@ -361,6 +324,7 @@ export function optionsToEndpoint( /** * @hidden + * @alpha */ export function __getSpec(): { globalOptions: GlobalOptions; From 92aa571f1fde27d8ad2778568c698fe30c517399 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 11:32:10 -0700 Subject: [PATCH 452/705] Move some types to interfaces; inline interfaces to make fields private (#1113) * Move some types to interfaces; inline interfaces to make fields private * Run formatter --- docgen/toc.ts | 4 +- src/cloud-functions.ts | 104 ++++++++++++++++++------------- src/common/providers/identity.ts | 5 +- 3 files changed, 66 insertions(+), 47 deletions(-) diff --git a/docgen/toc.ts b/docgen/toc.ts index d552a9cba..24cc58092 100644 --- a/docgen/toc.ts +++ b/docgen/toc.ts @@ -21,9 +21,9 @@ import { writeFileSync } from 'fs'; import { resolve } from 'path'; -import yargs from 'yargs'; -import * as yaml from 'js-yaml'; import { FileSystem } from '@rushstack/node-core-library'; +import * as yaml from 'js-yaml'; +import yargs from 'yargs'; export interface TocGenerationOptions { inputFolder: string; diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index 1f59f50d8..a362230fb 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -257,45 +257,33 @@ export interface Resource { } /** - * @hidden - * TriggerAnnotated is used internally by the firebase CLI to understand what + * TriggerAnnotion is used internally by the firebase CLI to understand what * type of Cloud Function to deploy. */ -export interface TriggerAnnotated { - __trigger: { - availableMemoryMb?: number; - blockingTrigger?: { - eventType: string; - options?: Record; - }; - eventTrigger?: { - eventType: string; - resource: string; - service: string; - }; - failurePolicy?: FailurePolicy; - httpsTrigger?: { - invoker?: string[]; - }; - labels?: { [key: string]: string }; - regions?: string[]; - schedule?: Schedule; - timeout?: Duration; - vpcConnector?: string; - vpcConnectorEgressSettings?: string; - serviceAccountEmail?: string; - ingressSettings?: string; - secrets?: string[]; +interface TriggerAnnotation { + availableMemoryMb?: number; + blockingTrigger?: { + eventType: string; + options?: Record; }; -} - -/** - * @hidden - * EndpointAnnotated is used to generate the manifest that conforms to the container contract. - */ -export interface EndpointAnnotated { - __endpoint: ManifestEndpoint; - __requiredAPIs?: ManifestRequiredAPI[]; + eventTrigger?: { + eventType: string; + resource: string; + service: string; + }; + failurePolicy?: FailurePolicy; + httpsTrigger?: { + invoker?: string[]; + }; + labels?: { [key: string]: string }; + regions?: string[]; + schedule?: Schedule; + timeout?: Duration; + vpcConnector?: string; + vpcConnectorEgressSettings?: string; + serviceAccountEmail?: string; + ingressSettings?: string; + secrets?: string[]; } /** @@ -315,14 +303,34 @@ export interface Runnable { * [`Response`](https://expressjs.com/en/api.html#res) objects as its only * arguments. */ -export type HttpsFunction = TriggerAnnotated & - EndpointAnnotated & - ((req: Request, resp: Response) => void | Promise); +export interface HttpsFunction { + (req: Request, resp: Response): void | Promise; + + /** @alpha */ + __trigger: TriggerAnnotation; + + /** @alpha */ + __endpoint: ManifestEndpoint; + + /** @alpha */ + __requiredAPIs?: ManifestRequiredAPI[]; +} /** * The Cloud Function type for Blocking triggers. */ -export type BlockingFunction = HttpsFunction; +export interface BlockingFunction { + (req: Request, resp: Response): void | Promise; + + /** @alpha */ + __trigger: TriggerAnnotation; + + /** @alpha */ + __endpoint: ManifestEndpoint; + + /** @alpha */ + __requiredAPIs?: ManifestRequiredAPI[]; +} /** * The Cloud Function type for all non-HTTPS triggers. This should be exported @@ -331,10 +339,18 @@ export type BlockingFunction = HttpsFunction; * This type is a special JavaScript function which takes a templated * `Event` object as its only argument. */ -export type CloudFunction = Runnable & - TriggerAnnotated & - EndpointAnnotated & - ((input: any, context?: any) => PromiseLike | any); +export interface CloudFunction extends Runnable { + (input: any, context?: any): PromiseLike | any; + + /** @alpha */ + __trigger: TriggerAnnotation; + + /** @alpha */ + __endpoint: ManifestEndpoint; + + /** @alpha */ + __requiredAPIs?: ManifestRequiredAPI[]; +} /** @hidden */ export interface MakeCloudFunctionArgs { diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 6912b9d1b..031e36f97 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -50,7 +50,10 @@ const DISALLOWED_CUSTOM_CLAIMS = [ const CLAIMS_MAX_PAYLOAD_SIZE = 1000; -/** Shorthand auth blocking events from GCIP. */ +/** + * Shorthand auth blocking events from GCIP. + * @internal + */ export type AuthBlockingEventType = 'beforeCreate' | 'beforeSignIn'; const EVENT_MAPPING: Record = { From 2e976034da1d2aede54fb7edb4bcb8ee37bb73a5 Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Tue, 10 May 2022 14:11:32 -0500 Subject: [PATCH 453/705] Updated PubSub docs, removing unused types + top-level comments (#1117) * Updated PubSub docs, removing unused types and included top-level comments --- src/v2/providers/pubsub.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index bfcd8c699..e5321ef70 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -4,20 +4,25 @@ import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; /** - * A PubSub Topic is: + * 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. + * + * This function triggers whenever a new pub/sub message is sent to a specific topic. + * You must specify the Pub/Sub topic name that you want to trigger your function, and set the event within the + * onPublish() event handler. + * + * PubSub Topic: *
          *
        • A resource that you can publish messages to and then consume those messages via subscriptions. - *
        • An isolated data stream for Pub/Sub messages. + *
        • An isolated data stream for pub/sub messages. *
        • Messages are published to a topic. *
        • Messages are listened to via a subscription. *
        • Each subscription listens to the messages published to exactly one topic. + * + * Subscriptions - Resource that listens to the messages published by exactly one topic. + * + * [More info here](https://firebase.google.com/docs/functions/pubsub-events) */ -export type Topic = string; - -/** - * Resource that listens to the messages published by exactly one topic. - */ -export type Subscription = string; /** * Interface representing a Google Cloud Pub/Sub message. From d9536a991573c5382613dc77337a7f05405ec64d Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Tue, 10 May 2022 15:20:26 -0400 Subject: [PATCH 454/705] Update alerts namespace docs (#1111) * updating docs * fixing comments --- src/v2/providers/alerts/alerts.ts | 12 +- src/v2/providers/alerts/appDistribution.ts | 29 +++- src/v2/providers/alerts/billing.ts | 37 +++- src/v2/providers/alerts/crashlytics.ts | 186 ++++++++++++++++++--- 4 files changed, 237 insertions(+), 27 deletions(-) diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index df800fadb..4b260a851 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -4,6 +4,7 @@ import * as options from '../../options'; /** * The CloudEvent data emitted by Firebase Alerts. + * @typeParam T - the payload type that is expected for this alert. */ export interface FirebaseAlertData { /** Time that the event has created. */ @@ -16,6 +17,7 @@ export interface FirebaseAlertData { /** * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + * @typeParam T - the data type for this alert that is wrapped in a `FirebaseAlertData` object. */ export interface AlertEvent extends CloudEvent> { /** The type of the alerts that got triggered. */ @@ -26,7 +28,7 @@ export interface AlertEvent extends CloudEvent> { */ appId?: string; - /** Data for an AlertEvent is a FirebaseAlertData with a given payload. */ + /** Data for an `AlertEvent` is a `FirebaseAlertData` object with a given payload. */ data: FirebaseAlertData; } @@ -50,14 +52,18 @@ export type AlertType = * Configuration for Firebase Alert functions. */ export interface FirebaseAlertOptions extends options.EventHandlerOptions { + /** Scope the handler to trigger on an alert type. */ alertType: AlertType; + /** Scope the function to trigger on a specific application. */ appId?: string; } /** * Declares a function that can handle Firebase Alerts from CloudEvents. + * @typeParam T - The data type of the `FirebaseAlertData` object the function receives. * @param alertTypeOrOpts the alert type or Firebase Alert function configuration. * @param handler a function that can handle the Firebase Alert inside a CloudEvent. + * @returns A function that you can export and deploy. */ export function onAlertPublished( alertTypeOrOpts: AlertType | FirebaseAlertOptions, @@ -76,8 +82,8 @@ export function onAlertPublished( } /** - * @internal * Helper function for getting the endpoint annotation used in alert handling functions. + * @internal */ export function getEndpointAnnotation( opts: options.EventHandlerOptions, @@ -109,8 +115,8 @@ export function getEndpointAnnotation( } /** - * @internal * Helper function to parse the function opts, alert type, and appId. + * @internal */ export function getOptsAndAlertTypeAndApp( alertTypeOrOpts: AlertType | FirebaseAlertOptions diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index e22f847c0..fc8ec18d2 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -4,7 +4,7 @@ import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; /** * The internal payload object for adding a new tester device to app distribution. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface NewTesterDevicePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload'; @@ -20,6 +20,7 @@ export interface NewTesterDevicePayload { /** * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + * @typeParam T - the data type for app distribution alerts that is wrapped in a `FirebaseAlertData` object. */ export interface AppDistributionEvent extends CloudEvent> { @@ -36,29 +37,53 @@ export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice'; * Configuration for app distribution functions. */ export interface AppDistributionOptions extends options.EventHandlerOptions { + /** Scope the function to trigger on a specific application. */ appId?: string; } /** * Declares a function that can handle adding a new tester iOS device. + * @param handler - Event handler which is run every time a new tester iOS device is added. + * @returns A function that you can export and deploy. */ export function onNewTesterIosDevicePublished( handler: ( event: AppDistributionEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle adding a new tester iOS device. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler which is run every time a new tester iOS device is added. + * @returns A function that you can export and deploy. + */ export function onNewTesterIosDevicePublished( appId: string, handler: ( event: AppDistributionEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle adding a new tester iOS device. + * @param opts - Options that can be set on the function. + * @param handler - Event handler which is run every time a new tester iOS device is added. + * @returns A function that you can export and deploy. + */ export function onNewTesterIosDevicePublished( opts: AppDistributionOptions, handler: ( event: AppDistributionEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle adding a new tester iOS device. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler which is run every time a new tester iOS device is added. + * @returns A function that you can export and deploy. + */ export function onNewTesterIosDevicePublished( appIdOrOptsOrHandler: | string @@ -90,8 +115,8 @@ export function onNewTesterIosDevicePublished( } /** - * @internal * Helper function to parse the function opts and appId. + * @internal */ export function getOptsAndApp( appIdOrOpts: string | AppDistributionOptions diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index 4439546a5..8990481cc 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -4,7 +4,7 @@ import * as options from '../../options'; /** * The internal payload object for billing plan updates. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface PlanUpdatePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanUpdatePayload'; @@ -18,7 +18,7 @@ export interface PlanUpdatePayload { /** * The internal payload object for billing plan automated updates. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface PlanAutomatedUpdatePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanAutomatedUpdatePayload'; @@ -30,6 +30,7 @@ export interface PlanAutomatedUpdatePayload { /** * A custom CloudEvent for billing Firebase Alerts (with custom extension attributes). + * @typeParam T - the data type for billing alerts that is wrapped in a `FirebaseAlertData` object. */ export interface BillingEvent extends CloudEvent> { /** The type of the alerts that got triggered. */ @@ -43,14 +44,30 @@ export const planAutomatedUpdateAlert = 'billing.planAutomatedUpdate'; /** * Declares a function that can handle a billing plan update event. + * @param handler - Event handler which is run every time a billing plan is updated. + * @returns A function that you can export and deploy. */ export function onPlanUpdatePublished( handler: (event: BillingEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a billing plan update event. + * @param opts - Options that can be set on the function. + * @param handler - Event handler which is run every time a billing plan is updated. + * @returns A function that you can export and deploy. + */ export function onPlanUpdatePublished( opts: options.EventHandlerOptions, handler: (event: BillingEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a billing plan update event. + * @param optsOrHandler - Options or an event-handling function. + * @param handler - Event handler which is run every time a billing plan is updated. + * @returns A function that you can export and deploy. + */ export function onPlanUpdatePublished( optsOrHandler: | options.EventHandlerOptions @@ -66,18 +83,34 @@ export function onPlanUpdatePublished( /** * Declares a function that can handle an automated billing plan update event. + * @param handler - Event handler which is run every time an automated billing plan update occurs. + * @returns A function that you can export and deploy. */ export function onPlanAutomatedUpdatePublished( handler: ( event: BillingEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle an automated billing plan update event. + * @param opts - Options that can be set on the function. + * @param handler - Event handler which is run every time an automated billing plan update occurs. + * @returns A function that you can export and deploy. + */ export function onPlanAutomatedUpdatePublished( opts: options.EventHandlerOptions, handler: ( event: BillingEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle an automated billing plan update event. + * @param optsOrHandler - Options or an event-handling function. + * @param handler - Event handler which is run every time an automated billing plan update occurs. + * @returns A function that you can export and deploy. + */ export function onPlanAutomatedUpdatePublished( optsOrHandler: | options.EventHandlerOptions diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 1cbe13760..1efff4f28 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -2,21 +2,21 @@ import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; -/** Generic crashlytics issue interface */ +/** Generic Crashlytics issue interface */ export interface Issue { - /** The ID of the crashlytics issue */ + /** The ID of the Crashlytics issue */ id: string; - /** The title of the crashlytics issue */ + /** The title of the Crashlytics issue */ title: string; - /** The subtitle of the crashlytics issue */ + /** The subtitle of the Crashlytics issue */ subtitle: string; - /** The application version of the crashlytics issue */ + /** The application version of the Crashlytics issue */ appVersion: string; } /** * The internal payload object for a new fatal issue. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface NewFatalIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewFatalIssuePayload'; @@ -26,7 +26,7 @@ export interface NewFatalIssuePayload { /** * The internal payload object for a new non-fatal issue. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface NewNonfatalIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewNonfatalIssuePayload'; @@ -36,7 +36,7 @@ export interface NewNonfatalIssuePayload { /** * The internal payload object for a regression alert. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface RegressionAlertPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsRegressionAlertPayload'; @@ -51,7 +51,7 @@ export interface RegressionAlertPayload { resolveTime: string; } -/** Generic crashlytics trending issue interface */ +/** Generic Crashlytics trending issue interface */ export interface TrendingIssueDetails { /** The type of the Crashlytics issue, e.g. new fatal, new nonfatal, ANR */ type: string; @@ -65,7 +65,7 @@ export interface TrendingIssueDetails { /** * The internal payload object for a stability digest. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface StabilityDigestPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsStabilityDigestPayload'; @@ -80,7 +80,7 @@ export interface StabilityDigestPayload { /** * The internal payload object for a velocity alert. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface VelocityAlertPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsVelocityAlertPayload'; @@ -107,7 +107,7 @@ export interface VelocityAlertPayload { /** * The internal payload object for a new Application Not Responding issue. - * Payload is wrapped inside a FirebaseAlertData object. + * Payload is wrapped inside a `FirebaseAlertData` object. */ export interface NewAnrIssuePayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewAnrIssuePayload'; @@ -117,6 +117,7 @@ export interface NewAnrIssuePayload { /** * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + * @typeParam T - the data type for Crashlytics alerts that is wrapped in a `FirebaseAlertData` object. */ export interface CrashlyticsEvent extends CloudEvent> { /** The type of the alerts that got triggered. */ @@ -139,26 +140,50 @@ export const velocityAlert = 'crashlytics.velocity'; export const newAnrIssueAlert = 'crashlytics.newAnrIssue'; /** - * Configuration for crashlytics functions. + * Configuration for Crashlytics functions. */ export interface CrashlyticsOptions extends options.EventHandlerOptions { + /** Scope the function to trigger on a specific application. */ appId?: string; } /** - * Declares a function that can handle a new fatal issue published to crashlytics. + * Declares a function that can handle a new fatal issue published to Crashlytics. + * @param handler - Event handler that is triggered when a new fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onNewFatalIssuePublished( handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new fatal issue published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a new fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewFatalIssuePublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new fatal issue published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a new fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewFatalIssuePublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new fatal issue published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a new fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewFatalIssuePublished( appIdOrOptsOrHandler: | string @@ -176,25 +201,48 @@ export function onNewFatalIssuePublished( } /** - * Declares a function that can handle aa new non-fatal issue published to crashlytics. + * Declares a function that can handle a new non-fatal issue published to Crashlytics. + * @param handler - Event handler that is triggered when a new fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onNewNonfatalIssuePublished( handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new non-fatal issue published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a new non-fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewNonfatalIssuePublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new non-fatal issue published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a new non-fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewNonfatalIssuePublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new non-fatal issue published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a new non-fatal issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewNonfatalIssuePublished( appIdOrOptsOrHandler: | string @@ -214,25 +262,50 @@ export function onNewNonfatalIssuePublished( } /** - * Declares a function that can handle a regression alert published to crashlytics. + * Declares a function that can handle a regression alert published to Crashlytics. + * @param handler - Event handler that is triggered when a regression alert is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onRegressionAlertPublished( handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a regression alert published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a regression alert is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onRegressionAlertPublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a regression alert published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a regression alert is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onRegressionAlertPublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a regression alert published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a regression alert is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onRegressionAlertPublished( appIdOrOptsOrHandler: | string @@ -250,25 +323,50 @@ export function onRegressionAlertPublished( } /** - * Declares a function that can handle a stability digest published to crashlytics. + * Declares a function that can handle a stability digest published to Crashlytics. + * @param handler - Event handler that is triggered when a stability digest is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onStabilityDigestPublished( handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a stability digest published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a stability digest is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onStabilityDigestPublished( appId: string, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a stability digest published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a stability digest is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onStabilityDigestPublished( opts: CrashlyticsOptions, handler: ( event: CrashlyticsEvent ) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a stability digest published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a stability digest is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onStabilityDigestPublished( appIdOrOptsOrHandler: | string @@ -286,19 +384,42 @@ export function onStabilityDigestPublished( } /** - * Declares a function that can handle a velocity alert published to crashlytics. + * Declares a function that can handle a velocity alert published to Crashlytics. + * @param handler - Event handler that is triggered when a velocity alert is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onVelocityAlertPublished( handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a velocity alert published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a velocity alert is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onVelocityAlertPublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a velocity alert published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a velocity alert is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onVelocityAlertPublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a velocity alert published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a velocity alert is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onVelocityAlertPublished( appIdOrOptsOrHandler: | string @@ -316,19 +437,44 @@ export function onVelocityAlertPublished( } /** - * Declares a function that can handle a new Application Not Responding issue published to crashlytics. + * Declares a function that can handle a new Application Not Responding issue published to Crashlytics. + * @param handler - Event handler that is triggered when a new Application Not Responding issue is published to Crashlytics. + * @returns A function that you can export and deploy. */ export function onNewAnrIssuePublished( handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new Application Not Responding issue published to Crashlytics. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler that is triggered when a new Application Not Responding issue is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onNewAnrIssuePublished( appId: string, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new Application Not Responding issue published to Crashlytics. + * @param opts - Options that can be set on the function. + * @param handler - Event handler that is triggered when a new Application Not Responding issue is published to Crashlytics. + * @returns A function that you can export and deploy. + + */ export function onNewAnrIssuePublished( opts: CrashlyticsOptions, handler: (event: CrashlyticsEvent) => any | Promise ): CloudFunction>; + +/** + * Declares a function that can handle a new Application Not Responding issue published to Crashlytics. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler that is triggered when a new Application Not Responding issue is published to Crashlytics. + * @returns A function that you can export and deploy. + */ export function onNewAnrIssuePublished( appIdOrOptsOrHandler: | string @@ -374,8 +520,8 @@ export function onOperation( } /** - * @internal * Helper function to parse the function opts and appId. + * @internal */ export function getOptsAndApp( appIdOrOpts: string | CrashlyticsOptions From be7e52907bb91379772bcd46c63f4c40e932a3e5 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 14:31:16 -0700 Subject: [PATCH 455/705] Redefine fields in options so they get better docs (#1119) * Redefine fields in options so they get better docs * PR feedback --- src/common/providers/identity.ts | 3 +- src/v2/options.ts | 3 +- src/v2/providers/alerts/alerts.ts | 114 ++++++++++++++++++++- src/v2/providers/alerts/appDistribution.ts | 93 +++++++++++++++++ src/v2/providers/alerts/crashlytics.ts | 93 +++++++++++++++++ src/v2/providers/eventarc.ts | 93 +++++++++++++++++ src/v2/providers/https.ts | 93 +++++++++++++++++ src/v2/providers/identity.ts | 92 ++++++++++++++++- src/v2/providers/pubsub.ts | 93 +++++++++++++++++ src/v2/providers/storage.ts | 93 +++++++++++++++++ src/v2/providers/tasks.ts | 99 +++++++++++++++++- 11 files changed, 863 insertions(+), 6 deletions(-) diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 031e36f97..08658c48d 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -52,7 +52,8 @@ const CLAIMS_MAX_PAYLOAD_SIZE = 1000; /** * Shorthand auth blocking events from GCIP. - * @internal + * @hidden + * @alpha */ export type AuthBlockingEventType = 'beforeCreate' | 'beforeSignIn'; diff --git a/src/v2/options.ts b/src/v2/options.ts index d3155f3c3..d8beb1341 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -181,7 +181,7 @@ export interface GlobalOptions { invoker?: 'public' | 'private' | string | string[]; /* - * Secrets to bind to a functions. + * Secrets to bind to a function. */ secrets?: string[]; } @@ -212,6 +212,7 @@ export function getGlobalOptions(): GlobalOptions { * Additional fields that can be set on any event-handling Cloud Function. */ export interface EventHandlerOptions extends GlobalOptions { + /** Whether failed executions should be delivered again. */ retry?: boolean; } diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 4b260a851..6d4e09d54 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -54,17 +54,127 @@ export type AlertType = export interface FirebaseAlertOptions extends options.EventHandlerOptions { /** Scope the handler to trigger on an alert type. */ alertType: AlertType; + /** Scope the function to trigger on a specific application. */ appId?: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** * Declares a function that can handle Firebase Alerts from CloudEvents. - * @typeParam T - The data type of the `FirebaseAlertData` object the function receives. - * @param alertTypeOrOpts the alert type or Firebase Alert function configuration. + * @typeParam T - the type of event.data.payload. + * @param alertType - the alert type or Firebase Alert function configuration. * @param handler a function that can handle the Firebase Alert inside a CloudEvent. * @returns A function that you can export and deploy. */ +export function onAlertPublished( + alertType: AlertType, + handler: (event: AlertEvent) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle Firebase Alerts from CloudEvents. + * @typeParam T - the type of event.data.payload. + * @param options - the alert type and other options for this cloud function. + * @param handler a function that can handle the Firebase Alert inside a CloudEvent. + */ +export function onAlertPublished( + options: FirebaseAlertOptions, + handler: (event: AlertEvent) => any | Promise +): CloudFunction>; + export function onAlertPublished( alertTypeOrOpts: AlertType | FirebaseAlertOptions, handler: (event: AlertEvent) => any | Promise diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index fc8ec18d2..d26f84044 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -39,6 +39,99 @@ export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice'; export interface AppDistributionOptions extends options.EventHandlerOptions { /** Scope the function to trigger on a specific application. */ appId?: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 1efff4f28..307dda260 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -145,6 +145,99 @@ export const newAnrIssueAlert = 'crashlytics.newAnrIssue'; export interface CrashlyticsOptions extends options.EventHandlerOptions { /** Scope the function to trigger on a specific application. */ appId?: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index 17750d34a..289a1a490 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -52,6 +52,99 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { * Eventarc event exact match filter. */ filters?: Record; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index d4d3d07c7..847d65631 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -49,6 +49,99 @@ export interface HttpsOptions extends Omit { * Defaults to true for {@link https.CallableFunction} and false otherwise. */ cors?: string | boolean | RegExp | Array; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /** + * Invoker to set access control on https functions. + */ + invoker?: 'public' | 'private' | string | string[]; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index e59db6590..b101a8194 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -22,10 +22,100 @@ interface InternalOptions { /** * All function options plus idToken, accessToken, and refreshToken. */ -export interface BlockingOptions extends options.GlobalOptions { +export interface BlockingOptions { idToken?: boolean; accessToken?: boolean; refreshToken?: boolean; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; } /** diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index e5321ef70..09c56d59c 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -123,6 +123,99 @@ export interface MessagePublishedData { export interface PubSubOptions extends options.EventHandlerOptions { /** The Pub/Sub topic to watch for message events */ topic: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 27e6d01dc..ec8068119 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -194,6 +194,99 @@ export const metadataUpdatedEvent = export interface StorageOptions extends options.EventHandlerOptions { /** The name of the bucket containing this object. */ bucket?: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index b45de3361..1c175ead8 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -37,9 +37,13 @@ import { HttpsFunction } from './https'; export { AuthData, RateLimits, Request, RetryConfig as RetryPolicy }; -export interface TaskQueueOptions extends options.GlobalOptions { +export interface TaskQueueOptions extends options.EventHandlerOptions { + /** How a task should be retried in the event of a non-2xx return. */ retryConfig?: RetryConfig; + + /** How congestion control should be applied to the function. */ rateLimits?: RateLimits; + /** * Who can enqueue tasks for this function. * If left unspecified, only service accounts which have @@ -47,6 +51,99 @@ export interface TaskQueueOptions extends options.GlobalOptions { * will have permissions. */ invoker?: 'private' | string | string[]; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } export interface TaskQueueFunction extends HttpsFunction { From 1bf0a86b5a7eacb768592e56dae99c68b51b4257 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 14:33:18 -0700 Subject: [PATCH 456/705] Inline eventarc callback type (#1118) --- src/v2/providers/eventarc.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index 289a1a490..fed753864 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Cloud functions to integrate directly with Eventarc. + * @packageDocumentation + */ + import { convertIfPresent, copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; @@ -147,11 +152,6 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { retry?: boolean; } -/** - * A function that takes a {@link CloudEvent}. - */ -export type CloudEventHandler = (event: CloudEvent) => any | Promise; - /** Handles an Eventarc event published on the default channel. * @param eventType - Type of the event to trigger on. * @param handler - A function to execute when triggered. @@ -159,7 +159,7 @@ export type CloudEventHandler = (event: CloudEvent) => any | Promise; */ export function onCustomEventPublished( eventType: string, - handler: CloudEventHandler + handler: (event: CloudEvent) => any | Promise ): CloudFunction>; /** Handles an Eventarc event. @@ -169,12 +169,12 @@ export function onCustomEventPublished( */ export function onCustomEventPublished( opts: EventarcTriggerOptions, - handler: CloudEventHandler + handler: (event: CloudEvent) => any | Promise ): CloudFunction>; export function onCustomEventPublished( eventTypeOrOpts: string | EventarcTriggerOptions, - handler: CloudEventHandler + handler: (event: CloudEvent) => any | Promise ): CloudFunction> { let opts: EventarcTriggerOptions; if (typeof eventTypeOrOpts === 'string') { From 4ab383b62c5f88c2825ccc1238e638bca1a8a5a6 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Tue, 10 May 2022 17:57:14 -0400 Subject: [PATCH 457/705] Add tsdocs for blocking function options (#1121) * updating docs * fixing comments * add blocking options tsdoc * wording --- src/providers/auth.ts | 6 ++++++ src/v2/providers/identity.ts | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/providers/auth.ts b/src/providers/auth.ts index fcc612e76..fec895e89 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -59,9 +59,15 @@ export const service = 'firebaseauth.googleapis.com'; * @public */ export interface UserOptions { + /** Options to set configuration at the resource level for blocking functions. */ blockingOptions?: { + /** Pass the ID Token credential to the function. */ idToken?: boolean; + + /** Pass the Access Token credential to the function. */ accessToken?: boolean; + + /** Pass the Refresh Token credential to the function. */ refreshToken?: boolean; }; } diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index b101a8194..e924b0cd7 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -23,8 +23,13 @@ interface InternalOptions { * All function options plus idToken, accessToken, and refreshToken. */ export interface BlockingOptions { + /** Pass the ID Token credential to the function. */ idToken?: boolean; + + /** Pass the Access Token credential to the function. */ accessToken?: boolean; + + /** Pass the Refresh Token credential to the function. */ refreshToken?: boolean; /** From 1c35efafc2e85a1da76773f891d9554e92df3659 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 15:20:05 -0700 Subject: [PATCH 458/705] Improve documentation for task queue functions (#1112) * Improve documentation for task queue functions * PR feedback --- src/common/providers/tasks.ts | 11 +++++++-- src/providers/tasks.ts | 46 +++++++++++++++++++++++------------ src/v2/providers/tasks.ts | 33 +++++++++++++++++++++---- 3 files changed, 68 insertions(+), 22 deletions(-) diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts index 9c6ffbc23..d84f7a585 100644 --- a/src/common/providers/tasks.ts +++ b/src/common/providers/tasks.ts @@ -61,13 +61,20 @@ export interface RetryConfig { /** How congestion control should be applied to the function. */ export interface RateLimits { - // If left unspecified, wild default to 1000 + /** + * The maximum number of requests that can be outstanding at a time. + * If left unspecified, will default to 1000. + */ maxConcurrentDispatches?: number; - // If left unspecified, will default to 500 + /** + * The maximum number of requests that can be invoked per second. + * If left unspecified, will default to 500. + */ maxDispatchesPerSecond?: number; } +/** Metadata about the authorization used to invoke a function. */ export interface AuthData { uid: string; token: firebase.auth.DecodedIdToken; diff --git a/src/providers/tasks.ts b/src/providers/tasks.ts index 64acc240f..f06e7b92e 100644 --- a/src/providers/tasks.ts +++ b/src/providers/tasks.ts @@ -38,44 +38,55 @@ import { import { DeploymentOptions } from '../function-configuration'; import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest'; -export { - /** @hidden */ - RetryConfig as RetryPolicy, - /** @hidden */ - RateLimits, - /** @hidden */ - TaskContext, -}; +export { RetryConfig, RateLimits, TaskContext }; /** - * Configurations for Task Queue Functions. - * @hidden + * Options for configuring the task queue to listen to. */ export interface TaskQueueOptions { + /** How a task should be retried in the event of a non-2xx return. */ retryConfig?: RetryConfig; + /** How congestion control should be applied to the function. */ rateLimits?: RateLimits; /** * Who can enqueue tasks for this function. * If left unspecified, only service accounts which have - * roles/cloudtasks.enqueuer and roles/cloudfunctions.invoker + * `roles/cloudtasks.enqueuer` and `roles/cloudfunctions.invoker` * will have permissions. */ invoker?: 'private' | string | string[]; } -/** @hidden */ +/** + * A handler for tasks. + */ export interface TaskQueueFunction { (req: Request, res: express.Response): Promise; + /** @alpha */ __trigger: unknown; + + /** @alpha */ __endpoint: ManifestEndpoint; + + /** @alpha */ __requiredAPIs?: ManifestRequiredAPI[]; + /** + * The callback passed to the `TaskQueueFunction` constructor. + * @param data - The body enqueued into a task queue. + * @param context - The request context of the enqueued task + * @returns Any return value. Google Cloud Functions will await any promise + * before shutting down your function. Resolved return values + * are only used for unit testing purposes. + */ run(data: any, context: TaskContext): void | Promise; } -/** @hidden */ +/** + * Builder for creating a `TaskQueueFunction`. + */ export class TaskQueueBuilder { /** @internal */ constructor( @@ -83,6 +94,11 @@ export class TaskQueueBuilder { private readonly depOpts?: DeploymentOptions ) {} + /** + * Creates a handler for tasks sent to a Google Cloud Tasks queue. + * @param handler - A callback to handle task requests. + * @returns A Cloud Function you can export and deploy. + */ onDispatch( handler: (data: any, context: TaskContext) => void | Promise ): TaskQueueFunction { @@ -137,8 +153,8 @@ export class 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 + * @param options - Configuration for the Task Queue that feeds into this function. + * Omitting options will configure a Task Queue with default settings. */ export function taskQueue(options?: TaskQueueOptions): TaskQueueBuilder { return new TaskQueueBuilder(options); diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index 1c175ead8..753c09010 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -35,7 +35,7 @@ import { import * as options from '../options'; import { HttpsFunction } from './https'; -export { AuthData, RateLimits, Request, RetryConfig as RetryPolicy }; +export { AuthData, RateLimits, Request, RetryConfig }; export interface TaskQueueOptions extends options.EventHandlerOptions { /** How a task should be retried in the event of a non-2xx return. */ @@ -47,7 +47,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { /** * Who can enqueue tasks for this function. * If left unspecified, only service accounts which have - * roles/cloudtasks.enqueuer and roles/cloudfunctions.invoker + * `roles/cloudtasks.enqueuer` and `roles/cloudfunctions.invoker` * will have permissions. */ invoker?: 'private' | string | string[]; @@ -146,15 +146,38 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { retry?: boolean; } +/** + * A handler for tasks. + * @typeParam T - The task data interface. Task data is unmarshaled from JSON. + */ export interface TaskQueueFunction extends HttpsFunction { - run(data: Request): void | Promise; + /** + * The callback passed to the `TaskQueueFunction` constructor. + * @param request - A TaskRequest containing data and auth information. + * @returns Any return value. Google Cloud Functions will await any promise + * before shutting down your function. Resolved return values + * are only used for unit testing purposes. + */ + run(request: Request): void | Promise; } -/** Handle a request sent to a Cloud Tasks queue. */ +/** + * Creates a handler for tasks sent to a Google Cloud Tasks queue. + * @param handler - A callback to handle task requests. + * @typeParam Args - The interface for the request's `data` field. + * @returns A Cloud Function you can export and deploy. + */ export function onTaskDispatched( handler: (request: Request) => void | Promise ): TaskQueueFunction; -/** Handle a request sent to a Cloud Tasks queue. */ + +/** + * Creates a handler for tasks sent to a Google Cloud Tasks queue. + * @param options - Configuration for the task queue or Cloud Function. + * @param handler - A callback to handle task requests. + * @typeParam Args - The interface for the request's `data` field. + * @returns A Cloud Function you can export and deploy. + */ export function onTaskDispatched( options: TaskQueueOptions, handler: (request: Request) => void | Promise From e720145d04fd5a97e97b72f5d00f1a96a11d8496 Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 15:59:33 -0700 Subject: [PATCH 459/705] Add package docs and copyright headers (#1116) * Add package docs and copyright headers * Run formatter * Fix copyright date --- src/bin/firebase-functions.ts | 22 +++++++++++++++ src/common/encoding.ts | 22 +++++++++++++++ src/logger/common.ts | 22 +++++++++++++++ src/logger/compat.ts | 22 +++++++++++++++ src/logger/index.ts | 22 +++++++++++++++ src/v2/core.ts | 5 ++++ src/v2/index.ts | 10 ++++++- src/v2/options.ts | 5 ++++ src/v2/params/index.ts | 27 ++++++++++++++++++- src/v2/params/types.ts | 22 +++++++++++++++ src/v2/providers/alerts/alerts.ts | 22 +++++++++++++++ src/v2/providers/alerts/appDistribution.ts | 27 +++++++++++++++++++ src/v2/providers/alerts/billing.ts | 27 +++++++++++++++++++ src/v2/providers/alerts/crashlytics.ts | 27 +++++++++++++++++++ src/v2/providers/alerts/index.ts | 29 ++++++++++++++++++++ src/v2/providers/https.ts | 5 ++++ src/v2/providers/identity.ts | 27 +++++++++++++++++++ src/v2/providers/pubsub.ts | 31 ++++++++++++++++++++++ src/v2/providers/storage.ts | 7 ++++- src/v2/providers/tasks.ts | 5 ++++ 20 files changed, 383 insertions(+), 3 deletions(-) diff --git a/src/bin/firebase-functions.ts b/src/bin/firebase-functions.ts index 4b4eba900..646433fec 100644 --- a/src/bin/firebase-functions.ts +++ b/src/bin/firebase-functions.ts @@ -1,5 +1,27 @@ #!/usr/bin/env node +// 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. + import * as express from 'express'; import { loadStack } from '../runtime/loader'; diff --git a/src/common/encoding.ts b/src/common/encoding.ts index 8960b5ddc..554c5fcb1 100644 --- a/src/common/encoding.ts +++ b/src/common/encoding.ts @@ -1,3 +1,25 @@ +// 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. + // Copied from firebase-tools/src/gcp/proto /** diff --git a/src/logger/common.ts b/src/logger/common.ts index f7ff0de78..020883bbb 100644 --- a/src/logger/common.ts +++ b/src/logger/common.ts @@ -1,3 +1,25 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + // Determine if structured logs are supported (node >= 10). If something goes wrong, // assume no since unstructured is safer. /** @hidden */ diff --git a/src/logger/compat.ts b/src/logger/compat.ts index 4239221f0..7300a197b 100644 --- a/src/logger/compat.ts +++ b/src/logger/compat.ts @@ -1,3 +1,25 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + import { format } from 'util'; import { CONSOLE_SEVERITY, diff --git a/src/logger/index.ts b/src/logger/index.ts index 9bb43725f..02750f845 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -1,3 +1,25 @@ +// The MIT License (MIT) +// +// Copyright (c) 2017 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. + import { format } from 'util'; import { diff --git a/src/v2/core.ts b/src/v2/core.ts index 533349b55..5e71d2458 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Core functionality of the Firebase Functions v2 SDK. + * @packageDocumentation + */ + import { ManifestEndpoint } from '../runtime/manifest'; /** @internal */ diff --git a/src/v2/index.ts b/src/v2/index.ts index fd89e52fa..d1cf4836a 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -20,6 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * The V2 API for Cloud Functions for Firebase. + * This SDK also supports deep imports. For example, the namespace + * 'pubsub' is available at 'firebase-functions/v2' or is directly importable + * from 'firebase-functions/v2/pubsub'. + * @packageDocumentation + */ + import * as logger from '../logger'; import * as alerts from './providers/alerts'; import * as eventarc from './providers/eventarc'; @@ -29,7 +37,7 @@ import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; -export { alerts, https, identity, pubsub, storage, logger, tasks, eventarc }; +export { alerts, storage, https, identity, pubsub, logger, tasks, eventarc }; export { setGlobalOptions, diff --git a/src/v2/options.ts b/src/v2/options.ts index d8beb1341..c2ebf5248 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Options to configure cloud functions. + * @packageDocumentation + */ + import { convertIfPresent, copyIfPresent, diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index f4ea32b53..bf45e8c45 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -1,4 +1,29 @@ -/** @hidden */ +// 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. + +/** + * @hidden + * @alpha + */ import { BooleanParam, FloatParam, diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index c345cf654..9612dc8dc 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -1,3 +1,25 @@ +// 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. + /** @hidden */ type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 6d4e09d54..4cb0ac2de 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -1,3 +1,25 @@ +// 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. + import { ManifestEndpoint } from '../../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index d26f84044..c3f058cff 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -1,3 +1,30 @@ +// 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. + +/** + * Cloud functions to handle Firebase App Distribution events from Firebase Alerts. + * @packageDocumentation + */ + import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index 8990481cc..4d42af79b 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -1,3 +1,30 @@ +// 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. + +/** + * Cloud functions to handle billing events from Firebase Alerts. + * @packageDocumentation + */ + import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 307dda260..6f814320f 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -1,3 +1,30 @@ +// 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. + +/** + * Cloud functions to handle Crashlytics events from Firebase Alerts. + * @packageDocumentation + */ + import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; diff --git a/src/v2/providers/alerts/index.ts b/src/v2/providers/alerts/index.ts index ecf90a422..d16ef00fe 100644 --- a/src/v2/providers/alerts/index.ts +++ b/src/v2/providers/alerts/index.ts @@ -1,3 +1,32 @@ +// 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. + +/** + * Cloud functions to handle events from Firebase Alerts. + * Subpackages give stronger typing to specific services which + * notify users via Firebase Alerts. + * @packageDocumentation + */ + import * as appDistribution from './appDistribution'; import * as billing from './billing'; import * as crashlytics from './crashlytics'; diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 847d65631..2f22f8d75 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Cloud functions to handle HTTPS request or callable RPCs. + * @packageDocumentation + */ + import * as cors from 'cors'; import * as express from 'express'; import { convertIfPresent, convertInvoker } from '../../common/encoding'; diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index e924b0cd7..b68136d8e 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -1,3 +1,30 @@ +// 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. + +/** + * Cloud functions to handle events from Google Cloud Identity Platform. + * @packageDocumentation + */ + import { BlockingFunction } from '../../cloud-functions'; import { AuthBlockingEvent, diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 09c56d59c..380ed6946 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -1,3 +1,30 @@ +// 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. + +/** + * Cloud functions to handle events from Google Cloud Pub/Sub. + * @packageDocumentation + */ + import { copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; @@ -59,6 +86,10 @@ export class Message { /** @hidden */ private _json: T; + /** + * @hidden + * @alpha + */ constructor(data: any) { this.messageId = data.messageId; this.data = data.data; diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index ec8068119..33281abd1 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -1,6 +1,6 @@ // The MIT License (MIT) // -// Copyright (c) 2017 Firebase +// 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 @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Cloud functions to handle events from Google Cloud Storage. + * @packageDocumentation + */ + import { copyIfPresent } from '../../common/encoding'; import { firebaseConfig } from '../../config'; import { ManifestEndpoint } from '../../runtime/manifest'; diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index 753c09010..df3b9b8c2 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -20,6 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/** + * Cloud functions to handle Tasks enqueued with Google Cloud Tasks. + * @packageDocumentation + */ + import { convertIfPresent, convertInvoker, From 5fda331792e60722813e0387a81386e0253aa8a5 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 11 May 2022 08:20:57 +0900 Subject: [PATCH 460/705] Add debug feature to always enable cors for emulated v2 https functions (#1099) * Add debug feature to always enable cors. * Add test cases. * Fix tests. * Add changelog. * Format. * Fix typo. Co-authored-by: Thomas Bouldin --- CHANGELOG.md | 1 + spec/v2/providers/https.spec.ts | 76 ++++++++++++++++++++++++++++++++- src/common/debug.ts | 1 + src/v2/providers/https.ts | 12 ++++-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..ef9fc2ff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Add debug feature to enable cors option for v2 onRequest and onCall handlers. (#1099) diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 345bd8965..6e2be1a23 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -20,8 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import * as sinon from 'sinon'; import { expect } from 'chai'; +import * as debug from '../../../src/common/debug'; import * as options from '../../../src/v2/options'; import * as https from '../../../src/v2/providers/https'; import { @@ -166,7 +168,7 @@ describe('onRequest', () => { { 'Access-Control-Request-Method': 'POST', 'Access-Control-Request-Headers': 'origin', - Origin: 'example.com', + origin: 'example.com', } ); req.method = 'OPTIONS'; @@ -181,6 +183,41 @@ describe('onRequest', () => { Vary: 'Origin, Access-Control-Request-Headers', }); }); + + it('should add CORS headers if debug feature is enabled', async () => { + sinon + .stub(debug, 'isDebugFeatureEnabled') + .withArgs('enableCors') + .returns(true); + + const func = https.onRequest((req, res) => { + throw new Error('Should not reach here for OPTIONS preflight'); + }); + + const req = new MockRequest( + { + data: {}, + }, + { + 'Access-Control-Request-Method': 'POST', + 'Access-Control-Request-Headers': 'origin', + origin: 'localhost', + } + ); + req.method = 'OPTIONS'; + + const resp = await runHandler(func, req as any); + expect(resp.status).to.equal(204); + expect(resp.body).to.be.undefined; + expect(resp.headers).to.deep.equal({ + 'Access-Control-Allow-Methods': 'GET,HEAD,PUT,PATCH,POST,DELETE', + 'Access-Control-Allow-Origin': 'localhost', + 'Content-Length': '0', + Vary: 'Origin, Access-Control-Request-Headers', + }); + + sinon.restore(); + }); }); describe('onCall', () => { @@ -317,7 +354,7 @@ describe('onCall', () => { { 'Access-Control-Request-Method': 'POST', 'Access-Control-Request-Headers': 'origin', - Origin: 'example.com', + origin: 'example.com', } ); req.method = 'OPTIONS'; @@ -333,6 +370,41 @@ describe('onCall', () => { }); }); + it('overrides CORS headers if debug feature is enabled', async () => { + sinon + .stub(debug, 'isDebugFeatureEnabled') + .withArgs('enableCors') + .returns(true); + + const func = https.onCall({ cors: 'example.com' }, (request) => { + throw new Error('Should not reach here for OPTIONS preflight'); + }); + const req = new MockRequest( + { + data: {}, + }, + { + 'Access-Control-Request-Method': 'POST', + 'Access-Control-Request-Headers': 'origin', + origin: 'localhost', + } + ); + req.method = 'OPTIONS'; + + const response = await runHandler(func, req as any); + + expect(response.status).to.equal(204); + expect(response.body).to.be.undefined; + expect(response.headers).to.deep.equal({ + 'Access-Control-Allow-Methods': 'POST', + 'Access-Control-Allow-Origin': 'localhost', + 'Content-Length': '0', + Vary: 'Origin, Access-Control-Request-Headers', + }); + + sinon.restore(); + }); + it('adds CORS headers', async () => { const func = https.onCall((request) => 42); const req = new MockRequest( diff --git a/src/common/debug.ts b/src/common/debug.ts index 4e2fd2a8c..55221c9e8 100644 --- a/src/common/debug.ts +++ b/src/common/debug.ts @@ -25,6 +25,7 @@ const debugMode = process.env.FIREBASE_DEBUG_MODE === 'true'; interface DebugFeatures { skipTokenVerification?: boolean; + enableCors?: boolean; } function loadDebugFeatures(): DebugFeatures { diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 2f22f8d75..980edded1 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -39,6 +39,7 @@ import { import { ManifestEndpoint } from '../../runtime/manifest'; import * as options from '../options'; import { GlobalOptions, SupportedRegion } from '../options'; +import { isDebugFeatureEnabled } from '../../common/debug'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; @@ -218,12 +219,13 @@ export function onRequest( opts = optsOrHandler as HttpsOptions; } - if ('cors' in opts) { + if (isDebugFeatureEnabled('enableCors') || 'cors' in opts) { + const origin = isDebugFeatureEnabled('enableCors') ? true : opts.cors; const userProvidedHandler = handler; handler = (req: Request, res: express.Response): void | Promise => { return new Promise((resolve) => { res.on('finish', resolve); - cors({ origin: opts.cors })(req, res, () => { + cors({ origin })(req, res, () => { resolve(userProvidedHandler(req, res)); }); }); @@ -319,7 +321,11 @@ export function onCall>( opts = optsOrHandler as HttpsOptions; } - const origin = 'cors' in opts ? opts.cors : true; + const origin = 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. From 341ff0d2a488de1c684b1e660871062fd2bbee4a Mon Sep 17 00:00:00 2001 From: egilmorez Date: Tue, 10 May 2022 17:11:40 -0700 Subject: [PATCH 461/705] Adding new TOC entries. (#1122) * half-hearted attempt at rushstack - much work to be done * Update deps, remove generated files. * Pretty * Adding tasks entries to TOC source. * Fixing per feedback and removing package-lock file (I hope). * Resolving package lock file. * Restore package-lock.json * Run formatter * Adding entries, possibly all of them now. * Adding fixes from linter. * Fixing typo. * Run formatter Co-authored-by: Michael Bleigh Co-authored-by: Daniel Young Lee Co-authored-by: Thomas Bouldin --- docgen/content-sources/v1/toc.yaml | 27 +++++++++++++++++++++++++++ spec/v2/providers/https.spec.ts | 2 +- src/v2/providers/https.ts | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/docgen/content-sources/v1/toc.yaml b/docgen/content-sources/v1/toc.yaml index c4091f15d..f6bb5ce0a 100644 --- a/docgen/content-sources/v1/toc.yaml +++ b/docgen/content-sources/v1/toc.yaml @@ -14,6 +14,8 @@ toc: path: /docs/reference/functions/cloud_functions.change.html - title: 'ChangeJson' path: /docs/reference/functions/cloud_functions.changejson.html + - title: 'BlockingFunction' + path: /docs/reference/functions/cloud_functions.blockingfunction.html - title: 'functions.config' path: /docs/reference/functions/config.html @@ -124,6 +126,8 @@ toc: path: /docs/reference/functions/providers_remoteconfig.remoteconfiguser.html - title: 'TemplateVersion' path: /docs/reference/functions/providers_remoteconfig.templateversion.html + - title: 'UpdateBuilder' + path: /docs/reference/functions/providers_remoteconfig.updatebuilder.html - title: 'functions.storage' path: /docs/reference/functions/providers_storage.html @@ -135,6 +139,24 @@ toc: - title: 'ObjectMetadata' path: /docs/reference/functions/providers_storage.objectmetadata.html + - title: 'functions.tasks' + path: /docs/reference/functions/providers_tasks.html + section: + - title: AuthData + path: /docs/reference/functions/common_providers_tasks.authdata.html + - title: RateLimits + path: /docs/reference/functions/common_providers_tasks.ratelimits.html + - title: RetryConfig + path: /docs/reference/functions/common_providers_tasks.retryconfig.html + - title: TaskContext + path: /docs/reference/functions/common_providers_tasks.taskcontext.html + - title: TaskQueueBuilder + path: /docs/reference/functions/providers_tasks.taskqueuebuilder.html + - title: TaskQueueFunction + path: /docs/reference/functions/providers_tasks.taskqueuefunction.html + - title: TaskQueueOptions + path: /docs/reference/functions/providers_tasks.taskqueueoptions.html + - title: 'functions.testLab' path: /docs/reference/functions/providers_testlab.html section: @@ -152,3 +174,8 @@ toc: section: - title: 'HandlerBuilder' path: /docs/reference/functions/handler_builder.handlerbuilder.html + + - heading: Test SDK for Cloud Functions for Firebase + - title: firebase-functions-test + section: + - include: /docs/reference/functions/test/_toc.yaml diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts index 6e2be1a23..65e573849 100644 --- a/spec/v2/providers/https.spec.ts +++ b/spec/v2/providers/https.spec.ts @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as sinon from 'sinon'; import { expect } from 'chai'; +import * as sinon from 'sinon'; import * as debug from '../../../src/common/debug'; import * as options from '../../../src/v2/options'; diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index 980edded1..dad7355cd 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -29,6 +29,7 @@ import * as cors from 'cors'; import * as express from 'express'; import { convertIfPresent, convertInvoker } from '../../common/encoding'; +import { isDebugFeatureEnabled } from '../../common/debug'; import { CallableRequest, FunctionsErrorCode, @@ -39,7 +40,6 @@ import { import { ManifestEndpoint } from '../../runtime/manifest'; import * as options from '../options'; import { GlobalOptions, SupportedRegion } from '../options'; -import { isDebugFeatureEnabled } from '../../common/debug'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; From 39ee2de401b665e9850024f031054c64db765fdb Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Tue, 10 May 2022 17:27:23 -0700 Subject: [PATCH 462/705] Make private APIs hidden (#1123) --- src/providers/auth.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/providers/auth.ts b/src/providers/auth.ts index fec895e89..f845424ea 100644 --- a/src/providers/auth.ts +++ b/src/providers/auth.ts @@ -161,6 +161,7 @@ export class UserBuilder { return this.beforeOperation(handler, 'beforeSignIn'); } + /** @hidden */ private onOperation( handler: ( user: UserRecord, @@ -180,6 +181,7 @@ export class UserBuilder { }); } + /** @hidden */ private beforeOperation( handler: ( user: AuthUserRecord, From 4efd0b06ea98aa13bca80f323066620eabf67bac Mon Sep 17 00:00:00 2001 From: Thomas Bouldin Date: Wed, 11 May 2022 07:29:59 -0700 Subject: [PATCH 463/705] Temporarily remove docs for fireabse-functions-test (#1124) --- docgen/content-sources/v1/toc.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docgen/content-sources/v1/toc.yaml b/docgen/content-sources/v1/toc.yaml index f6bb5ce0a..59e380458 100644 --- a/docgen/content-sources/v1/toc.yaml +++ b/docgen/content-sources/v1/toc.yaml @@ -174,8 +174,3 @@ toc: section: - title: 'HandlerBuilder' path: /docs/reference/functions/handler_builder.handlerbuilder.html - - - heading: Test SDK for Cloud Functions for Firebase - - title: firebase-functions-test - section: - - include: /docs/reference/functions/test/_toc.yaml From 715bdfe87ffbf3e93ca7d682eadc88c352a0453e Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 May 2022 21:39:20 +0000 Subject: [PATCH 464/705] 3.21.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e2500d647..832969104 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.0", + "version": "3.21.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index aca2baeba..236bc4a22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.0", + "version": "3.21.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 27a49837ea7b74d9d2926e74c387f45704d57889 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 11 May 2022 21:39:24 +0000 Subject: [PATCH 465/705] [firebase-release] Removed change log and reset repo after 3.21.1 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef9fc2ff8..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Add debug feature to enable cors option for v2 onRequest and onCall handlers. (#1099) From cb90fab75b312b19a10f19a56feb5e42fef5e795 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Mon, 16 May 2022 11:52:42 -0400 Subject: [PATCH 466/705] Fix common identity package internal toJSON function (#1125) * fixing the toJSON function * fix nit * adding changelog --- CHANGELOG.md | 1 + spec/common/providers/identity.spec.ts | 28 ++++++++++++++++++++++++++ src/common/providers/identity.ts | 6 +++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..50a3a0093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fixes bug where `toJSON` was not defined in `UserRecord` (#1125). diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts index 046ffa8b3..592d14767 100644 --- a/spec/common/providers/identity.spec.ts +++ b/spec/common/providers/identity.spec.ts @@ -88,6 +88,34 @@ describe('identity', () => { lastSignInTime: '2017-02-02T23:01:19.797Z', }); }); + + it('should stringify the record', () => { + const raw: any = { + uid: '123', + email: 'email@gmail.com', + emailVerified: true, + displayName: 'User', + photoURL: 'url', + phoneNumber: '1233332222', + disabled: true, + providerData: ['something'], + customClaims: { + claim: 'value', + another: { + inner: 'value', + }, + }, + passwordSalt: 'abc', + passwordHash: 'def', + tokensValidAfterTime: '2027-02-02T23:01:19.797Z', + metadata: { + creationTime: '2017-02-02T23:06:26.124Z', + lastSignInTime: '2017-02-02T23:01:19.797Z', + }, + }; + const record = identity.userRecordConstructor(raw); + expect(() => JSON.stringify(record)).to.not.throw; + }); }); describe('isValidRequest', () => { diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 08658c48d..948c73ce9 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -146,7 +146,11 @@ export function userRecordConstructor(wireData: Object): UserRecord { }; json.metadata = record.metadata.toJSON(); json.customClaims = JSON.parse(JSON.stringify(record.customClaims)); - json.providerData = record.providerData.map((entry) => entry.toJSON()); + json.providerData = record.providerData.map((entry) => { + const newEntry = { ...entry }; + newEntry.toJSON = () => entry; + return newEntry; + }); return json; }; return record as UserRecord; From 301720f2c5f47ec2340369a8735fb5bf5bee3b67 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 17 May 2022 18:40:03 +0000 Subject: [PATCH 467/705] 3.21.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 832969104..c11eebe69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.1", + "version": "3.21.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 236bc4a22..026c79db3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.1", + "version": "3.21.2", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 40f0b4331517755fcd0a906d9e5361ad7305aa05 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Tue, 17 May 2022 18:40:06 +0000 Subject: [PATCH 468/705] [firebase-release] Removed change log and reset repo after 3.21.2 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50a3a0093..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Fixes bug where `toJSON` was not defined in `UserRecord` (#1125). From e42fe3aecf091d4e31efae1ab3a3a9b28d05ecd5 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 9 Jun 2022 13:53:41 -0400 Subject: [PATCH 469/705] Adds RTDB triggers for v2 functions (#1127) * moving DataSnapshot to common, removing lodash, and adding in initial v2 interface and logic * fixing tests * normalize path & remove commented structure * changing default rtdb url * defualt to * instances and export everything correctly * linter * fixed parsing for multi segments and adding in tests * update tsdoc comments and add changelog * fixing export path * cleaning up params code * ref is always a path pattern * addressing comments and creating path pattern class * linter * adding describe block * adding in changes from @rhodgkins to match the admin SDK * linter --- CHANGELOG.md | 1 + package.json | 6 +- spec/utilities/path-pattern.spec.ts | 145 +++++++ spec/v1/providers/database.spec.ts | 143 ++++++- spec/v2/providers/database.spec.ts | 569 ++++++++++++++++++++++++++++ src/common/providers/database.ts | 338 +++++++++++++++++ src/providers/database.ts | 296 +-------------- src/utilities/path-pattern.ts | 173 +++++++++ src/v2/index.ts | 13 +- src/v2/providers/database.ts | 409 ++++++++++++++++++++ v2/database.js | 26 ++ 11 files changed, 1816 insertions(+), 303 deletions(-) create mode 100644 spec/utilities/path-pattern.spec.ts create mode 100644 spec/v2/providers/database.spec.ts create mode 100644 src/common/providers/database.ts create mode 100644 src/utilities/path-pattern.ts create mode 100644 src/v2/providers/database.ts create mode 100644 v2/database.js diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..b174a17fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Adds RTDB Triggers for v2 functions (#1127) diff --git a/package.json b/package.json index 026c79db3..03f56c851 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,8 @@ "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js", "./v2/eventarc": "./lib/v2/providers/eventarc.js", - "./v2/identity": "./lib/v2/providers/identity.js" + "./v2/identity": "./lib/v2/providers/identity.js", + "./v2/database": "./lib/v2/providers/database.js" }, "typesVersions": { "*": { @@ -126,6 +127,9 @@ "v2/base": [ "lib/v2/base" ], + "v2/database": [ + "lib/v2/providers/database" + ], "v2/eventarc": [ "lib/v2/providers/eventarc" ], diff --git a/spec/utilities/path-pattern.spec.ts b/spec/utilities/path-pattern.spec.ts new file mode 100644 index 000000000..8fe513284 --- /dev/null +++ b/spec/utilities/path-pattern.spec.ts @@ -0,0 +1,145 @@ +// 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. +import { expect } from 'chai'; +import * as pathPattern from '../../src/utilities/path-pattern'; + +describe('path-pattern', () => { + describe('trimParam', () => { + it('should trim a capture param without equals', () => { + expect(pathPattern.trimParam('{something}')).to.equal('something'); + }); + + it('should trim a capture param with equals', () => { + expect(pathPattern.trimParam('{something=*}')).to.equal('something'); + }); + }); + + describe('extractMatches', () => { + it('should parse without multi segment', () => { + const pp = new pathPattern.PathPattern('{a}/something/else/{b}/end/{c}'); + + expect( + pp.extractMatches('match_a/something/else/match_b/end/match_c') + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + c: 'match_c', + }); + }); + + it('should parse multi segment with params after', () => { + const pp = new pathPattern.PathPattern( + 'something/**/else/{a}/hello/{b}/world' + ); + + expect( + pp.extractMatches('something/is/a/thing/else/nothing/hello/user/world') + ).to.deep.equal({ + a: 'nothing', + b: 'user', + }); + }); + + it('should parse multi segment param with params after', () => { + const pp = new pathPattern.PathPattern( + 'something/{path=**}/else/{a}/hello/{b}/world' + ); + + expect( + pp.extractMatches('something/is/a/thing/else/nothing/hello/user/world') + ).to.deep.equal({ + path: 'is/a/thing', + a: 'nothing', + b: 'user', + }); + }); + + it('should parse multi segment with params before', () => { + const pp = new pathPattern.PathPattern('{a}/something/{b}/**/end'); + + expect( + pp.extractMatches( + 'match_a/something/match_b/thing/else/nothing/hello/user/end' + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + }); + }); + + it('should parse multi segment param with params before', () => { + const pp = new pathPattern.PathPattern('{a}/something/{b}/{path=**}/end'); + + expect( + pp.extractMatches( + 'match_a/something/match_b/thing/else/nothing/hello/user/end' + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + path: 'thing/else/nothing/hello/user', + }); + }); + + it('should parse multi segment with params before and after', () => { + const pp = new pathPattern.PathPattern('{a}/something/**/{b}/end'); + + expect( + pp.extractMatches( + 'match_a/something/thing/else/nothing/hello/user/match_b/end' + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + }); + }); + + it('should parse multi segment param with params before', () => { + const pp = new pathPattern.PathPattern('{a}/something/{path=**}/{b}/end'); + + expect( + pp.extractMatches( + 'match_a/something/thing/else/nothing/hello/user/match_b/end' + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + path: 'thing/else/nothing/hello/user', + }); + }); + + // handle an instance param + it('should parse an instance', () => { + const pp = new pathPattern.PathPattern('{a}-something-{b}-else-{c}'); + + expect( + pp.extractMatches('match_a-something-match_b-else-match_c') + ).to.deep.equal({}); + + const anotherPP = new pathPattern.PathPattern('{a}'); + + expect(anotherPP.extractMatches('match_a')).to.deep.equal({ + a: 'match_a', + }); + }); + }); +}); diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index 304c1d1fd..30d24ea3c 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -639,10 +639,6 @@ describe('Database Functions', () => { expect(subject.val()).to.equal(0); populate({ myKey: 0 }); expect(subject.val()).to.deep.equal({ myKey: 0 }); - - // Null values are still reported as null. - populate({ myKey: null }); - expect(subject.val()).to.deep.equal({ myKey: null }); }); // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995) @@ -650,6 +646,45 @@ describe('Database Functions', () => { populate({ length: 3, foo: 'bar' }); expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar' }); }); + + it('should deal with null-values appropriately', () => { + populate(null); + expect(subject.val()).to.be.null; + + populate({ myKey: null }); + expect(subject.val()).to.be.null; + }); + + it('should deal with empty object values appropriately', () => { + populate({}); + expect(subject.val()).to.be.null; + + populate({ myKey: {} }); + expect(subject.val()).to.be.null; + + populate({ myKey: { child: null } }); + expect(subject.val()).to.be.null; + }); + + it('should deal with empty array values appropriately', () => { + populate([]); + expect(subject.val()).to.be.null; + + populate({ myKey: [] }); + expect(subject.val()).to.be.null; + + populate({ myKey: [null] }); + expect(subject.val()).to.be.null; + + populate({ myKey: [{}] }); + expect(subject.val()).to.be.null; + + populate({ myKey: [{ myKey: null }] }); + expect(subject.val()).to.be.null; + + populate({ myKey: [{ myKey: {} }] }); + expect(subject.val()).to.be.null; + }); }); describe('#child(): DataSnapshot', () => { @@ -676,14 +711,37 @@ describe('Database Functions', () => { }); it('should be false for a non-existent value', () => { - populate({ a: { b: 'c' } }); + populate({ a: { b: 'c', nullChild: null } }); expect(subject.child('d').exists()).to.be.false; + expect(subject.child('nullChild').exists()).to.be.false; }); it('should be false for a value pathed beyond a leaf', () => { populate({ a: { b: 'c' } }); expect(subject.child('a/b/c').exists()).to.be.false; }); + + it('should be false for an empty object value', () => { + populate({ a: {} }); + expect(subject.child('a').exists()).to.be.false; + + populate({ a: { child: null } }); + expect(subject.child('a').exists()).to.be.false; + + populate({ a: { child: {} } }); + expect(subject.child('a').exists()).to.be.false; + }); + + it('should be false for an empty array value', () => { + populate({ a: [] }); + expect(subject.child('a').exists()).to.be.false; + + populate({ a: [null] }); + expect(subject.child('a').exists()).to.be.false; + + populate({ a: [{}] }); + expect(subject.child('a').exists()).to.be.false; + }); }); describe('#forEach(action: (a: DataSnapshot) => boolean): boolean', () => { @@ -712,6 +770,17 @@ describe('Database Functions', () => { expect(subject.forEach(counter)).to.equal(false); expect(count).to.eq(0); + + populate({ + a: 'foo', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); + count = 0; + + expect(subject.forEach(counter)).to.equal(false); + expect(count).to.eq(1); }); it('should cancel further enumeration if callback returns true', () => { @@ -751,13 +820,51 @@ describe('Database Functions', () => { describe('#numChildren()', () => { it('should be key count for objects', () => { - populate({ a: 'b', c: 'd' }); + populate({ + a: 'b', + c: 'd', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); expect(subject.numChildren()).to.eq(2); }); it('should be 0 for non-objects', () => { populate(23); expect(subject.numChildren()).to.eq(0); + + populate({ + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); + expect(subject.numChildren()).to.eq(0); + }); + }); + + describe('#hasChildren()', () => { + it('should true for objects', () => { + populate({ + a: 'b', + c: 'd', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); + expect(subject.hasChildren()).to.be.true; + }); + + it('should be false for non-objects', () => { + populate(23); + expect(subject.hasChildren()).to.be.false; + + populate({ + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); + expect(subject.hasChildren()).to.be.false; }); }); @@ -769,9 +876,17 @@ describe('Database Functions', () => { }); it('should return false if a child is missing', () => { - populate({ a: 'b' }); + populate({ + a: 'b', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); expect(subject.hasChild('c')).to.be.false; expect(subject.hasChild('a/b')).to.be.false; + expect(subject.hasChild('nullChild')).to.be.false; + expect(subject.hasChild('emptyObjectChild')).to.be.false; + expect(subject.hasChild('emptyArrayChild')).to.be.false; }); }); @@ -801,11 +916,21 @@ describe('Database Functions', () => { describe('#toJSON(): Object', () => { it('should return the current value', () => { - populate({ a: 'b' }); + populate({ + a: 'b', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); expect(subject.toJSON()).to.deep.equal(subject.val()); }); it('should be stringifyable', () => { - populate({ a: 'b' }); + populate({ + a: 'b', + nullChild: null, + emptyObjectChild: {}, + emptyArrayChild: [], + }); expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}'); }); }); diff --git a/spec/v2/providers/database.spec.ts b/spec/v2/providers/database.spec.ts new file mode 100644 index 000000000..58d4285ab --- /dev/null +++ b/spec/v2/providers/database.spec.ts @@ -0,0 +1,569 @@ +// 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. + +import { expect } from 'chai'; +import { PathPattern } from '../../../src/utilities/path-pattern'; +import * as database from '../../../src/v2/providers/database'; + +const RAW_RTDB_EVENT: database.RawRTDBCloudEvent = { + data: { + ['@type']: + 'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData', + data: {}, + delta: {}, + }, + firebasedatabasehost: 'firebaseio.com', + instance: 'my-instance', + ref: 'foo/bar', + location: 'us-central1', + id: 'id', + source: 'source', + specversion: '1.0', + time: 'time', + type: 'type', +}; + +describe('database', () => { + describe('makeParams', () => { + it('should make params with basic path', () => { + const event: database.RawRTDBCloudEvent = { + ...RAW_RTDB_EVENT, + ref: 'match_a/something/else/nothing/end/match_b', + }; + + expect( + database.makeParams( + event, + new PathPattern('{a}/something/else/*/end/{b}'), + new PathPattern('*') + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + }); + }); + + it('should make params with multi segment path', () => { + const event: database.RawRTDBCloudEvent = { + ...RAW_RTDB_EVENT, + ref: 'something/is/a/thing/else/match_a/hello/match_b/world', + }; + + expect( + database.makeParams( + event, + new PathPattern('something/**/else/{a}/hello/{b}/world'), + new PathPattern('*') + ) + ).to.deep.equal({ + a: 'match_a', + b: 'match_b', + }); + }); + + it('should make params with multi segment path capture', () => { + const event: database.RawRTDBCloudEvent = { + ...RAW_RTDB_EVENT, + ref: 'something/is/a/thing/else/match_a/hello/match_b/world', + }; + + expect( + database.makeParams( + event, + new PathPattern('something/{path=**}/else/{a}/hello/{b}/world'), + new PathPattern('*') + ) + ).to.deep.equal({ + path: 'is/a/thing', + a: 'match_a', + b: 'match_b', + }); + }); + + it('should make params for a full path and instance', () => { + const event: database.RawRTDBCloudEvent = { + ...RAW_RTDB_EVENT, + ref: 'something/is/a/thing/else/match_a/hello/match_b/world', + }; + + expect( + database.makeParams( + event, + new PathPattern('something/{path=**}/else/{a}/hello/{b}/world'), + new PathPattern('{inst}') + ) + ).to.deep.equal({ + path: 'is/a/thing', + a: 'match_a', + b: 'match_b', + inst: 'my-instance', + }); + }); + }); + + describe('getOpts', () => { + it('should return opts when passed in a path', () => { + expect(database.getOpts('/foo/{bar}/')).to.deep.equal({ + path: 'foo/{bar}', + instance: '*', + opts: {}, + }); + }); + + it('should return opts when passed in an options object', () => { + expect( + database.getOpts({ + ref: '/foo/{bar}/', + instance: '{inst}', + region: 'us-central1', + }) + ).to.deep.equal({ + path: 'foo/{bar}', + instance: '{inst}', + opts: { + region: 'us-central1', + }, + }); + }); + }); + + describe('makeEndpoint', () => { + it('should create an endpoint with an instance wildcard', () => { + const ep = database.makeEndpoint( + database.writtenEventType, + { + region: 'us-central1', + labels: { 1: '2' }, + }, + new PathPattern('foo/bar'), + new PathPattern('{inst}') + ); + + expect(ep).to.deep.equal({ + platform: 'gcfv2', + labels: { + 1: '2', + }, + region: ['us-central1'], + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/bar', + instance: '{inst}', + }, + retry: false, + }, + }); + }); + + it('should create an endpoint without an instance wildcard', () => { + const ep = database.makeEndpoint( + database.writtenEventType, + { + region: 'us-central1', + labels: { 1: '2' }, + }, + new PathPattern('foo/bar'), + new PathPattern('my-instance') + ); + + expect(ep).to.deep.equal({ + platform: 'gcfv2', + labels: { + 1: '2', + }, + region: ['us-central1'], + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/bar', + }, + retry: false, + }, + }); + }); + }); + + describe('onChangedOperation', () => { + it('should create a function for a written event', () => { + const func = database.onChangedOperation( + database.writtenEventType, + '/foo/{bar}/', + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function for a updated event', () => { + const func = database.onChangedOperation( + database.updatedEventType, + '/foo/{bar}/', + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.updatedEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a complex function', () => { + const func = database.onChangedOperation( + database.writtenEventType, + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); + + describe('onOperation', () => { + it('should create a function for a created event', () => { + const func = database.onOperation( + database.createdEventType, + '/foo/{bar}/', + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.createdEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function for a deleted event', () => { + const func = database.onOperation( + database.deletedEventType, + '/foo/{bar}/', + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.deletedEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a complex function', () => { + const func = database.onOperation( + database.createdEventType, + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.createdEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); + + describe('onRefWritten', () => { + it('should create a function with a reference', () => { + const func = database.onRefWritten('/foo/{bar}/', (event) => 2); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = database.onRefWritten( + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.writtenEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); + + describe('onRefCreated', () => { + it('should create a function with a reference', () => { + const func = database.onRefCreated('/foo/{bar}/', (event) => 2); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.createdEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = database.onRefCreated( + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.createdEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); + + describe('onRefUpdated', () => { + it('should create a function with a reference', () => { + const func = database.onRefUpdated('/foo/{bar}/', (event) => 2); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.updatedEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = database.onRefUpdated( + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.updatedEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); + + describe('onRefDeleted', () => { + it('should create a function with a reference', () => { + const func = database.onRefDeleted('/foo/{bar}/', (event) => 2); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: database.deletedEventType, + eventFilters: {}, + eventFilterPathPatterns: { + ref: 'foo/{bar}', + instance: '*', + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = database.onRefDeleted( + { + ref: '/foo/{path=**}/{bar}/', + instance: 'my-instance', + region: 'us-central1', + cpu: 'gcf_gen1', + minInstances: 2, + }, + (event) => 2 + ); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + cpu: 'gcf_gen1', + minInstances: 2, + region: ['us-central1'], + labels: {}, + eventTrigger: { + eventType: database.deletedEventType, + eventFilters: { + instance: 'my-instance', + }, + eventFilterPathPatterns: { + ref: 'foo/{path=**}/{bar}', + }, + retry: false, + }, + }); + }); + }); +}); diff --git a/src/common/providers/database.ts b/src/common/providers/database.ts new file mode 100644 index 000000000..f14ce8b1d --- /dev/null +++ b/src/common/providers/database.ts @@ -0,0 +1,338 @@ +// 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. + +import * as firebase from 'firebase-admin'; +import { firebaseConfig } from '../../config'; +import { joinPath, pathParts } from '../../utilities/path'; + +/** + * Interface representing a Firebase Realtime database data snapshot. + */ +export class DataSnapshot implements firebase.database.DataSnapshot { + public instance: string; + + /** @hidden */ + private _ref: firebase.database.Reference; + + /** @hidden */ + private _path: string; + + /** @hidden */ + private _data: any; + + /** @hidden */ + private _childPath: string; + + constructor( + data: any, + path?: string, // path is undefined for the database root + private app?: firebase.app.App, + instance?: string + ) { + const config = firebaseConfig(); + if (app?.options?.databaseURL?.startsWith('http:')) { + // In this case we're dealing with an emulator + this.instance = app.options.databaseURL; + } else if (instance) { + // SDK always supplies instance, but user's unit tests may not + this.instance = instance; + } else if (app) { + this.instance = app.options.databaseURL; + } else if (config.databaseURL) { + this.instance = config.databaseURL; + } else if (process.env.GCLOUD_PROJECT) { + this.instance = + 'https://' + + process.env.GCLOUD_PROJECT + + '-default-rtdb.firebaseio.com'; + } + + this._path = path; + this._data = data; + } + + /** + * Returns a [`Reference`](/docs/reference/admin/node/admin.database.Reference) + * to the database location where the triggering write occurred. Has + * full read and write access. + */ + get ref(): firebase.database.Reference { + if (!this.app) { + // may be unpopulated in user's unit tests + throw new Error( + 'Please supply a Firebase app in the constructor for DataSnapshot' + + ' in order to use the .ref method.' + ); + } + if (!this._ref) { + this._ref = this.app.database(this.instance).ref(this._fullPath()); + } + return this._ref; + } + + /** + * The key (last part of the path) of the location of this `DataSnapshot`. + * + * The last token in a database location is considered its key. For example, + * "ada" is the key for the `/users/ada/` node. Accessing the key on any + * `DataSnapshot` returns the key for the location that generated it. + * However, accessing the key on the root URL of a database returns `null`. + */ + get key(): string | null { + const segments = pathParts(this._fullPath()); + const last = segments[segments.length - 1]; + return !last || last === '' ? null : last; + } + + /** + * Extracts a JavaScript value from a `DataSnapshot`. + * + * Depending on the data in a `DataSnapshot`, the `val()` method may return a + * scalar type (string, number, or boolean), an array, or an object. It may also + * return `null`, indicating that the `DataSnapshot` is empty (contains no + * data). + * + * @return The snapshot's contents as a JavaScript value (Object, + * Array, string, number, boolean, or `null`). + */ + val(): any { + const parts = pathParts(this._childPath); + let source = this._data; + if (parts.length) { + for (const part of parts) { + source = source[part]; + } + } + const node = source ?? null; + + return this._checkAndConvertToArray(node); + } + + /** + * Exports the entire contents of the `DataSnapshot` as a JavaScript object. + * + * @return The contents of the `DataSnapshot` as a JavaScript value + * (Object, Array, string, number, boolean, or `null`). + */ + exportVal(): any { + return this.val(); + } + + /** + * Gets the priority value of the data in this `DataSnapshot`. + * + * As an alternative to using priority, applications can order collections by + * ordinary properties. See [Sorting and filtering + * data](/docs/database/web/lists-of-data#sorting_and_filtering_data). + * + * @return The priority value of the data. + */ + getPriority(): string | number | null { + return 0; + } + + /** + * Returns `true` if this `DataSnapshot` contains any data. It is slightly more + * efficient than using `snapshot.val() !== null`. + * + * @return `true` if this `DataSnapshot` contains any data; otherwise, `false`. + */ + exists(): boolean { + const val = this.val(); + if (!val || val === null) { + return false; + } + if (typeof val === 'object' && Object.keys(val).length === 0) { + return false; + } + return true; + } + + /** + * Gets a `DataSnapshot` for the location at the specified relative path. + * + * The relative path can either be a simple child name (for example, "ada") or + * a deeper slash-separated path (for example, "ada/name/first"). + * + * @param path A relative path from this location to the desired child + * location. + * @return The specified child location. + */ + child(childPath: string): DataSnapshot { + if (!childPath) { + return this; + } + return this._dup(childPath); + } + + /** + * Enumerates the `DataSnapshot`s of the children items. + * + * Because of the way JavaScript objects work, the ordering of data in the + * JavaScript object returned by `val()` is not guaranteed to match the ordering + * on the server nor the ordering of `child_added` events. That is where + * `forEach()` comes in handy. It guarantees the children of a `DataSnapshot` + * can be iterated in their query order. + * + * If no explicit `orderBy*()` method is used, results are returned + * ordered by key (unless priorities are used, in which case, results are + * returned by priority). + * + * @param action A function that is called for each child `DataSnapshot`. + * The callback can return `true` to cancel further enumeration. + * + * @return `true` if enumeration was canceled due to your callback + * returning `true`. + */ + forEach(action: (a: DataSnapshot) => boolean | void): boolean { + const val = this.val() || {}; + if (typeof val === 'object') { + return Object.keys(val).some((key) => action(this.child(key)) === true); + } + return false; + } + + /** + * Returns `true` if the specified child path has (non-`null`) data. + * + * @param path A relative path to the location of a potential child. + * @return `true` if data exists at the specified child path; otherwise, + * `false`. + */ + hasChild(childPath: string): boolean { + return this.child(childPath).exists(); + } + + /** + * Returns whether or not the `DataSnapshot` has any non-`null` child + * properties. + * + * You can use `hasChildren()` to determine if a `DataSnapshot` has any + * children. If it does, you can enumerate them using `forEach()`. If it + * doesn't, then either this snapshot contains a primitive value (which can be + * retrieved with `val()`) or it is empty (in which case, `val()` returns + * `null`). + * + * @return `true` if this snapshot has any children; else `false`. + */ + hasChildren(): boolean { + const val = this.val(); + return ( + val !== null && typeof val === 'object' && Object.keys(val).length > 0 + ); + } + + /** + * Returns the number of child properties of this `DataSnapshot`. + * + * @return Number of child properties of this `DataSnapshot`. + */ + numChildren(): number { + const val = this.val(); + return val !== null && typeof val === 'object' + ? Object.keys(val).length + : 0; + } + + /** + * Returns a JSON-serializable representation of this object. + * + * @return A JSON-serializable representation of this object. + */ + toJSON(): Object { + return this.val(); + } + + /** Recursive function to check if keys are numeric & convert node object to array if they are + * + * @hidden + */ + private _checkAndConvertToArray(node: any): any { + if (node === null || typeof node === 'undefined') { + return null; + } + if (typeof node !== 'object') { + return node; + } + const obj: any = {}; + let numKeys = 0; + let maxKey = 0; + let allIntegerKeys = true; + for (const key in node) { + if (!node.hasOwnProperty(key)) { + continue; + } + const childNode = node[key]; + const v = this._checkAndConvertToArray(childNode); + if (v === null) { + // Empty child node + continue; + } + obj[key] = v; + numKeys++; + const integerRegExp = /^(0|[1-9]\d*)$/; + if (allIntegerKeys && integerRegExp.test(key)) { + maxKey = Math.max(maxKey, Number(key)); + } else { + allIntegerKeys = false; + } + } + + if (numKeys === 0) { + // Empty node + return null; + } + + if (allIntegerKeys && maxKey < 2 * numKeys) { + // convert to array. + const array: any = []; + for (const key of Object.keys(obj)) { + array[key] = obj[key]; + } + + return array; + } + return obj; + } + + /** @hidden */ + private _dup(childPath?: string): DataSnapshot { + const dup = new DataSnapshot( + this._data, + undefined, + this.app, + this.instance + ); + [dup._path, dup._childPath] = [this._path, this._childPath]; + + if (childPath) { + dup._childPath = joinPath(dup._childPath, childPath); + } + + return dup; + } + + /** @hidden */ + private _fullPath(): string { + return (this._path || '') + '/' + (this._childPath || ''); + } +} diff --git a/src/providers/database.ts b/src/providers/database.ts index e5f4d8ed3..5b7dc59f5 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -20,8 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -import * as firebase from 'firebase-admin'; -import * as _ from 'lodash'; import { apps } from '../apps'; import { Change, @@ -30,11 +28,14 @@ import { EventContext, makeCloudFunction, } from '../cloud-functions'; +import { DataSnapshot } from '../common/providers/database'; import { firebaseConfig } from '../config'; import { DeploymentOptions } from '../function-configuration'; -import { joinPath, normalizePath, pathParts } from '../utilities/path'; +import { normalizePath } from '../utilities/path'; import { applyChange } from '../utils'; +export { DataSnapshot }; + /** @hidden */ export const provider = 'google.firebase.database'; /** @hidden */ @@ -345,292 +346,3 @@ export function extractInstanceAndPath( return [dbInstance, path]; } } - -/** - * Interface representing a Firebase Realtime Database data snapshot. - */ -export class DataSnapshot { - public instance: string; - - /** @hidden */ - private _ref: firebase.database.Reference; - - /** @hidden */ - private _path: string; - - /** @hidden */ - private _data: any; - - /** @hidden */ - private _childPath: string; - - constructor( - data: any, - path?: string, // path will be undefined for the database root - private app?: firebase.app.App, - instance?: string - ) { - if (app?.options?.databaseURL?.startsWith('http:')) { - // In this case we're dealing with an emulator - this.instance = app.options.databaseURL; - } else if (instance) { - // SDK always supplies instance, but user's unit tests may not - this.instance = instance; - } else if (app) { - this.instance = app.options.databaseURL; - } else if (process.env.GCLOUD_PROJECT) { - this.instance = - 'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com'; - } - - this._path = path; - this._data = data; - } - - /** - * Returns a [`Reference`](/docs/reference/admin/node/admin.database.Reference) - * to the Database location where the triggering write occurred. Has - * full read and write access. - */ - get ref(): firebase.database.Reference { - if (!this.app) { - // may be unpopulated in user's unit tests - throw new Error( - 'Please supply a Firebase app in the constructor for DataSnapshot' + - ' in order to use the .ref method.' - ); - } - if (!this._ref) { - this._ref = this.app.database(this.instance).ref(this._fullPath()); - } - return this._ref; - } - - /** - * The key (last part of the path) of the location of this `DataSnapshot`. - * - * The last token in a Database location is considered its key. For example, - * "ada" is the key for the `/users/ada/` node. Accessing the key on any - * `DataSnapshot` will return the key for the location that generated it. - * However, accessing the key on the root URL of a Database will return `null`. - */ - get key(): string { - const last = _.last(pathParts(this._fullPath())); - return !last || last === '' ? null : last; - } - - /** - * Extracts a JavaScript value from a `DataSnapshot`. - * - * Depending on the data in a `DataSnapshot`, the `val()` method may return a - * scalar type (string, number, or boolean), an array, or an object. It may also - * return `null`, indicating that the `DataSnapshot` is empty (contains no - * data). - * - * @return The DataSnapshot's contents as a JavaScript value (Object, - * Array, string, number, boolean, or `null`). - */ - val(): any { - const parts = pathParts(this._childPath); - const source = this._data; - const node = _.cloneDeep( - parts.length ? _.get(source, parts, null) : source - ); - return this._checkAndConvertToArray(node); - } - - /** - * Exports the entire contents of the `DataSnapshot` as a JavaScript object. - * - * The `exportVal()` method is similar to `val()`, except priority information - * is included (if available), making it suitable for backing up your data. - * - * @return The contents of the `DataSnapshot` as a JavaScript value - * (Object, Array, string, number, boolean, or `null`). - */ - exportVal(): any { - return this.val(); - } - - /** - * Gets the priority value of the data in this `DataSnapshot`. - * - * As an alternative to using priority, applications can order collections by - * ordinary properties. See [Sorting and filtering - * data](/docs/database/web/lists-of-data#sorting_and_filtering_data). - * - * @return The priority value of the data. - */ - getPriority(): string | number | null { - return 0; - } - - /** - * Returns `true` if this `DataSnapshot` contains any data. It is slightly more - * efficient than using `snapshot.val() !== null`. - * - * @return `true` if this `DataSnapshot` contains any data; otherwise, `false`. - */ - exists(): boolean { - return !_.isNull(this.val()); - } - - /** - * Gets a `DataSnapshot` for the location at the specified relative path. - * - * The relative path can either be a simple child name (for example, "ada") or - * a deeper slash-separated path (for example, "ada/name/first"). - * - * @param path A relative path from this location to the desired child - * location. - * @return The specified child location. - */ - child(childPath: string): DataSnapshot { - if (!childPath) { - return this; - } - return this._dup(childPath); - } - - /** - * Enumerates the `DataSnapshot`s of the children items. - * - * Because of the way JavaScript objects work, the ordering of data in the - * JavaScript object returned by `val()` is not guaranteed to match the ordering - * on the server nor the ordering of `child_added` events. That is where - * `forEach()` comes in handy. It guarantees the children of a `DataSnapshot` - * will be iterated in their query order. - * - * If no explicit `orderBy*()` method is used, results are returned - * ordered by key (unless priorities are used, in which case, results are - * returned by priority). - * - * @param action A function that will be called for each child `DataSnapshot`. - * The callback can return `true` to cancel further enumeration. - * - * @return `true` if enumeration was canceled due to your callback - * returning `true`. - */ - forEach(action: (a: DataSnapshot) => boolean | void): boolean { - const val = this.val(); - if (_.isPlainObject(val)) { - return _.some( - val, - (value, key: string) => action(this.child(key)) === true - ); - } - return false; - } - - /** - * Returns `true` if the specified child path has (non-`null`) data. - * - * @param path A relative path to the location of a potential child. - * @return `true` if data exists at the specified child path; otherwise, - * `false`. - */ - hasChild(childPath: string): boolean { - return this.child(childPath).exists(); - } - - /** - * Returns whether or not the `DataSnapshot` has any non-`null` child - * properties. - * - * You can use `hasChildren()` to determine if a `DataSnapshot` has any - * children. If it does, you can enumerate them using `forEach()`. If it - * doesn't, then either this snapshot contains a primitive value (which can be - * retrieved with `val()`) or it is empty (in which case, `val()` will return - * `null`). - * - * @return `true` if this snapshot has any children; else `false`. - */ - hasChildren(): boolean { - const val = this.val(); - return _.isPlainObject(val) && _.keys(val).length > 0; - } - - /** - * Returns the number of child properties of this `DataSnapshot`. - * - * @return Number of child properties of this `DataSnapshot`. - */ - numChildren(): number { - const val = this.val(); - return _.isPlainObject(val) ? Object.keys(val).length : 0; - } - - /** - * Returns a JSON-serializable representation of this object. - * - * @return A JSON-serializable representation of this object. - */ - toJSON(): Object { - return this.val(); - } - - /** Recursive function to check if keys are numeric & convert node object to array if they are - * - * @hidden - */ - private _checkAndConvertToArray(node: any): any { - if (node === null || typeof node === 'undefined') { - return null; - } - if (typeof node !== 'object') { - return node; - } - const obj: any = {}; - let numKeys = 0; - let maxKey = 0; - let allIntegerKeys = true; - for (const key in node) { - if (!node.hasOwnProperty(key)) { - continue; - } - const childNode = node[key]; - obj[key] = this._checkAndConvertToArray(childNode); - numKeys++; - const integerRegExp = /^(0|[1-9]\d*)$/; - if (allIntegerKeys && integerRegExp.test(key)) { - maxKey = Math.max(maxKey, Number(key)); - } else { - allIntegerKeys = false; - } - } - - if (allIntegerKeys && maxKey < 2 * numKeys) { - // convert to array. - const array: any = []; - _.forOwn(obj, (val, key) => { - array[key] = val; - }); - - return array; - } - return obj; - } - - /** @hidden */ - private _dup(childPath?: string): DataSnapshot { - const dup = new DataSnapshot( - this._data, - undefined, - this.app, - this.instance - ); - [dup._path, dup._childPath] = [this._path, this._childPath]; - - if (childPath) { - dup._childPath = joinPath(dup._childPath, childPath); - } - - return dup; - } - - /** @hidden */ - private _fullPath(): string { - const out = (this._path || '') + '/' + (this._childPath || ''); - return out; - } -} diff --git a/src/utilities/path-pattern.ts b/src/utilities/path-pattern.ts new file mode 100644 index 000000000..dadc96bb1 --- /dev/null +++ b/src/utilities/path-pattern.ts @@ -0,0 +1,173 @@ +// 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. + +import { pathParts } from './path'; + +/** https://cloud.google.com/eventarc/docs/path-patterns */ + +/** @hidden */ +const WILDCARD_CAPTURE_REGEX = new RegExp('{[^/{}]+}', 'g'); + +/** @internal */ +export function trimParam(param: string) { + const paramNoBraces = param.slice(1, -1); + if (paramNoBraces.includes('=')) { + return paramNoBraces.slice(0, paramNoBraces.indexOf('=')); + } + return paramNoBraces; +} + +/** @hidden */ +type SegmentName = 'segment' | 'single-capture' | 'multi-capture'; + +/** @hidden */ +interface PathSegment { + readonly name: SegmentName; + readonly value: string; + readonly trimmed: string; + isSingleSegmentWildcard(): boolean; + isMultiSegmentWildcard(): boolean; +} + +/** @hidden */ +class Segment implements PathSegment { + readonly name = 'segment'; + readonly trimmed: string; + constructor(readonly value: string) { + this.trimmed = value; + } + isSingleSegmentWildcard(): boolean { + return this.value.includes('*') && !this.isMultiSegmentWildcard(); + } + isMultiSegmentWildcard(): boolean { + return this.value.includes('**'); + } +} + +/** @hidden */ +class SingleCaptureSegment implements PathSegment { + readonly name = 'single-capture'; + readonly trimmed: string; + constructor(readonly value: string) { + this.trimmed = trimParam(value); + } + isSingleSegmentWildcard(): boolean { + return true; + } + isMultiSegmentWildcard(): boolean { + return false; + } +} + +/** @hidden */ +class MultiCaptureSegment implements PathSegment { + readonly name = 'multi-capture'; + readonly trimmed: string; + constructor(readonly value: string) { + this.trimmed = trimParam(value); + } + isSingleSegmentWildcard(): boolean { + return false; + } + isMultiSegmentWildcard(): boolean { + return true; + } +} + +/** + * Implements Eventarc's path pattern from the spec https://cloud.google.com/eventarc/docs/path-patterns + * @internal + */ +export class PathPattern { + /** @throws on validation error */ + static compile(rawPath: string) {} + private segments: PathSegment[]; + + constructor(private raw: string) { + this.segments = []; + this.initPathSegments(raw); + } + + getValue(): string { + return this.raw; + } + + // If false, we don't need to use pathPattern as our eventarc match type. + hasWildcards(): boolean { + return this.segments.some( + (segment) => + segment.isSingleSegmentWildcard() || segment.isMultiSegmentWildcard() + ); + } + + hasCaptures(): boolean { + return this.segments.some( + (segment) => + segment.name == 'single-capture' || segment.name === 'multi-capture' + ); + } + + extractMatches(path: string): Record { + const matches: Record = {}; + if (!this.hasCaptures()) { + return matches; + } + const pathSegments = pathParts(path); + let pathNdx = 0; + + for ( + let segmentNdx = 0; + segmentNdx < this.segments.length && pathNdx < pathSegments.length; + segmentNdx++ + ) { + const segment = this.segments[segmentNdx]; + const remainingSegments = this.segments.length - 1 - segmentNdx; + const nextPathNdx = pathSegments.length - remainingSegments; + if (segment.name === 'single-capture') { + matches[segment.trimmed] = pathSegments[pathNdx]; + } else if (segment.name === 'multi-capture') { + matches[segment.trimmed] = pathSegments + .slice(pathNdx, nextPathNdx) + .join('/'); + } + pathNdx = segment.isMultiSegmentWildcard() ? nextPathNdx : pathNdx + 1; + } + + return matches; + } + + private initPathSegments(raw: string) { + const parts = pathParts(raw); + for (const part of parts) { + let segment: PathSegment; + const capture = part.match(WILDCARD_CAPTURE_REGEX); + if (capture && capture.length === 1) { + segment = part.includes('**') + ? new MultiCaptureSegment(part) + : new SingleCaptureSegment(part); + } else { + segment = new Segment(part); + } + this.segments.push(segment); + } + } +} diff --git a/src/v2/index.ts b/src/v2/index.ts index d1cf4836a..d2161ab71 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -30,6 +30,7 @@ import * as logger from '../logger'; import * as alerts from './providers/alerts'; +import * as database from './providers/database'; import * as eventarc from './providers/eventarc'; import * as https from './providers/https'; import * as identity from './providers/identity'; @@ -37,7 +38,17 @@ import * as pubsub from './providers/pubsub'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; -export { alerts, storage, https, identity, pubsub, logger, tasks, eventarc }; +export { + alerts, + database, + storage, + https, + identity, + pubsub, + logger, + tasks, + eventarc, +}; export { setGlobalOptions, diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts new file mode 100644 index 000000000..b0a38c313 --- /dev/null +++ b/src/v2/providers/database.ts @@ -0,0 +1,409 @@ +// 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. + +import { apps } from '../../apps'; +import { Change } from '../../cloud-functions'; +import { DataSnapshot } from '../../common/providers/database'; +import { ManifestEndpoint } from '../../runtime/manifest'; +import { normalizePath } from '../../utilities/path'; +import { PathPattern } from '../../utilities/path-pattern'; +import { applyChange } from '../../utils'; +import { CloudEvent, CloudFunction } from '../core'; +import * as options from '../options'; + +export { DataSnapshot }; + +/** @internal */ +export const writtenEventType = 'google.firebase.database.ref.v1.written'; + +/** @internal */ +export const createdEventType = 'google.firebase.database.ref.v1.created'; + +/** @internal */ +export const updatedEventType = 'google.firebase.database.ref.v1.updated'; + +/** @internal */ +export const deletedEventType = 'google.firebase.database.ref.v1.deleted'; + +/** @internal */ +export interface RawRTDBCloudEventData { + ['@type']: 'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData'; + data: any; + delta: any; +} + +/** @internal */ +export interface RawRTDBCloudEvent extends CloudEvent { + firebasedatabasehost: string; + instance: string; + ref: string; + location: string; +} + +/** A CloudEvent that contains a DataSnapshot or a Change */ +export interface DatabaseEvent extends CloudEvent { + /** The domain of the database instance */ + firebaseDatabaseHost: string; + /** The instance ID portion of the fully qualified resource name */ + instance: string; + /** The database reference path */ + ref: string; + /** The location of the database */ + location: string; + /** + * An object containing the values of the path patterns. + * Only named capture groups will be populated - {key}, {key=*}, {key=**} + */ + params: Record; +} + +/** ReferenceOptions extend EventHandlerOptions with provided ref and optional instance */ +export interface ReferenceOptions extends options.EventHandlerOptions { + /** + * Specify the handler to trigger on a database reference(s). + * This value can either be a single reference or a pattern. + * Examples: '/foo/bar', '/foo/{bar}' + */ + ref: string; + /** + * Specify the handler to trigger on a database instance(s). + * If present, this value can either be a single instance or a pattern. + * Examples: 'my-instance-1', '{instance}' + */ + instance?: string; +} + +/** + * Event handler which triggers when data is created, updated, or deleted in Realtime Database. + * + * @param reference - The database reference path to trigger on. + * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. + */ +export function onRefWritten( + reference: string, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>>; + +/** + * Event handler which triggers when data is created, updated, or deleted in Realtime Database. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. + */ +export function onRefWritten( + opts: ReferenceOptions, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>>; + +/** + * Event handler which triggers when data is created, updated, or deleted in Realtime Database. + * + * @param referenceOrOpts - Options or a string reference. + * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. + */ +export function onRefWritten( + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>> { + return onChangedOperation(writtenEventType, referenceOrOpts, handler); +} + +/** + * Event handler which triggers when data is created in Realtime Database. + * + * @param reference - The database reference path to trigger on. + * @param handler - Event handler which is run every time a Realtime Database create occurs. + */ +export function onRefCreated( + reference: string, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction>; + +/** + * Event handler which triggers when data is created in Realtime Database. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Realtime Database create occurs. + */ +export function onRefCreated( + opts: ReferenceOptions, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction>; + +/** + * Event handler which triggers when data is created in Realtime Database. + * + * @param referenceOrOpts - Options or a string reference. + * @param handler - Event handler which is run every time a Realtime Database create occurs. + */ +export function onRefCreated( + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction> { + return onOperation(createdEventType, referenceOrOpts, handler); +} + +/** + * Event handler which triggers when data is updated in Realtime Database. + * + * @param reference - The database reference path to trigger on. + * @param handler - Event handler which is run every time a Realtime Database update occurs. + */ +export function onRefUpdated( + reference: string, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>>; + +/** + * Event handler which triggers when data is updated in Realtime Database. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Realtime Database update occurs. + */ +export function onRefUpdated( + opts: ReferenceOptions, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>>; + +/** + * Event handler which triggers when data is updated in Realtime Database. + * + * @param referenceOrOpts - Options or a string reference. + * @param handler - Event handler which is run every time a Realtime Database update occurs. + */ +export function onRefUpdated( + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>> { + return onChangedOperation(updatedEventType, referenceOrOpts, handler); +} + +/** + * Event handler which triggers when data is deleted in Realtime Database. + * + * @param reference - The database reference path to trigger on. + * @param handler - Event handler which is run every time a Realtime Database deletion occurs. + */ +export function onRefDeleted( + reference: string, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction>; + +/** + * Event handler which triggers when data is deleted in Realtime Database. + * + * @param opts - Options that can be set on an individual event-handling function. + * @param handler - Event handler which is run every time a Realtime Database deletion occurs. + */ +export function onRefDeleted( + opts: ReferenceOptions, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction>; + +/** + * Event handler which triggers when data is deleted in Realtime Database. + * + * @param referenceOrOpts - Options or a string reference. + * @param handler - Event handler which is run every time a Realtime Database deletion occurs. + */ +export function onRefDeleted( + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction> { + // TODO - need to use event.data.delta + return onOperation(deletedEventType, referenceOrOpts, handler); +} + +/** @internal */ +export function getOpts(referenceOrOpts: string | ReferenceOptions) { + let path: string, instance: string, opts: options.EventHandlerOptions; + if (typeof referenceOrOpts === 'string') { + path = normalizePath(referenceOrOpts); + instance = '*'; + opts = {}; + } else { + path = normalizePath(referenceOrOpts.ref); + instance = referenceOrOpts.instance || '*'; + opts = { ...referenceOrOpts }; + delete (opts as any).ref; + delete (opts as any).instance; + } + + return { + path, + instance, + opts, + }; +} + +/** @internal */ +export function makeParams( + event: RawRTDBCloudEvent, + path: PathPattern, + instance: PathPattern +) { + return { + ...path.extractMatches(event.ref), + ...instance.extractMatches(event.instance), + }; +} + +/** @hidden */ +function makeDatabaseEvent( + event: RawRTDBCloudEvent, + data: any, + instance: string, + params: Record +): DatabaseEvent { + const snapshot = new DataSnapshot(data, event.ref, apps().admin, instance); + const databaseEvent: DatabaseEvent = { + ...event, + firebaseDatabaseHost: event.firebasedatabasehost, + data: snapshot, + params, + }; + delete (databaseEvent as any).firebasedatabasehost; + return databaseEvent; +} + +/** @hidden */ +function makeChangedDatabaseEvent( + event: RawRTDBCloudEvent, + instance: string, + params: Record +): DatabaseEvent> { + const before = new DataSnapshot( + event.data.data, + event.ref, + apps().admin, + instance + ); + const after = new DataSnapshot( + applyChange(event.data.data, event.data.delta), + event.ref, + apps().admin, + instance + ); + const databaseEvent: DatabaseEvent> = { + ...event, + firebaseDatabaseHost: event.firebasedatabasehost, + data: { + before, + after, + }, + params, + }; + delete (databaseEvent as any).firebasedatabasehost; + return databaseEvent; +} + +/** @internal */ +export function makeEndpoint( + eventType: string, + opts: options.EventHandlerOptions, + path: PathPattern, + instance: PathPattern +): ManifestEndpoint { + const baseOpts = options.optionsToEndpoint(options.getGlobalOptions()); + const specificOpts = options.optionsToEndpoint(opts); + + const eventFilters: Record = {}; + const eventFilterPathPatterns: Record = { + // Note: Eventarc always treats ref as a path pattern + ref: path.getValue(), + }; + instance.hasWildcards() + ? (eventFilterPathPatterns.instance = instance.getValue()) + : (eventFilters.instance = instance.getValue()); + + return { + platform: 'gcfv2', + ...baseOpts, + ...specificOpts, + labels: { + ...baseOpts?.labels, + ...specificOpts?.labels, + }, + eventTrigger: { + eventType, + eventFilters, + eventFilterPathPatterns, + retry: false, + }, + }; +} + +/** @internal */ +export function onChangedOperation( + eventType: string, + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent>) => any | Promise +): CloudFunction>> { + const { path, instance, opts } = getOpts(referenceOrOpts); + + const pathPattern = new PathPattern(path); + const instancePattern = new PathPattern(instance); + + // wrap the handler + const func = (raw: CloudEvent) => { + const event = raw as RawRTDBCloudEvent; + const instanceUrl = `https://${event.instance}.${event.firebasedatabasehost}`; + const params = makeParams(event, pathPattern, instancePattern); + const databaseEvent = makeChangedDatabaseEvent(event, instanceUrl, params); + return handler(databaseEvent); + }; + + func.run = handler; + + func.__endpoint = makeEndpoint(eventType, opts, pathPattern, instancePattern); + + return func; +} + +/** @internal */ +export function onOperation( + eventType: string, + referenceOrOpts: string | ReferenceOptions, + handler: (event: DatabaseEvent) => any | Promise +): CloudFunction> { + const { path, instance, opts } = getOpts(referenceOrOpts); + + const pathPattern = new PathPattern(path); + const instancePattern = new PathPattern(instance); + + // wrap the handler + const func = (raw: CloudEvent) => { + const event = raw as RawRTDBCloudEvent; + const instanceUrl = `https://${event.instance}.${event.firebasedatabasehost}`; + const params = makeParams(event, pathPattern, instancePattern); + const data = + eventType === deletedEventType ? event.data.data : event.data.delta; + const databaseEvent = makeDatabaseEvent(event, data, instanceUrl, params); + return handler(databaseEvent); + }; + + func.run = handler; + + func.__endpoint = makeEndpoint(eventType, opts, pathPattern, instancePattern); + + return func; +} diff --git a/v2/database.js b/v2/database.js new file mode 100644 index 000000000..c822b56f1 --- /dev/null +++ b/v2/database.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 \ No newline at end of file From a2b9e73f011212847c7a867ede4f13a11504e601 Mon Sep 17 00:00:00 2001 From: Yusei-Yagi <45314822+Yamahitsuji@users.noreply.github.com> Date: Wed, 15 Jun 2022 02:19:35 +0900 Subject: [PATCH 470/705] add 8GB to memory option doc (#1129) Co-authored-by: Yamahitsuji --- src/function-builder.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/function-builder.ts b/src/function-builder.ts index f0158a3e0..1fd4efb05 100644 --- a/src/function-builder.ts +++ b/src/function-builder.ts @@ -277,7 +277,7 @@ export function region( * Configure runtime options for the function. * @param runtimeOptions Object with optional fields: * 1. `memory`: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', '2GB', and '4GB'. + * are: '128MB', '256MB', '512MB', '1GB', '2GB', '4GB', and '8GB'. * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are * 0 to 540. * 3. `failurePolicy`: failure policy of the function, with boolean `true` being @@ -321,7 +321,7 @@ export class FunctionBuilder { * Configure runtime options for the function. * @param runtimeOptions Object with optional fields: * 1. `memory`: amount of memory to allocate to the function, possible values - * are: '128MB', '256MB', '512MB', '1GB', '2GB', and '4GB'. + * are: '128MB', '256MB', '512MB', '1GB', '2GB', '4GB', and '8GB'. * 2. `timeoutSeconds`: timeout for the function in seconds, possible values are * 0 to 540. * 3. `failurePolicy`: failure policy of the function, with boolean `true` being From 76e0afd442e141ad0016d01545e5883e27712c3f Mon Sep 17 00:00:00 2001 From: Tyler Stark Date: Wed, 15 Jun 2022 12:51:03 -0500 Subject: [PATCH 471/705] Update v2 rtdb to expose RawRTDBEvent and RawRTDBCloudEventData (#1137) * Update v2 rtdb to expose RawRTDBEvent and RawRTDBCloudEventData This commit updates the v2 database provider to also expose the RawRTDB Events. This will be used in test-sdk when mocking returned DatabaseEvents. * Adding @hidden instead of @internal --- src/v2/providers/database.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts index b0a38c313..e0b410422 100644 --- a/src/v2/providers/database.ts +++ b/src/v2/providers/database.ts @@ -44,14 +44,14 @@ export const updatedEventType = 'google.firebase.database.ref.v1.updated'; /** @internal */ export const deletedEventType = 'google.firebase.database.ref.v1.deleted'; -/** @internal */ +/** @hidden */ export interface RawRTDBCloudEventData { ['@type']: 'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData'; data: any; delta: any; } -/** @internal */ +/** @hidden */ export interface RawRTDBCloudEvent extends CloudEvent { firebasedatabasehost: string; instance: string; From 3737898b5954082943bea1248d89661688723514 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 22 Jun 2022 09:46:06 -0700 Subject: [PATCH 472/705] Skip auth check when emulating task queue function. (#1154) Fixes https://github.com/firebase/firebase-functions/issues/1146 --- CHANGELOG.md | 1 + spec/common/providers/tasks.spec.ts | 22 +++++++++++++++++++++- src/common/providers/tasks.ts | 25 +++++++++++++------------ 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b174a17fe..5d516b215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Adds RTDB Triggers for v2 functions (#1127) +- Fixes bug where emulated task queue function required auth header (#1154) diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts index d3711a18f..6811f0b2a 100644 --- a/spec/common/providers/tasks.spec.ts +++ b/spec/common/providers/tasks.spec.ts @@ -83,7 +83,7 @@ describe('onEnqueueHandler', () => { function mockEnqueueRequest( data: unknown, contentType: string = 'application/json', - context: { authorization: string } = { authorization: 'Bearer abc' } + context: { authorization?: string } = { authorization: 'Bearer abc' } ): ReturnType { return mockRequest(data, contentType, context); } @@ -239,4 +239,24 @@ describe('onEnqueueHandler', () => { expectedStatus: 204, }); }); + + it('should skip auth in emulated environment', async () => { + const restore = process.env.FUNCTIONS_EMULATOR; + process.env.FUNCTIONS_EMULATOR = 'true'; + + await runTaskTest({ + httpRequest: mockEnqueueRequest(null, 'application/json', {}), + expectedData: null, + taskFunction: (data, context) => { + expect(context.auth).to.be.undefined; + return null; + }, + taskFunction2: (request) => { + expect(request.auth).to.be.undefined; + }, + expectedStatus: 204, + }); + + process.env.FUNCTIONS_EMULATOR = restore; + }); }); diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts index d84f7a585..52360af48 100644 --- a/src/common/providers/tasks.ts +++ b/src/common/providers/tasks.ts @@ -117,20 +117,21 @@ export function onDispatchHandler( throw new https.HttpsError('invalid-argument', 'Bad Request'); } - const authHeader = req.header('Authorization') || ''; - const token = authHeader.match(/^Bearer (.*)$/)?.[1]; - // Note: this should never happen since task queue functions are guarded by IAM. - if (!token) { - throw new https.HttpsError('unauthenticated', 'Unauthenticated'); - } - // We skip authenticating the token since tq functions are guarded by IAM. - const authToken = await https.unsafeDecodeIdToken(token); - const context: TaskContext = { - auth: { + const context: TaskContext = {}; + if (!process.env.FUNCTIONS_EMULATOR) { + const authHeader = req.header('Authorization') || ''; + const token = authHeader.match(/^Bearer (.*)$/)?.[1]; + // Note: this should never happen since task queue functions are guarded by IAM. + if (!token) { + throw new https.HttpsError('unauthenticated', 'Unauthenticated'); + } + // We skip authenticating the token since tq functions are guarded by IAM. + const authToken = await https.unsafeDecodeIdToken(token); + context.auth = { uid: authToken.uid, token: authToken, - }, - }; + }; + } const data: Req = https.decode(req.body.data); if (handler.length === 2) { From cc18326068278dcf2f5e15bf38d8ca5f5aaa9ff2 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 23 Jun 2022 13:38:08 -0400 Subject: [PATCH 473/705] Auth Blocking Triggers Bugbash (#1140) * adding run.app audience for v2 functions * linter & formatter --- src/common/providers/identity.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 948c73ce9..2c0ce0a2e 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -835,9 +835,13 @@ export function wrapHandler( 'skipTokenVerification' ) ? unsafeDecodeAuthBlockingToken(req.body.data.jwt) + : handler.length === 2 + ? await apps() + .admin.auth() + ._verifyAuthBlockingToken(req.body.data.jwt) : await apps() .admin.auth() - ._verifyAuthBlockingToken(req.body.data.jwt); + ._verifyAuthBlockingToken(req.body.data.jwt, 'run.app'); const authUserRecord = parseAuthUserRecord(decodedPayload.user_record); const authEventContext = parseAuthEventContext(decodedPayload, projectId); From 96f9e8646fc22559a1a28fda5213c726df18e7fd Mon Sep 17 00:00:00 2001 From: Jasper Concepcion Date: Tue, 28 Jun 2022 06:35:43 +0800 Subject: [PATCH 474/705] add firebase-admin@^11.0.0 to peer dependencies (#1151) * add firebase-admin@11.x.x to peer dependencies * Add changelog entry. Co-authored-by: Daniel Lee --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d516b215..bc0bbf514 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Adds RTDB Triggers for v2 functions (#1127) +- Adds support for Firebase Admin SDK v11 (#1151) - Fixes bug where emulated task queue function required auth header (#1154) diff --git a/package.json b/package.json index 03f56c851..7363f41df 100644 --- a/package.json +++ b/package.json @@ -229,7 +229,7 @@ "yargs": "^15.3.1" }, "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0" + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0" }, "engines": { "node": "^8.13.0 || >=10.10.0" From 139e1d94d585c26a5d76586685a976a5643df869 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Tue, 28 Jun 2022 00:20:36 -0400 Subject: [PATCH 475/705] Enhance RTDB v2 Triggers (#1153) * moving change into v2 core * moving Change to common and fixing imports * fix tsdoc * rexporting Change from v1&v2 * remove unused functions from Change namespace * fixing argument * rename interface to onValue* and rework Change Co-authored-by: Thomas Bouldin --- spec/common/change.spec.ts | 120 +++++++++++++++++++++++++++++ spec/v1/cloud-functions.spec.ts | 97 ----------------------- spec/v2/providers/database.spec.ts | 24 +++--- src/cloud-functions.ts | 89 --------------------- src/common/change.ts | 109 ++++++++++++++++++++++++++ src/providers/database.ts | 2 +- src/providers/firestore.ts | 2 +- src/v2/core.ts | 3 + src/v2/providers/database.ts | 120 +++++++++++++++++++++++++---- 9 files changed, 353 insertions(+), 213 deletions(-) create mode 100644 spec/common/change.spec.ts create mode 100644 src/common/change.ts diff --git a/spec/common/change.spec.ts b/spec/common/change.spec.ts new file mode 100644 index 000000000..258fc8463 --- /dev/null +++ b/spec/common/change.spec.ts @@ -0,0 +1,120 @@ +// 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. + +import { expect } from 'chai'; +import * as change from '../../src/common/change'; + +describe('Change', () => { + describe('applyFieldMask', () => { + const after = { + foo: 'bar', + num: 2, + obj: { + a: 1, + b: 2, + }, + }; + + it('should handle deleted values', () => { + const sparseBefore = { baz: 'qux' }; + const fieldMask = 'baz'; + expect( + change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ + foo: 'bar', + num: 2, + obj: { + a: 1, + b: 2, + }, + baz: 'qux', + }); + }); + + it('should handle created values', () => { + const sparseBefore = {}; + const fieldMask = 'num,obj.a'; + expect( + change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ + foo: 'bar', + obj: { + b: 2, + }, + }); + }); + + it('should handle mutated values', () => { + const sparseBefore = { + num: 3, + obj: { + a: 3, + }, + }; + const fieldMask = 'num,obj.a'; + expect( + change.applyFieldMask(sparseBefore, after, fieldMask) + ).to.deep.equal({ + foo: 'bar', + num: 3, + obj: { + a: 3, + b: 2, + }, + }); + }); + }); + + describe('fromJSON', () => { + it('should create a Change object with a `before` and `after`', () => { + const created = change.Change.fromJSON({ + before: { foo: 'bar' }, + after: { foo: 'faz' }, + }); + expect(created instanceof change.Change).to.equal(true); + expect(created.before).to.deep.equal({ foo: 'bar' }); + expect(created.after).to.deep.equal({ foo: 'faz' }); + }); + + it('should apply the customizer function to `before` and `after`', () => { + function customizer(input: any) { + input.another = 'value'; + return input as T; + } + const created = change.Change.fromJSON( + { + before: { foo: 'bar' }, + after: { foo: 'faz' }, + }, + customizer + ); + expect(created.before).to.deep.equal({ + foo: 'bar', + another: 'value', + }); + expect(created.after).to.deep.equal({ + foo: 'faz', + another: 'value', + }); + }); + }); +}); diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts index fec1bd580..336c00282 100644 --- a/spec/v1/cloud-functions.spec.ts +++ b/spec/v1/cloud-functions.spec.ts @@ -24,7 +24,6 @@ import { expect } from 'chai'; import * as _ from 'lodash'; import { - Change, Event, EventContext, makeCloudFunction, @@ -354,99 +353,3 @@ describe('makeAuth and makeAuthType', () => { }); }); }); - -describe('Change', () => { - describe('applyFieldMask', () => { - const after = { - foo: 'bar', - num: 2, - obj: { - a: 1, - b: 2, - }, - }; - - it('should handle deleted values', () => { - const sparseBefore = { baz: 'qux' }; - const fieldMask = 'baz'; - expect( - Change.applyFieldMask(sparseBefore, after, fieldMask) - ).to.deep.equal({ - foo: 'bar', - num: 2, - obj: { - a: 1, - b: 2, - }, - baz: 'qux', - }); - }); - - it('should handle created values', () => { - const sparseBefore = {}; - const fieldMask = 'num,obj.a'; - expect( - Change.applyFieldMask(sparseBefore, after, fieldMask) - ).to.deep.equal({ - foo: 'bar', - obj: { - b: 2, - }, - }); - }); - - it('should handle mutated values', () => { - const sparseBefore = { - num: 3, - obj: { - a: 3, - }, - }; - const fieldMask = 'num,obj.a'; - expect( - Change.applyFieldMask(sparseBefore, after, fieldMask) - ).to.deep.equal({ - foo: 'bar', - num: 3, - obj: { - a: 3, - b: 2, - }, - }); - }); - }); - - describe('fromJSON', () => { - it('should create a Change object with a `before` and `after`', () => { - const created = Change.fromJSON({ - before: { foo: 'bar' }, - after: { foo: 'faz' }, - }); - expect(created instanceof Change).to.equal(true); - expect(created.before).to.deep.equal({ foo: 'bar' }); - expect(created.after).to.deep.equal({ foo: 'faz' }); - }); - - it('should apply the customizer function to `before` and `after`', () => { - function customizer(input: any) { - _.set(input, 'another', 'value'); - return input as T; - } - const created = Change.fromJSON( - { - before: { foo: 'bar' }, - after: { foo: 'faz' }, - }, - customizer - ); - expect(created.before).to.deep.equal({ - foo: 'bar', - another: 'value', - }); - expect(created.after).to.deep.equal({ - foo: 'faz', - another: 'value', - }); - }); - }); -}); diff --git a/spec/v2/providers/database.spec.ts b/spec/v2/providers/database.spec.ts index 58d4285ab..f700c58d3 100644 --- a/spec/v2/providers/database.spec.ts +++ b/spec/v2/providers/database.spec.ts @@ -363,9 +363,9 @@ describe('database', () => { }); }); - describe('onRefWritten', () => { + describe('onValueWritten', () => { it('should create a function with a reference', () => { - const func = database.onRefWritten('/foo/{bar}/', (event) => 2); + const func = database.onValueWritten('/foo/{bar}/', (event) => 2); expect(func.__endpoint).to.deep.equal({ platform: 'gcfv2', @@ -383,7 +383,7 @@ describe('database', () => { }); it('should create a function with opts', () => { - const func = database.onRefWritten( + const func = database.onValueWritten( { ref: '/foo/{path=**}/{bar}/', instance: 'my-instance', @@ -414,9 +414,9 @@ describe('database', () => { }); }); - describe('onRefCreated', () => { + describe('onValueCreated', () => { it('should create a function with a reference', () => { - const func = database.onRefCreated('/foo/{bar}/', (event) => 2); + const func = database.onValueCreated('/foo/{bar}/', (event) => 2); expect(func.__endpoint).to.deep.equal({ platform: 'gcfv2', @@ -434,7 +434,7 @@ describe('database', () => { }); it('should create a function with opts', () => { - const func = database.onRefCreated( + const func = database.onValueCreated( { ref: '/foo/{path=**}/{bar}/', instance: 'my-instance', @@ -465,9 +465,9 @@ describe('database', () => { }); }); - describe('onRefUpdated', () => { + describe('onValueUpdated', () => { it('should create a function with a reference', () => { - const func = database.onRefUpdated('/foo/{bar}/', (event) => 2); + const func = database.onValueUpdated('/foo/{bar}/', (event) => 2); expect(func.__endpoint).to.deep.equal({ platform: 'gcfv2', @@ -485,7 +485,7 @@ describe('database', () => { }); it('should create a function with opts', () => { - const func = database.onRefUpdated( + const func = database.onValueUpdated( { ref: '/foo/{path=**}/{bar}/', instance: 'my-instance', @@ -516,9 +516,9 @@ describe('database', () => { }); }); - describe('onRefDeleted', () => { + describe('onValueDeleted', () => { it('should create a function with a reference', () => { - const func = database.onRefDeleted('/foo/{bar}/', (event) => 2); + const func = database.onValueDeleted('/foo/{bar}/', (event) => 2); expect(func.__endpoint).to.deep.equal({ platform: 'gcfv2', @@ -536,7 +536,7 @@ describe('database', () => { }); it('should create a function with opts', () => { - const func = database.onRefDeleted( + const func = database.onValueDeleted( { ref: '/foo/{path=**}/{bar}/', instance: 'my-instance', diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index a362230fb..f866faa22 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -155,95 +155,6 @@ export interface EventContext { timestamp: string; } -/** - * The Functions interface for events that change state, such as - * Realtime Database or Cloud Firestore `onWrite` and `onUpdate`. - * - * For more information about the format used to construct `Change` objects, see - * [`cloud-functions.ChangeJson`](/docs/reference/functions/cloud_functions_.changejson). - * - */ -export class Change { - constructor(public before: T, public after: T) {} -} - -/** - * `ChangeJson` is the JSON format used to construct a Change object. - */ -export interface ChangeJson { - /** - * Key-value pairs representing state of data after the change. - */ - after?: any; - /** - * Key-value pairs representing state of data before the change. If - * `fieldMask` is set, then only fields that changed are present in `before`. - */ - before?: any; - /** - * @hidden - * Comma-separated string that represents names of fields that changed. - */ - fieldMask?: string; -} - -export namespace Change { - /** @hidden */ - function reinterpretCast(x: any) { - return x as T; - } - - /** - * @hidden - * Factory method for creating a Change from a `before` object and an `after` - * object. - */ - export function fromObjects(before: T, after: T) { - return new Change(before, after); - } - - /** - * @hidden - * Factory method for creating a Change from a JSON and an optional customizer - * function to be applied to both the `before` and the `after` fields. - */ - export function fromJSON( - json: ChangeJson, - customizer: (x: any) => T = reinterpretCast - ): Change { - let before = { ...json.before }; - if (json.fieldMask) { - before = applyFieldMask(before, json.after, json.fieldMask); - } - - return Change.fromObjects( - customizer(before || {}), - customizer(json.after || {}) - ); - } - - /** @hidden */ - export function applyFieldMask( - sparseBefore: any, - after: any, - fieldMask: string - ) { - const before = { ...after }; - const masks = fieldMask.split(','); - - masks.forEach((mask) => { - const val = _.get(sparseBefore, mask); - if (typeof val === 'undefined') { - _.unset(before, mask); - } else { - _.set(before, mask, val); - } - }); - - return before; - } -} - /** * Resource is a standard format for defining a resource * (google.rpc.context.AttributeContext.Resource). In Cloud Functions, it is the diff --git a/src/common/change.ts b/src/common/change.ts new file mode 100644 index 000000000..c0180e0a0 --- /dev/null +++ b/src/common/change.ts @@ -0,0 +1,109 @@ +// 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. + +/** + * `ChangeJson` is the JSON format used to construct a Change object. + */ +export interface ChangeJson { + /** + * Key-value pairs representing state of data after the change. + */ + after?: any; + /** + * Key-value pairs representing state of data before the change. If + * `fieldMask` is set, then only fields that changed are present in `before`. + */ + before?: any; + /** + * @hidden + * Comma-separated string that represents names of fields that changed. + */ + fieldMask?: string; +} + +/** @hidden */ +export function applyFieldMask( + sparseBefore: any, + after: any, + fieldMask: string +) { + const before = { ...after }; + const masks = fieldMask.split(','); + + for (const mask of masks) { + const parts = mask.split('.'); + const head = parts[0]; + const tail = parts.slice(1).join('.'); + if (parts.length > 1) { + before[head] = applyFieldMask(sparseBefore?.[head], after[head], tail); + continue; + } + const val = sparseBefore?.[head]; + if (typeof val === 'undefined') { + delete before[mask]; + } else { + before[mask] = val; + } + } + + return before; +} + +/** + * The Functions interface for events that change state, such as + * Realtime Database or Cloud Firestore `onWrite` and `onUpdate`. + * + * For more information about the format used to construct `Change` objects, see + * {@link ChangeJson} below. + * + */ +export class Change { + /** + * @hidden + * Factory method for creating a Change from a `before` object and an `after` + * object. + */ + static fromObjects(before: T, after: T) { + return new Change(before, after); + } + + /** + * @hidden + * Factory method for creating a Change from a JSON and an optional customizer + * function to be applied to both the `before` and the `after` fields. + */ + static fromJSON( + json: ChangeJson, + customizer: (x: any) => T = (x) => x as T + ): Change { + let before = { ...json.before }; + if (json.fieldMask) { + before = applyFieldMask(before, json.after, json.fieldMask); + } + + return Change.fromObjects( + customizer(before || {}), + customizer(json.after || {}) + ); + } + constructor(public before: T, public after: T) {} +} diff --git a/src/providers/database.ts b/src/providers/database.ts index 5b7dc59f5..39feaf0e8 100644 --- a/src/providers/database.ts +++ b/src/providers/database.ts @@ -22,12 +22,12 @@ import { apps } from '../apps'; import { - Change, CloudFunction, Event, EventContext, makeCloudFunction, } from '../cloud-functions'; +import { Change } from '../common/change'; import { DataSnapshot } from '../common/providers/database'; import { firebaseConfig } from '../config'; import { DeploymentOptions } from '../function-configuration'; diff --git a/src/providers/firestore.ts b/src/providers/firestore.ts index 620040d2b..73d8eed13 100644 --- a/src/providers/firestore.ts +++ b/src/providers/firestore.ts @@ -26,12 +26,12 @@ import * as _ from 'lodash'; import { posix } from 'path'; import { apps } from '../apps'; import { - Change, CloudFunction, Event, EventContext, makeCloudFunction, } from '../cloud-functions'; +import { Change } from '../common/change'; import { dateToTimestampProto } from '../encoder'; import { DeploymentOptions } from '../function-configuration'; import * as logger from '../logger'; diff --git a/src/v2/core.ts b/src/v2/core.ts index 5e71d2458..7bd88fc8d 100644 --- a/src/v2/core.ts +++ b/src/v2/core.ts @@ -25,8 +25,11 @@ * @packageDocumentation */ +import { Change } from '../common/change'; import { ManifestEndpoint } from '../runtime/manifest'; +export { Change }; + /** @internal */ export interface TriggerAnnotation { platform?: string; diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts index e0b410422..1ab09f666 100644 --- a/src/v2/providers/database.ts +++ b/src/v2/providers/database.ts @@ -21,7 +21,7 @@ // SOFTWARE. import { apps } from '../../apps'; -import { Change } from '../../cloud-functions'; +import { Change } from '../../common/change'; import { DataSnapshot } from '../../common/providers/database'; import { ManifestEndpoint } from '../../runtime/manifest'; import { normalizePath } from '../../utilities/path'; @@ -84,12 +84,106 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * Examples: '/foo/bar', '/foo/{bar}' */ ref: string; + /** * Specify the handler to trigger on a database instance(s). * If present, this value can either be a single instance or a pattern. * Examples: 'my-instance-1', '{instance}' */ instance?: string; + + /** + * Region where functions should be deployed. + */ + region?: options.SupportedRegion | string; + + /** + * Amount of memory to allocate to a function. + * A value of null restores the defaults of 256MB. + */ + memory?: options.MemoryOption | null; + + /** + * 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 + * 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 | null; + + /** + * Min number of actual instances to be running at a given time. + * 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 | null; + + /** + * Max number of instances to be running in parallel. + * A value of null restores the default max instances. + */ + maxInstances?: number | null; + + /** + * Number of requests a function can serve at once. + * 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 | null; + + /** + * Fractional number of CPUs to allocate to a function. + * 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'; + + /** + * Connect cloud function to specified VPC connector. + * A value of null removes the VPC connector + */ + vpcConnector?: string | null; + + /** + * Egress settings for VPC connector. + * A value of null turns off VPC connector egress settings + */ + vpcConnectorEgressSettings?: options.VpcEgressSetting | null; + + /** + * Specific service account for the function to run as. + * A value of null restores the default service account. + */ + serviceAccount?: string | null; + + /** + * Ingress settings which control where this function can be called from. + * A value of null turns off ingress settings. + */ + ingressSettings?: options.IngressSetting | null; + + /** + * User labels to set on the function. + */ + labels?: Record; + + /* + * Secrets to bind to a function. + */ + secrets?: string[]; + + /** Whether failed executions should be delivered again. */ + retry?: boolean; } /** @@ -98,7 +192,7 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * @param reference - The database reference path to trigger on. * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. */ -export function onRefWritten( +export function onValueWritten( reference: string, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>>; @@ -109,7 +203,7 @@ export function onRefWritten( * @param opts - Options that can be set on an individual event-handling function. * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. */ -export function onRefWritten( +export function onValueWritten( opts: ReferenceOptions, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>>; @@ -120,7 +214,7 @@ export function onRefWritten( * @param referenceOrOpts - Options or a string reference. * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs. */ -export function onRefWritten( +export function onValueWritten( referenceOrOpts: string | ReferenceOptions, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>> { @@ -133,7 +227,7 @@ export function onRefWritten( * @param reference - The database reference path to trigger on. * @param handler - Event handler which is run every time a Realtime Database create occurs. */ -export function onRefCreated( +export function onValueCreated( reference: string, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction>; @@ -144,7 +238,7 @@ export function onRefCreated( * @param opts - Options that can be set on an individual event-handling function. * @param handler - Event handler which is run every time a Realtime Database create occurs. */ -export function onRefCreated( +export function onValueCreated( opts: ReferenceOptions, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction>; @@ -155,7 +249,7 @@ export function onRefCreated( * @param referenceOrOpts - Options or a string reference. * @param handler - Event handler which is run every time a Realtime Database create occurs. */ -export function onRefCreated( +export function onValueCreated( referenceOrOpts: string | ReferenceOptions, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction> { @@ -168,7 +262,7 @@ export function onRefCreated( * @param reference - The database reference path to trigger on. * @param handler - Event handler which is run every time a Realtime Database update occurs. */ -export function onRefUpdated( +export function onValueUpdated( reference: string, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>>; @@ -179,7 +273,7 @@ export function onRefUpdated( * @param opts - Options that can be set on an individual event-handling function. * @param handler - Event handler which is run every time a Realtime Database update occurs. */ -export function onRefUpdated( +export function onValueUpdated( opts: ReferenceOptions, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>>; @@ -190,7 +284,7 @@ export function onRefUpdated( * @param referenceOrOpts - Options or a string reference. * @param handler - Event handler which is run every time a Realtime Database update occurs. */ -export function onRefUpdated( +export function onValueUpdated( referenceOrOpts: string | ReferenceOptions, handler: (event: DatabaseEvent>) => any | Promise ): CloudFunction>> { @@ -203,7 +297,7 @@ export function onRefUpdated( * @param reference - The database reference path to trigger on. * @param handler - Event handler which is run every time a Realtime Database deletion occurs. */ -export function onRefDeleted( +export function onValueDeleted( reference: string, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction>; @@ -214,7 +308,7 @@ export function onRefDeleted( * @param opts - Options that can be set on an individual event-handling function. * @param handler - Event handler which is run every time a Realtime Database deletion occurs. */ -export function onRefDeleted( +export function onValueDeleted( opts: ReferenceOptions, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction>; @@ -225,7 +319,7 @@ export function onRefDeleted( * @param referenceOrOpts - Options or a string reference. * @param handler - Event handler which is run every time a Realtime Database deletion occurs. */ -export function onRefDeleted( +export function onValueDeleted( referenceOrOpts: string | ReferenceOptions, handler: (event: DatabaseEvent) => any | Promise ): CloudFunction> { From a00ad925ce5a24124d5354d1ff533bb7bd0f8c76 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Tue, 28 Jun 2022 15:55:08 -0400 Subject: [PATCH 476/705] revert datasnapshot (#1156) --- spec/v1/providers/database.spec.ts | 143 ++--------------------------- src/common/providers/database.ts | 98 ++++++++------------ 2 files changed, 46 insertions(+), 195 deletions(-) diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts index 30d24ea3c..304c1d1fd 100644 --- a/spec/v1/providers/database.spec.ts +++ b/spec/v1/providers/database.spec.ts @@ -639,6 +639,10 @@ describe('Database Functions', () => { expect(subject.val()).to.equal(0); populate({ myKey: 0 }); expect(subject.val()).to.deep.equal({ myKey: 0 }); + + // Null values are still reported as null. + populate({ myKey: null }); + expect(subject.val()).to.deep.equal({ myKey: null }); }); // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995) @@ -646,45 +650,6 @@ describe('Database Functions', () => { populate({ length: 3, foo: 'bar' }); expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar' }); }); - - it('should deal with null-values appropriately', () => { - populate(null); - expect(subject.val()).to.be.null; - - populate({ myKey: null }); - expect(subject.val()).to.be.null; - }); - - it('should deal with empty object values appropriately', () => { - populate({}); - expect(subject.val()).to.be.null; - - populate({ myKey: {} }); - expect(subject.val()).to.be.null; - - populate({ myKey: { child: null } }); - expect(subject.val()).to.be.null; - }); - - it('should deal with empty array values appropriately', () => { - populate([]); - expect(subject.val()).to.be.null; - - populate({ myKey: [] }); - expect(subject.val()).to.be.null; - - populate({ myKey: [null] }); - expect(subject.val()).to.be.null; - - populate({ myKey: [{}] }); - expect(subject.val()).to.be.null; - - populate({ myKey: [{ myKey: null }] }); - expect(subject.val()).to.be.null; - - populate({ myKey: [{ myKey: {} }] }); - expect(subject.val()).to.be.null; - }); }); describe('#child(): DataSnapshot', () => { @@ -711,37 +676,14 @@ describe('Database Functions', () => { }); it('should be false for a non-existent value', () => { - populate({ a: { b: 'c', nullChild: null } }); + populate({ a: { b: 'c' } }); expect(subject.child('d').exists()).to.be.false; - expect(subject.child('nullChild').exists()).to.be.false; }); it('should be false for a value pathed beyond a leaf', () => { populate({ a: { b: 'c' } }); expect(subject.child('a/b/c').exists()).to.be.false; }); - - it('should be false for an empty object value', () => { - populate({ a: {} }); - expect(subject.child('a').exists()).to.be.false; - - populate({ a: { child: null } }); - expect(subject.child('a').exists()).to.be.false; - - populate({ a: { child: {} } }); - expect(subject.child('a').exists()).to.be.false; - }); - - it('should be false for an empty array value', () => { - populate({ a: [] }); - expect(subject.child('a').exists()).to.be.false; - - populate({ a: [null] }); - expect(subject.child('a').exists()).to.be.false; - - populate({ a: [{}] }); - expect(subject.child('a').exists()).to.be.false; - }); }); describe('#forEach(action: (a: DataSnapshot) => boolean): boolean', () => { @@ -770,17 +712,6 @@ describe('Database Functions', () => { expect(subject.forEach(counter)).to.equal(false); expect(count).to.eq(0); - - populate({ - a: 'foo', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); - count = 0; - - expect(subject.forEach(counter)).to.equal(false); - expect(count).to.eq(1); }); it('should cancel further enumeration if callback returns true', () => { @@ -820,51 +751,13 @@ describe('Database Functions', () => { describe('#numChildren()', () => { it('should be key count for objects', () => { - populate({ - a: 'b', - c: 'd', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); + populate({ a: 'b', c: 'd' }); expect(subject.numChildren()).to.eq(2); }); it('should be 0 for non-objects', () => { populate(23); expect(subject.numChildren()).to.eq(0); - - populate({ - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); - expect(subject.numChildren()).to.eq(0); - }); - }); - - describe('#hasChildren()', () => { - it('should true for objects', () => { - populate({ - a: 'b', - c: 'd', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); - expect(subject.hasChildren()).to.be.true; - }); - - it('should be false for non-objects', () => { - populate(23); - expect(subject.hasChildren()).to.be.false; - - populate({ - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); - expect(subject.hasChildren()).to.be.false; }); }); @@ -876,17 +769,9 @@ describe('Database Functions', () => { }); it('should return false if a child is missing', () => { - populate({ - a: 'b', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); + populate({ a: 'b' }); expect(subject.hasChild('c')).to.be.false; expect(subject.hasChild('a/b')).to.be.false; - expect(subject.hasChild('nullChild')).to.be.false; - expect(subject.hasChild('emptyObjectChild')).to.be.false; - expect(subject.hasChild('emptyArrayChild')).to.be.false; }); }); @@ -916,21 +801,11 @@ describe('Database Functions', () => { describe('#toJSON(): Object', () => { it('should return the current value', () => { - populate({ - a: 'b', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); + populate({ a: 'b' }); expect(subject.toJSON()).to.deep.equal(subject.val()); }); it('should be stringifyable', () => { - populate({ - a: 'b', - nullChild: null, - emptyObjectChild: {}, - emptyArrayChild: [], - }); + populate({ a: 'b' }); expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}'); }); }); diff --git a/src/common/providers/database.ts b/src/common/providers/database.ts index f14ce8b1d..f1c41d617 100644 --- a/src/common/providers/database.ts +++ b/src/common/providers/database.ts @@ -21,13 +21,13 @@ // SOFTWARE. import * as firebase from 'firebase-admin'; -import { firebaseConfig } from '../../config'; +import * as _ from 'lodash'; import { joinPath, pathParts } from '../../utilities/path'; /** - * Interface representing a Firebase Realtime database data snapshot. + * Interface representing a Firebase Realtime Database data snapshot. */ -export class DataSnapshot implements firebase.database.DataSnapshot { +export class DataSnapshot { public instance: string; /** @hidden */ @@ -44,11 +44,10 @@ export class DataSnapshot implements firebase.database.DataSnapshot { constructor( data: any, - path?: string, // path is undefined for the database root + path?: string, // path will be undefined for the database root private app?: firebase.app.App, instance?: string ) { - const config = firebaseConfig(); if (app?.options?.databaseURL?.startsWith('http:')) { // In this case we're dealing with an emulator this.instance = app.options.databaseURL; @@ -57,13 +56,9 @@ export class DataSnapshot implements firebase.database.DataSnapshot { this.instance = instance; } else if (app) { this.instance = app.options.databaseURL; - } else if (config.databaseURL) { - this.instance = config.databaseURL; } else if (process.env.GCLOUD_PROJECT) { this.instance = - 'https://' + - process.env.GCLOUD_PROJECT + - '-default-rtdb.firebaseio.com'; + 'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com'; } this._path = path; @@ -72,7 +67,7 @@ export class DataSnapshot implements firebase.database.DataSnapshot { /** * Returns a [`Reference`](/docs/reference/admin/node/admin.database.Reference) - * to the database location where the triggering write occurred. Has + * to the Database location where the triggering write occurred. Has * full read and write access. */ get ref(): firebase.database.Reference { @@ -92,14 +87,13 @@ export class DataSnapshot implements firebase.database.DataSnapshot { /** * The key (last part of the path) of the location of this `DataSnapshot`. * - * The last token in a database location is considered its key. For example, + * The last token in a Database location is considered its key. For example, * "ada" is the key for the `/users/ada/` node. Accessing the key on any - * `DataSnapshot` returns the key for the location that generated it. - * However, accessing the key on the root URL of a database returns `null`. + * `DataSnapshot` will return the key for the location that generated it. + * However, accessing the key on the root URL of a Database will return `null`. */ - get key(): string | null { - const segments = pathParts(this._fullPath()); - const last = segments[segments.length - 1]; + get key(): string { + const last = _.last(pathParts(this._fullPath())); return !last || last === '' ? null : last; } @@ -111,25 +105,24 @@ export class DataSnapshot implements firebase.database.DataSnapshot { * return `null`, indicating that the `DataSnapshot` is empty (contains no * data). * - * @return The snapshot's contents as a JavaScript value (Object, + * @return The DataSnapshot's contents as a JavaScript value (Object, * Array, string, number, boolean, or `null`). */ val(): any { const parts = pathParts(this._childPath); - let source = this._data; - if (parts.length) { - for (const part of parts) { - source = source[part]; - } - } - const node = source ?? null; - + const source = this._data; + const node = _.cloneDeep( + parts.length ? _.get(source, parts, null) : source + ); return this._checkAndConvertToArray(node); } /** * Exports the entire contents of the `DataSnapshot` as a JavaScript object. * + * The `exportVal()` method is similar to `val()`, except priority information + * is included (if available), making it suitable for backing up your data. + * * @return The contents of the `DataSnapshot` as a JavaScript value * (Object, Array, string, number, boolean, or `null`). */ @@ -157,14 +150,7 @@ export class DataSnapshot implements firebase.database.DataSnapshot { * @return `true` if this `DataSnapshot` contains any data; otherwise, `false`. */ exists(): boolean { - const val = this.val(); - if (!val || val === null) { - return false; - } - if (typeof val === 'object' && Object.keys(val).length === 0) { - return false; - } - return true; + return !_.isNull(this.val()); } /** @@ -191,22 +177,25 @@ export class DataSnapshot implements firebase.database.DataSnapshot { * JavaScript object returned by `val()` is not guaranteed to match the ordering * on the server nor the ordering of `child_added` events. That is where * `forEach()` comes in handy. It guarantees the children of a `DataSnapshot` - * can be iterated in their query order. + * will be iterated in their query order. * * If no explicit `orderBy*()` method is used, results are returned * ordered by key (unless priorities are used, in which case, results are * returned by priority). * - * @param action A function that is called for each child `DataSnapshot`. + * @param action A function that will be called for each child `DataSnapshot`. * The callback can return `true` to cancel further enumeration. * * @return `true` if enumeration was canceled due to your callback * returning `true`. */ forEach(action: (a: DataSnapshot) => boolean | void): boolean { - const val = this.val() || {}; - if (typeof val === 'object') { - return Object.keys(val).some((key) => action(this.child(key)) === true); + const val = this.val(); + if (_.isPlainObject(val)) { + return _.some( + val, + (value, key: string) => action(this.child(key)) === true + ); } return false; } @@ -229,16 +218,14 @@ export class DataSnapshot implements firebase.database.DataSnapshot { * You can use `hasChildren()` to determine if a `DataSnapshot` has any * children. If it does, you can enumerate them using `forEach()`. If it * doesn't, then either this snapshot contains a primitive value (which can be - * retrieved with `val()`) or it is empty (in which case, `val()` returns + * retrieved with `val()`) or it is empty (in which case, `val()` will return * `null`). * * @return `true` if this snapshot has any children; else `false`. */ hasChildren(): boolean { const val = this.val(); - return ( - val !== null && typeof val === 'object' && Object.keys(val).length > 0 - ); + return _.isPlainObject(val) && _.keys(val).length > 0; } /** @@ -248,9 +235,7 @@ export class DataSnapshot implements firebase.database.DataSnapshot { */ numChildren(): number { const val = this.val(); - return val !== null && typeof val === 'object' - ? Object.keys(val).length - : 0; + return _.isPlainObject(val) ? Object.keys(val).length : 0; } /** @@ -282,12 +267,7 @@ export class DataSnapshot implements firebase.database.DataSnapshot { continue; } const childNode = node[key]; - const v = this._checkAndConvertToArray(childNode); - if (v === null) { - // Empty child node - continue; - } - obj[key] = v; + obj[key] = this._checkAndConvertToArray(childNode); numKeys++; const integerRegExp = /^(0|[1-9]\d*)$/; if (allIntegerKeys && integerRegExp.test(key)) { @@ -297,17 +277,12 @@ export class DataSnapshot implements firebase.database.DataSnapshot { } } - if (numKeys === 0) { - // Empty node - return null; - } - if (allIntegerKeys && maxKey < 2 * numKeys) { // convert to array. const array: any = []; - for (const key of Object.keys(obj)) { - array[key] = obj[key]; - } + _.forOwn(obj, (val, key) => { + array[key] = val; + }); return array; } @@ -333,6 +308,7 @@ export class DataSnapshot implements firebase.database.DataSnapshot { /** @hidden */ private _fullPath(): string { - return (this._path || '') + '/' + (this._childPath || ''); + const out = (this._path || '') + '/' + (this._childPath || ''); + return out; } } From 47f72d807454eaa1f410a7247c67cf291849f10c Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 29 Jun 2022 12:07:58 -0400 Subject: [PATCH 477/705] Re-export Change from v1 & v2 root (#1158) - Re-export Change from the v1 & v2 index.ts - In v1, we can export from `cloud-functions.ts` since that module is exported from the root --- src/cloud-functions.ts | 2 ++ src/v2/index.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/cloud-functions.ts b/src/cloud-functions.ts index f866faa22..c90bdaea4 100644 --- a/src/cloud-functions.ts +++ b/src/cloud-functions.ts @@ -39,6 +39,8 @@ import { } from './common/encoding'; import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest'; +export { Change } from './common/change'; + /** @hidden */ const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g'); diff --git a/src/v2/index.ts b/src/v2/index.ts index d2161ab71..dc460cd52 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -60,4 +60,6 @@ export { EventHandlerOptions, } from './options'; +export { Change } from '../common/change'; + export { CloudFunction, CloudEvent } from './core'; From 29ad81ea2c811cf60c209bc633de4fbbcd2fce20 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 29 Jun 2022 13:53:46 -0400 Subject: [PATCH 478/705] fixing docs (#1159) --- src/v2/providers/database.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts index 1ab09f666..acfdfb76d 100644 --- a/src/v2/providers/database.ts +++ b/src/v2/providers/database.ts @@ -88,7 +88,8 @@ export interface ReferenceOptions extends options.EventHandlerOptions { /** * Specify the handler to trigger on a database instance(s). * If present, this value can either be a single instance or a pattern. - * Examples: 'my-instance-1', '{instance}' + * Examples: 'my-instance-1', 'my-instance-*' + * Note: The capture syntax cannot be used for 'instance'. */ instance?: string; From a0faf00feab3f3ce0b13d11ffe57921737c9ee1e Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 29 Jun 2022 18:49:17 +0000 Subject: [PATCH 479/705] 3.22.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c11eebe69..324031632 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.2", + "version": "3.22.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7363f41df..0769610d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.21.2", + "version": "3.22.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 29903132dfddf44f8c051e31f1e0a240e5ff0578 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 29 Jun 2022 18:49:19 +0000 Subject: [PATCH 480/705] [firebase-release] Removed change log and reset repo after 3.22.0 release --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc0bbf514..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +0,0 @@ -- Adds RTDB Triggers for v2 functions (#1127) -- Adds support for Firebase Admin SDK v11 (#1151) -- Fixes bug where emulated task queue function required auth header (#1154) From c9c55cf99368eb7c0badf74f26953b1b28b5c7fb Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 15 Jul 2022 14:11:47 -0700 Subject: [PATCH 481/705] Fix issues with outdated package-lock.json file. (#1170) Our `package-lock.json` file is outdated and our dependencies are a bit jumbled up. I didn't notice any issue when using `nodejs14` but when using `nodejs16` reveals several issues that I've tried to address in the PR: 1. Update `typedoc` dependency to avoid impossible dep resolution (first reported https://github.com/firebase/firebase-functions/pull/1169) 2. Regenerate `package-lock.json`. Looks like it's "behind" package.json. I took this opportunity to use `lockfileVersion: 2` which is the default if you use `nodejs16` 3. Using `firebase-admin` v10.3.0 broke some unit test we had. Fixed in 2ee9549120ce0ec3a069c657d47c08c68ee1b53f. --- package-lock.json | 7302 ++++++++++++++++++++++----- package.json | 6 +- spec/common/providers/https.spec.ts | 2 +- spec/fixtures/mockrequest.ts | 2 +- 4 files changed, 5926 insertions(+), 1386 deletions(-) diff --git a/package-lock.json b/package-lock.json index 324031632..c778ba086 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,5779 @@ { "name": "firebase-functions", "version": "3.22.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "firebase-functions", + "version": "3.22.0", + "license": "MIT", + "dependencies": { + "@types/cors": "^2.8.5", + "@types/express": "4.17.3", + "cors": "^2.8.5", + "express": "^4.17.1", + "lodash": "^4.17.14", + "node-fetch": "^2.6.7" + }, + "bin": { + "firebase-functions": "lib/bin/firebase-functions.js" + }, + "devDependencies": { + "@firebase/api-documenter": "^0.1.2", + "@microsoft/api-documenter": "^7.13.45", + "@microsoft/api-extractor": "^7.18.7", + "@types/chai": "^4.1.7", + "@types/chai-as-promised": "^7.1.0", + "@types/jsonwebtoken": "^8.3.2", + "@types/lodash": "^4.14.135", + "@types/mocha": "^5.2.7", + "@types/mock-require": "^2.0.0", + "@types/nock": "^10.0.3", + "@types/node": "^8.10.50", + "@types/node-fetch": "^3.0.3", + "@types/sinon": "^7.0.13", + "api-extractor-model-me": "^0.1.1", + "chai": "^4.2.0", + "chai-as-promised": "^7.1.1", + "child-process-promise": "^2.2.1", + "firebase-admin": "^10.3.0", + "js-yaml": "^3.13.1", + "jsdom": "^16.2.1", + "jsonwebtoken": "^8.5.1", + "jwk-to-pem": "^2.0.5", + "mocha": "^6.1.4", + "mock-require": "^3.0.3", + "mz": "^2.7.0", + "nock": "^10.0.6", + "node-fetch": "^2.6.7", + "portfinder": "^1.0.28", + "prettier": "^1.18.2", + "semver": "^7.3.5", + "sinon": "^7.3.2", + "ts-node": "^10.4.0", + "tslint": "^5.18.0", + "tslint-config-prettier": "^1.18.0", + "tslint-no-unused-expression-chai": "^0.1.4", + "tslint-plugin-prettier": "^2.0.1", + "typedoc": "0.23.7", + "typescript": "^4.3.5", + "yargs": "^15.3.1" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + }, + "peerDependencies": { + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.16.7", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.16.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.17.9", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@cspotcode/source-map-consumer": { + "version": "0.8.0", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 12" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-consumer": "0.8.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@fastify/busboy": { + "version": "1.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "text-decoding": "^1.0.0" + }, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/@firebase/api-documenter": { + "version": "0.1.2", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0", + "@rushstack/ts-command-line": "4.7.8", + "api-extractor-model-me": "0.1.1", + "colors": "~1.2.1", + "js-yaml": "4.0.0", + "resolve": "~1.17.0", + "tslib": "^2.1.0" + }, + "bin": { + "api-documenter-fire": "dist/start.js" + } + }, + "node_modules/@firebase/api-documenter/node_modules/argparse": { + "version": "2.0.1", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/@firebase/api-documenter/node_modules/js-yaml": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@firebase/api-documenter/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@firebase/app-types": { + "version": "0.7.0", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/@firebase/auth-interop-types": { + "version": "0.1.6", + "dev": true, + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/component": { + "version": "0.5.17", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@firebase/util": "1.6.3", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/database": { + "version": "0.13.3", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth-interop-types": "0.1.6", + "@firebase/component": "0.5.17", + "@firebase/logger": "0.3.3", + "@firebase/util": "1.6.3", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/database-compat": { + "version": "0.2.3", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.5.17", + "@firebase/database": "0.13.3", + "@firebase/database-types": "0.9.11", + "@firebase/logger": "0.3.3", + "@firebase/util": "1.6.3", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/database-types": { + "version": "0.9.11", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-types": "0.7.0", + "@firebase/util": "1.6.3" + } + }, + "node_modules/@firebase/logger": { + "version": "0.3.3", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/util": { + "version": "1.6.3", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@google-cloud/firestore": { + "version": "4.15.1", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "functional-red-black-tree": "^1.0.1", + "google-gax": "^2.24.1", + "protobufjs": "^6.8.6" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@google-cloud/paginator": { + "version": "3.0.7", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "extend": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/projectify": { + "version": "2.1.1", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/promisify": { + "version": "2.0.4", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage": { + "version": "5.20.5", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@google-cloud/paginator": "^3.0.7", + "@google-cloud/projectify": "^2.0.0", + "@google-cloud/promisify": "^2.0.0", + "abort-controller": "^3.0.0", + "arrify": "^2.0.0", + "async-retry": "^1.3.3", + "compressible": "^2.0.12", + "configstore": "^5.0.0", + "duplexify": "^4.0.0", + "ent": "^2.2.0", + "extend": "^3.0.2", + "gaxios": "^4.0.0", + "google-auth-library": "^7.14.1", + "hash-stream-validation": "^0.2.2", + "mime": "^3.0.0", + "mime-types": "^2.0.8", + "p-limit": "^3.0.1", + "pumpify": "^2.0.0", + "retry-request": "^4.2.2", + "stream-events": "^1.0.4", + "teeny-request": "^7.1.3", + "uuid": "^8.0.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@google-cloud/storage/node_modules/mime": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@grpc/grpc-js": { + "version": "1.6.7", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@grpc/proto-loader": "^0.6.4", + "@types/node": ">=12.12.47" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + } + }, + "node_modules/@grpc/grpc-js/node_modules/@types/node": { + "version": "18.0.4", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/@grpc/proto-loader": { + "version": "0.6.13", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^6.11.3", + "yargs": "^16.2.0" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@grpc/proto-loader/node_modules/yargs": { + "version": "16.2.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@microsoft/api-documenter": { + "version": "7.17.11", + "dev": true, + "license": "MIT", + "dependencies": { + "@microsoft/api-extractor-model": "7.17.2", + "@microsoft/tsdoc": "0.14.1", + "@rushstack/node-core-library": "3.45.4", + "@rushstack/ts-command-line": "4.10.10", + "colors": "~1.2.1", + "js-yaml": "~3.13.1", + "resolve": "~1.17.0" + }, + "bin": { + "api-documenter": "bin/api-documenter" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/@microsoft/tsdoc": { + "version": "0.14.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-documenter/node_modules/@rushstack/node-core-library": { + "version": "3.45.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/@rushstack/ts-command-line": { + "version": "4.10.10", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/@types/node": { + "version": "12.20.24", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-documenter/node_modules/js-yaml": { + "version": "3.13.1", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/validator": { + "version": "13.7.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/@microsoft/api-documenter/node_modules/z-schema": { + "version": "5.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + }, + "bin": { + "z-schema": "bin/z-schema" + }, + "engines": { + "node": ">=8.0.0" + }, + "optionalDependencies": { + "commander": "^2.20.3" + } + }, + "node_modules/@microsoft/api-extractor": { + "version": "7.23.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@microsoft/api-extractor-model": "7.17.2", + "@microsoft/tsdoc": "0.14.1", + "@microsoft/tsdoc-config": "~0.16.1", + "@rushstack/node-core-library": "3.45.4", + "@rushstack/rig-package": "0.3.11", + "@rushstack/ts-command-line": "4.10.10", + "colors": "~1.2.1", + "lodash": "~4.17.15", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "source-map": "~0.6.1", + "typescript": "~4.6.3" + }, + "bin": { + "api-extractor": "bin/api-extractor" + } + }, + "node_modules/@microsoft/api-extractor-model": { + "version": "7.17.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@microsoft/tsdoc": "0.14.1", + "@microsoft/tsdoc-config": "~0.16.1", + "@rushstack/node-core-library": "3.45.4" + } + }, + "node_modules/@microsoft/api-extractor-model/node_modules/@microsoft/tsdoc": { + "version": "0.14.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-extractor-model/node_modules/@rushstack/node-core-library": { + "version": "3.45.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "node_modules/@microsoft/api-extractor-model/node_modules/@types/node": { + "version": "12.20.24", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-extractor-model/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@microsoft/api-extractor-model/node_modules/validator": { + "version": "13.7.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/@microsoft/api-extractor-model/node_modules/z-schema": { + "version": "5.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + }, + "bin": { + "z-schema": "bin/z-schema" + }, + "engines": { + "node": ">=8.0.0" + }, + "optionalDependencies": { + "commander": "^2.20.3" + } + }, + "node_modules/@microsoft/api-extractor/node_modules/@microsoft/tsdoc": { + "version": "0.14.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-extractor/node_modules/@rushstack/node-core-library": { + "version": "3.45.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "node_modules/@microsoft/api-extractor/node_modules/@rushstack/ts-command-line": { + "version": "4.10.10", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "node_modules/@microsoft/api-extractor/node_modules/@types/node": { + "version": "12.20.24", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/api-extractor/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@microsoft/api-extractor/node_modules/validator": { + "version": "13.7.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/@microsoft/api-extractor/node_modules/z-schema": { + "version": "5.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" + }, + "bin": { + "z-schema": "bin/z-schema" + }, + "engines": { + "node": ">=8.0.0" + }, + "optionalDependencies": { + "commander": "^2.20.3" + } + }, + "node_modules/@microsoft/tsdoc": { + "version": "0.12.24", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/tsdoc-config": { + "version": "0.16.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@microsoft/tsdoc": "0.14.1", + "ajv": "~6.12.6", + "jju": "~1.4.0", + "resolve": "~1.19.0" + } + }, + "node_modules/@microsoft/tsdoc-config/node_modules/@microsoft/tsdoc": { + "version": "0.14.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@microsoft/tsdoc-config/node_modules/resolve": { + "version": "1.19.0", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@panva/asn1.js": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "dev": true, + "license": "BSD-3-Clause", + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "dev": true, + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@rushstack/node-core-library": { + "version": "3.36.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "10.17.13", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~3.18.3" + } + }, + "node_modules/@rushstack/node-core-library/node_modules/@types/node": { + "version": "10.17.13", + "dev": true, + "license": "MIT" + }, + "node_modules/@rushstack/node-core-library/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@rushstack/rig-package": { + "version": "0.3.11", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "~1.17.0", + "strip-json-comments": "~3.1.1" + } + }, + "node_modules/@rushstack/rig-package/node_modules/resolve": { + "version": "1.17.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@rushstack/rig-package/node_modules/strip-json-comments": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@rushstack/ts-command-line": { + "version": "4.7.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/formatio": { + "version": "3.2.2", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "3.3.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.1", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/argparse": { + "version": "1.0.38", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/body-parser": { + "version": "1.19.2", + "license": "MIT", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/body-parser/node_modules/@types/node": { + "version": "17.0.29", + "license": "MIT" + }, + "node_modules/@types/chai": { + "version": "4.3.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/chai-as-promised": { + "version": "7.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/chai": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.35", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect/node_modules/@types/node": { + "version": "17.0.29", + "license": "MIT" + }, + "node_modules/@types/cors": { + "version": "2.8.12", + "license": "MIT" + }, + "node_modules/@types/express": { + "version": "4.17.3", + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.17.28", + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "node_modules/@types/express-serve-static-core/node_modules/@types/node": { + "version": "17.0.29", + "license": "MIT" + }, + "node_modules/@types/jsonwebtoken": { + "version": "8.5.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/lodash": { + "version": "4.14.182", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/long": { + "version": "4.0.2", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/@types/mime": { + "version": "1.3.2", + "license": "MIT" + }, + "node_modules/@types/mocha": { + "version": "5.2.7", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/mock-require": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/nock": { + "version": "10.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "8.10.66", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node-fetch": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "node-fetch": "*" + } + }, + "node_modules/@types/qs": { + "version": "6.9.7", + "license": "MIT" + }, + "node_modules/@types/range-parser": { + "version": "1.2.4", + "license": "MIT" + }, + "node_modules/@types/serve-static": { + "version": "1.13.10", + "license": "MIT", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/serve-static/node_modules/@types/node": { + "version": "17.0.29", + "license": "MIT" + }, + "node_modules/@types/sinon": { + "version": "7.5.2", + "dev": true, + "license": "MIT" + }, + "node_modules/abab": { + "version": "2.0.6", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "8.7.1", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/ajv": { + "version": "6.12.6", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "3.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/any-promise": { + "version": "1.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/api-extractor-model-me": { + "version": "0.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@microsoft/tsdoc": "0.12.24", + "@rushstack/node-core-library": "3.36.0" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "license": "MIT" + }, + "node_modules/array-from": { + "version": "2.1.1", + "dev": true, + "license": "MIT" + }, + "node_modules/arrify": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asn1.js": { + "version": "5.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/async": { + "version": "2.6.4", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/async-retry": { + "version": "1.3.3", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "retry": "0.13.1" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "optional": true + }, + "node_modules/bignumber.js": { + "version": "9.0.2", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/bn.js": { + "version": "4.12.0", + "dev": true, + "license": "MIT" + }, + "node_modules/body-parser": { + "version": "1.20.0", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "dev": true, + "license": "ISC" + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/builtin-modules": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chai": { + "version": "4.3.6", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "loupe": "^2.3.1", + "pathval": "^1.1.1", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.1", + "dev": true, + "license": "WTFPL", + "dependencies": { + "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 5" + } + }, + "node_modules/chalk": { + "version": "2.4.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/ansi-styles": { + "version": "3.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/color-convert": { + "version": "1.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/chalk/node_modules/color-name": { + "version": "1.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "5.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/check-error": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/child-process-promise": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^4.0.2", + "node-version": "^1.0.0", + "promise-polyfill": "^6.0.1" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/colors": { + "version": "1.2.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "dev": true, + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.20.3", + "dev": true, + "license": "MIT" + }, + "node_modules/compressible": { + "version": "2.0.18", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/configstore": { + "version": "5.0.1", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "dependencies": { + "dot-prop": "^5.2.0", + "graceful-fs": "^4.1.2", + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.5.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "license": "MIT" + }, + "node_modules/cors": { + "version": "2.8.5", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "4.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "dev": true, + "license": "MIT" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "dev": true, + "license": "MIT" + }, + "node_modules/data-urls": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/data-urls/node_modules/tr46": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/data-urls/node_modules/webidl-conversions": { + "version": "6.1.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "8.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/debug": { + "version": "2.6.9", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.3.1", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-eql": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/deep-equal": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/define-properties": { + "version": "1.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/diff": { + "version": "3.5.0", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/domexception": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/duplexify": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "end-of-stream": "^1.4.1", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1", + "stream-shift": "^1.0.0" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "license": "MIT" + }, + "node_modules/elliptic": { + "version": "6.5.4", + "dev": true, + "license": "MIT", + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/ent": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/es-abstract": { + "version": "1.19.5", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-abstract/node_modules/object.assign": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "license": "MIT" + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.0.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "2.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" + }, + "engines": { + "node": ">=4.0.0" + }, + "peerDependencies": { + "prettier": ">= 0.11.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/express": { + "version": "4.18.0", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-diff": { + "version": "1.2.0", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-text-encoding": { + "version": "1.0.4", + "dev": true, + "license": "Apache-2.0", + "optional": true + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/finalhandler": { + "version": "1.2.0", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/find-up": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/firebase-admin": { + "version": "10.3.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@fastify/busboy": "^1.1.0", + "@firebase/database-compat": "^0.2.0", + "@firebase/database-types": "^0.9.7", + "@types/node": ">=12.12.47", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^2.0.2", + "node-forge": "^1.3.1", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=12.7.0" + }, + "optionalDependencies": { + "@google-cloud/firestore": "^4.15.1", + "@google-cloud/storage": "^5.18.3" + } + }, + "node_modules/firebase-admin/node_modules/@types/node": { + "version": "18.0.4", + "dev": true, + "license": "MIT" + }, + "node_modules/flat": { + "version": "4.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "is-buffer": "~2.0.3" + }, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/form-data": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs-extra": { + "version": "7.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.1", + "license": "MIT" + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gaxios": { + "version": "4.3.3", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "abort-controller": "^3.0.0", + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.6.7" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gcp-metadata": { + "version": "4.3.1", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.1.1", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.1.3", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/google-auth-library": { + "version": "7.14.1", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "arrify": "^2.0.0", + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "fast-text-encoding": "^1.0.0", + "gaxios": "^4.0.0", + "gcp-metadata": "^4.2.0", + "gtoken": "^5.0.4", + "jws": "^4.0.0", + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/google-gax": { + "version": "2.30.5", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@grpc/grpc-js": "~1.6.0", + "@grpc/proto-loader": "^0.6.12", + "@types/long": "^4.0.0", + "abort-controller": "^3.0.0", + "duplexify": "^4.0.0", + "fast-text-encoding": "^1.0.3", + "google-auth-library": "^7.14.0", + "is-stream-ended": "^0.1.4", + "node-fetch": "^2.6.1", + "object-hash": "^3.0.0", + "proto3-json-serializer": "^0.1.8", + "protobufjs": "6.11.3", + "retry-request": "^4.0.0" + }, + "bin": { + "compileProtos": "build/tools/compileProtos.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-p12-pem": { + "version": "3.1.4", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "node-forge": "^1.3.1" + }, + "bin": { + "gp12-pem": "build/src/bin/gp12-pem.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "dev": true, + "license": "ISC" + }, + "node_modules/growl": { + "version": "1.10.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x" + } + }, + "node_modules/gtoken": { + "version": "5.3.2", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "gaxios": "^4.0.0", + "google-p12-pem": "^3.1.3", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/has": { + "version": "1.0.3", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hash-stream-validation": { + "version": "0.2.4", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/hash.js": { + "version": "1.1.7", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/he": { + "version": "1.2.0", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-parser-js": { + "version": "0.5.8", + "dev": true, + "license": "MIT" + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/import-lazy": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "license": "ISC" + }, + "node_modules/internal-slot": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-buffer": { + "version": "2.0.5", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/is-callable": { + "version": "1.2.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.9.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-stream-ended": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/is-string": { + "version": "1.0.7", + "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "0.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/jest-docblock": { + "version": "21.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/jju": { + "version": "1.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/jose": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@panva/asn1.js": "^1.0.0" + }, + "engines": { + "node": ">=10.13.0 < 13 || >=13.7.0" + }, + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "16.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/@tootallnate/once": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/jsdom/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/http-proxy-agent": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jsdom/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jsdom/node_modules/webidl-conversions": { + "version": "6.1.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "8.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/json-bigint": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "bignumber.js": "^9.0.0" + } + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "dev": true, + "license": "ISC" + }, + "node_modules/jsonc-parser": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", + "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==", + "dev": true + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsonwebtoken/node_modules/jwa": { + "version": "1.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jsonwebtoken/node_modules/jws": { + "version": "3.2.2", + "dev": true, + "license": "MIT", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jsonwebtoken/node_modules/ms": { + "version": "2.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/just-extend": { + "version": "4.2.1", + "dev": true, + "license": "MIT" + }, + "node_modules/jwa": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwk-to-pem": { + "version": "2.0.5", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwks-rsa": { + "version": "2.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "^4.17.13", + "@types/jsonwebtoken": "^8.5.8", + "debug": "^4.3.4", + "jose": "^2.0.5", + "limiter": "^1.1.5", + "lru-memoizer": "^2.1.4" + }, + "engines": { + "node": ">=10 < 13 || >=14" + } + }, + "node_modules/jwks-rsa/node_modules/@types/express": { + "version": "4.17.13", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.18", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "node_modules/jwks-rsa/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/jwks-rsa/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/jws": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/limiter": { + "version": "1.1.5", + "dev": true + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "dev": true, + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "license": "MIT" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/lolex": { + "version": "4.2.0", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/long": { + "version": "4.0.0", + "dev": true, + "license": "Apache-2.0", + "optional": true + }, + "node_modules/loupe": { + "version": "2.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.0" + } + }, + "node_modules/lru-cache": { + "version": "4.1.5", + "dev": true, + "license": "ISC", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/lru-memoizer": { + "version": "2.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "~4.0.0" + } + }, + "node_modules/lru-memoizer/node_modules/lru-cache": { + "version": "4.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" + } + }, + "node_modules/lunr": { + "version": "2.3.9", + "dev": true, + "license": "MIT" + }, + "node_modules/make-dir": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "dev": true, + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "dev": true, + "license": "ISC" + }, + "node_modules/marked": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz", + "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==", + "dev": true, + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "license": "MIT" + }, + "node_modules/methods": { + "version": "1.1.2", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "dev": true, + "license": "ISC" + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/minimatch": { + "version": "3.0.4", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "dev": true, + "license": "MIT" + }, + "node_modules/mkdirp": { + "version": "0.5.4", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha": { + "version": "6.2.3", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "3.2.3", + "browser-stdout": "1.3.1", + "debug": "3.2.6", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "find-up": "3.0.0", + "glob": "7.1.3", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.13.1", + "log-symbols": "2.2.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.4", + "ms": "2.1.1", + "node-environment-flags": "1.0.5", + "object.assign": "4.1.0", + "strip-json-comments": "2.0.1", + "supports-color": "6.0.0", + "which": "1.3.1", + "wide-align": "1.1.3", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/mocha/node_modules/ansi-regex": { + "version": "4.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/ansi-styles": { + "version": "3.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/cliui": { + "version": "5.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/mocha/node_modules/color-convert": { + "version": "1.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/mocha/node_modules/color-name": { + "version": "1.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/debug": { + "version": "3.2.6", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/mocha/node_modules/emoji-regex": { + "version": "7.0.3", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "3.13.1", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.1", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/string-width": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/strip-ansi": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "5.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/y18n": { + "version": "4.0.3", + "dev": true, + "license": "ISC" + }, + "node_modules/mocha/node_modules/yargs": { + "version": "13.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/mocha/node_modules/yargs-parser": { + "version": "13.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/mock-require": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "get-caller-file": "^1.0.2", + "normalize-path": "^2.1.1" + }, + "engines": { + "node": ">=4.3.0" + } + }, + "node_modules/mock-require/node_modules/get-caller-file": { + "version": "1.0.3", + "dev": true, + "license": "ISC" + }, + "node_modules/ms": { + "version": "2.0.0", + "license": "MIT" + }, + "node_modules/mz": { + "version": "2.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "node_modules/negotiator": { + "version": "0.6.3", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/nise": { + "version": "1.5.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^5.0.1", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/nise/node_modules/lolex": { + "version": "5.1.2", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/nise/node_modules/path-to-regexp": { + "version": "1.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/nock": { + "version": "10.0.6", + "dev": true, + "license": "MIT", + "dependencies": { + "chai": "^4.1.2", + "debug": "^4.1.0", + "deep-equal": "^1.0.0", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.5", + "mkdirp": "^0.5.0", + "propagate": "^1.0.0", + "qs": "^6.5.1", + "semver": "^5.5.0" + }, + "engines": { + "node": ">= 6.0" + } + }, + "node_modules/nock/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/nock/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/nock/node_modules/semver": { + "version": "5.7.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-environment-flags": { + "version": "1.0.5", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + } + }, + "node_modules/node-environment-flags/node_modules/semver": { + "version": "5.7.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-forge": { + "version": "1.3.1", + "dev": true, + "license": "(BSD-3-Clause OR GPL-2.0)", + "engines": { + "node": ">= 6.13.0" + } + }, + "node_modules/node-version": { + "version": "1.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/normalize-path": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nwsapi": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/object-assign": { + "version": "4.1.1", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.12.0", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.getownpropertydescriptors": { + "version": "2.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/parseurl": { + "version": "1.3.3", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "dev": true, + "license": "MIT" + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "license": "MIT" + }, + "node_modules/pathval": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/portfinder": { + "version": "1.0.28", + "dev": true, + "license": "MIT", + "dependencies": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "engines": { + "node": ">= 0.12.0" + } + }, + "node_modules/portfinder/node_modules/debug": { + "version": "3.2.7", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/portfinder/node_modules/mkdirp": { + "version": "0.5.6", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/portfinder/node_modules/ms": { + "version": "2.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "1.19.1", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/promise-polyfill": { + "version": "6.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/propagate": { + "version": "1.0.0", + "dev": true, + "engines": [ + "node >= 0.8.1" + ], + "license": "MIT" + }, + "node_modules/proto3-json-serializer": { + "version": "0.1.9", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "protobufjs": "^6.11.2" + } + }, + "node_modules/protobufjs": { + "version": "6.11.3", + "dev": true, + "hasInstallScript": true, + "license": "BSD-3-Clause", + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": ">=13.7.0", + "long": "^4.0.0" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + } + }, + "node_modules/protobufjs/node_modules/@types/node": { + "version": "18.0.4", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "dev": true, + "license": "ISC" + }, + "node_modules/psl": { + "version": "1.8.0", + "dev": true, + "license": "MIT" + }, + "node_modules/pump": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "duplexify": "^4.1.1", + "inherits": "^2.0.3", + "pump": "^3.0.0" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.10.3", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.1", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.4.3", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/remove-trailing-separator": { + "version": "1.1.0", + "dev": true, + "license": "ISC" + }, + "node_modules/require-directory": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/resolve": { + "version": "1.22.0", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/retry": { + "version": "0.13.1", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/retry-request": { + "version": "4.2.2", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "debug": "^4.1.1", + "extend": "^3.0.2" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/retry-request/node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/retry-request/node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "license": "MIT" + }, + "node_modules/saxes": { + "version": "5.0.1", + "dev": true, + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "7.3.7", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/send": { + "version": "0.18.0", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.15.0", + "license": "MIT", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "license": "ISC" + }, + "node_modules/shiki": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", + "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", + "dev": true, + "dependencies": { + "jsonc-parser": "^3.0.0", + "vscode-oniguruma": "^1.6.1", + "vscode-textmate": "5.2.0" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "dev": true, + "license": "ISC", + "optional": true + }, + "node_modules/sinon": { + "version": "7.5.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "5.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/statuses": { + "version": "2.0.1", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/stream-events": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "stubs": "^3.0.0" + } + }, + "node_modules/stream-shift": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-argv": { + "version": "0.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6.19" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stubs": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/supports-color": { + "version": "6.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "dev": true, + "license": "MIT" + }, + "node_modules/teeny-request": { + "version": "7.2.0", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "stream-events": "^1.0.5", + "uuid": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/text-decoding": { + "version": "1.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/thenify": { + "version": "3.3.1", + "dev": true, + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "dev": true, + "license": "MIT", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/timsort": { + "version": "0.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tough-cookie": { + "version": "4.0.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "dev": true, + "license": "MIT" + }, + "node_modules/ts-node": { + "version": "10.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.0", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/acorn-walk": { + "version": "8.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.4.0", + "dev": true, + "license": "0BSD" + }, + "node_modules/tslint": { + "version": "5.20.1", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^4.0.1", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, + "bin": { + "tslint": "bin/tslint" + }, + "engines": { + "node": ">=4.8.0" + }, + "peerDependencies": { + "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" + } + }, + "node_modules/tslint-config-prettier": { + "version": "1.18.0", + "dev": true, + "license": "MIT", + "bin": { + "tslint-config-prettier-check": "bin/check.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/tslint-no-unused-expression-chai": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "tsutils": "^3.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "tslint": ">=5.1.0" + } + }, + "node_modules/tslint-no-unused-expression-chai/node_modules/tslib": { + "version": "1.14.1", + "dev": true, + "license": "0BSD" + }, + "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": { + "version": "3.21.0", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tslint-plugin-prettier": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-plugin-prettier": "^2.2.0", + "lines-and-columns": "^1.1.6", + "tslib": "^1.7.1" + }, + "engines": { + "node": ">= 4" + }, + "peerDependencies": { + "prettier": "^1.9.0 || ^2.0.0", + "tslint": "^5.0.0 || ^6.0.0" + } + }, + "node_modules/tslint-plugin-prettier/node_modules/tslib": { + "version": "1.14.1", + "dev": true, + "license": "0BSD" + }, + "node_modules/tslint/node_modules/diff": { + "version": "4.0.2", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslint/node_modules/semver": { + "version": "5.7.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/tslint/node_modules/tslib": { + "version": "1.14.1", + "dev": true, + "license": "0BSD" + }, + "node_modules/tsutils": { + "version": "2.29.0", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^1.8.1" + }, + "peerDependencies": { + "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "dev": true, + "license": "0BSD" + }, + "node_modules/type-check": { + "version": "0.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typedoc": { + "version": "0.23.7", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.7.tgz", + "integrity": "sha512-Vl/Yh4KYBaxQQOYImBgLQDX61hfaA7XaP/DZVd/w7rQvaqLEsdQH6gEMK8CMjyHo0bSzVnNYwxtD1KPSENoWug==", + "dev": true, + "dependencies": { + "lunr": "^2.3.9", + "marked": "^4.0.16", + "minimatch": "^5.1.0", + "shiki": "^0.10.1" + }, + "bin": { + "typedoc": "bin/typedoc" + }, + "engines": { + "node": ">= 14.14" + }, + "peerDependencies": { + "typescript": "4.6.x || 4.7.x" + } + }, + "node_modules/typedoc/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/typedoc/node_modules/minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/typescript": { + "version": "4.6.3", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/universalify": { + "version": "0.1.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/validator": { + "version": "8.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/vscode-oniguruma": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", + "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==", + "dev": true + }, + "node_modules/vscode-textmate": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", + "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", + "dev": true + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "1.3.1", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-module": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/wide-align": { + "version": "1.1.3", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "dev": true, + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.5.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/y18n": { + "version": "5.0.8", + "dev": true, + "license": "ISC", + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "2.1.2", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs": { + "version": "15.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "dev": true, + "license": "ISC", + "optional": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "1.6.0", + "dev": true, + "license": "MIT", + "dependencies": { + "flat": "^4.1.0", + "lodash": "^4.17.15", + "yargs": "^13.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/ansi-regex": { + "version": "4.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/ansi-styles": { + "version": "3.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs-unparser/node_modules/cliui": { + "version": "5.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/yargs-unparser/node_modules/color-convert": { + "version": "1.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/yargs-unparser/node_modules/color-name": { + "version": "1.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs-unparser/node_modules/emoji-regex": { + "version": "7.0.3", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs-unparser/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs-unparser/node_modules/string-width": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/strip-ansi": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/wrap-ansi": { + "version": "5.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs-unparser/node_modules/y18n": { + "version": "4.0.3", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs-unparser/node_modules/yargs": { + "version": "13.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/yargs-unparser/node_modules/yargs-parser": { + "version": "13.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/yargs/node_modules/find-up": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/p-limit": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/wrap-ansi": { + "version": "6.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/y18n": { + "version": "4.0.3", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "18.1.3", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/z-schema": { + "version": "3.18.4", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.get": "^4.0.0", + "lodash.isequal": "^4.0.0", + "validator": "^8.0.0" + }, + "bin": { + "z-schema": "bin/z-schema" + }, + "optionalDependencies": { + "commander": "^2.7.1" + } + } + }, "dependencies": { "@babel/code-frame": { "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", "dev": true, "requires": { "@babel/highlight": "^7.16.7" @@ -15,14 +5781,10 @@ }, "@babel/helper-validator-identifier": { "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", "dev": true }, "@babel/highlight": { "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", - "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.16.7", @@ -32,23 +5794,24 @@ }, "@cspotcode/source-map-consumer": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", - "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", "dev": true }, "@cspotcode/source-map-support": { "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", - "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", "dev": true, "requires": { "@cspotcode/source-map-consumer": "0.8.0" } }, + "@fastify/busboy": { + "version": "1.1.0", + "dev": true, + "requires": { + "text-decoding": "^1.0.0" + } + }, "@firebase/api-documenter": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@firebase/api-documenter/-/api-documenter-0.1.2.tgz", - "integrity": "sha512-aDofRZebqbMzrbo5WAi9f21qUTzhIub7yOszirik3AwujqOzcUr1F7lIFrI41686JD1Zw56lLL/B5EWZTwvVjA==", "dev": true, "requires": { "@microsoft/tsdoc": "0.12.24", @@ -63,14 +5826,10 @@ "dependencies": { "argparse": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, "js-yaml": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -78,8 +5837,6 @@ }, "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -89,77 +5846,62 @@ }, "@firebase/app-types": { "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", - "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==", "dev": true }, "@firebase/auth-interop-types": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", - "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==", - "dev": true + "dev": true, + "requires": {} }, "@firebase/component": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.13.tgz", - "integrity": "sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w==", + "version": "0.5.17", "dev": true, "requires": { - "@firebase/util": "1.5.2", + "@firebase/util": "1.6.3", "tslib": "^2.1.0" } }, "@firebase/database": { - "version": "0.12.8", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.8.tgz", - "integrity": "sha512-JBQVfFLzfhxlQbl4OU6ov9fdsddkytBQdtSSR49cz48homj38ccltAhK6seum+BI7f28cV2LFHF9672lcN+qxA==", + "version": "0.13.3", "dev": true, "requires": { "@firebase/auth-interop-types": "0.1.6", - "@firebase/component": "0.5.13", - "@firebase/logger": "0.3.2", - "@firebase/util": "1.5.2", + "@firebase/component": "0.5.17", + "@firebase/logger": "0.3.3", + "@firebase/util": "1.6.3", "faye-websocket": "0.11.4", "tslib": "^2.1.0" } }, "@firebase/database-compat": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.8.tgz", - "integrity": "sha512-dhXr5CSieBuKNdU96HgeewMQCT9EgOIkfF1GNy+iRrdl7BWLxmlKuvLfK319rmIytSs/vnCzcD9uqyxTeU/A3A==", + "version": "0.2.3", "dev": true, "requires": { - "@firebase/component": "0.5.13", - "@firebase/database": "0.12.8", - "@firebase/database-types": "0.9.7", - "@firebase/logger": "0.3.2", - "@firebase/util": "1.5.2", + "@firebase/component": "0.5.17", + "@firebase/database": "0.13.3", + "@firebase/database-types": "0.9.11", + "@firebase/logger": "0.3.3", + "@firebase/util": "1.6.3", "tslib": "^2.1.0" } }, "@firebase/database-types": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.7.tgz", - "integrity": "sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw==", + "version": "0.9.11", "dev": true, "requires": { "@firebase/app-types": "0.7.0", - "@firebase/util": "1.5.2" + "@firebase/util": "1.6.3" } }, "@firebase/logger": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.2.tgz", - "integrity": "sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==", + "version": "0.3.3", "dev": true, "requires": { "tslib": "^2.1.0" } }, "@firebase/util": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.5.2.tgz", - "integrity": "sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw==", + "version": "1.6.3", "dev": true, "requires": { "tslib": "^2.1.0" @@ -167,8 +5909,6 @@ }, "@google-cloud/firestore": { "version": "4.15.1", - "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.15.1.tgz", - "integrity": "sha512-2PWsCkEF1W02QbghSeRsNdYKN1qavrHBP3m72gPDMHQSYrGULOaTi7fSJquQmAtc4iPVB2/x6h80rdLHTATQtA==", "dev": true, "optional": true, "requires": { @@ -180,8 +5920,6 @@ }, "@google-cloud/paginator": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz", - "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==", "dev": true, "optional": true, "requires": { @@ -191,22 +5929,16 @@ }, "@google-cloud/projectify": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz", - "integrity": "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ==", "dev": true, "optional": true }, "@google-cloud/promisify": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz", - "integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA==", "dev": true, "optional": true }, "@google-cloud/storage": { - "version": "5.19.4", - "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.19.4.tgz", - "integrity": "sha512-Jz7ugcPHhsEmMVvIxM9uoBsdEbKIYwDkh3u07tifsIymEWs47F4/D6+/Tv/W7kLhznqjyOjVJ/0frtBeIC0lJA==", + "version": "5.20.5", "dev": true, "optional": true, "requires": { @@ -218,12 +5950,10 @@ "async-retry": "^1.3.3", "compressible": "^2.0.12", "configstore": "^5.0.0", - "date-and-time": "^2.0.0", "duplexify": "^4.0.0", "ent": "^2.2.0", "extend": "^3.0.2", "gaxios": "^4.0.0", - "get-stream": "^6.0.0", "google-auth-library": "^7.14.1", "hash-stream-validation": "^0.2.2", "mime": "^3.0.0", @@ -231,16 +5961,14 @@ "p-limit": "^3.0.1", "pumpify": "^2.0.0", "retry-request": "^4.2.2", - "snakeize": "^0.1.0", "stream-events": "^1.0.4", "teeny-request": "^7.1.3", + "uuid": "^8.0.0", "xdg-basedir": "^4.0.0" }, "dependencies": { "mime": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", "dev": true, "optional": true } @@ -248,8 +5976,6 @@ }, "@grpc/grpc-js": { "version": "1.6.7", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.7.tgz", - "integrity": "sha512-eBM03pu9hd3VqDQG+kHahiG1x80RGkkqqRb1Pchcwqej/KkAH95gAvKs6laqaHCycYaPK+TKuNQnOz9UXYA8qw==", "dev": true, "optional": true, "requires": { @@ -258,32 +5984,26 @@ }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", + "version": "18.0.4", "dev": true, "optional": true } } }, "@grpc/proto-loader": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.9.tgz", - "integrity": "sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg==", + "version": "0.6.13", "dev": true, "optional": true, "requires": { "@types/long": "^4.0.1", "lodash.camelcase": "^4.3.0", "long": "^4.0.0", - "protobufjs": "^6.10.0", + "protobufjs": "^6.11.3", "yargs": "^16.2.0" }, "dependencies": { "yargs": { "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "optional": true, "requires": { @@ -300,8 +6020,6 @@ }, "@microsoft/api-documenter": { "version": "7.17.11", - "resolved": "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.17.11.tgz", - "integrity": "sha512-VdCu4eG5RISGEiG/hFO3jaN3gEgMZVXZRFpch/PQzrLO3Vh2QhZTz2LsZ2SYyb7UwBZCK9Z76ULv5cGoflylNA==", "dev": true, "requires": { "@microsoft/api-extractor-model": "7.17.2", @@ -315,14 +6033,10 @@ "dependencies": { "@microsoft/tsdoc": { "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", - "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", "dev": true }, "@rushstack/node-core-library": { "version": "3.45.4", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", - "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", "dev": true, "requires": { "@types/node": "12.20.24", @@ -338,8 +6052,6 @@ }, "@rushstack/ts-command-line": { "version": "4.10.10", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.10.tgz", - "integrity": "sha512-F+MH7InPDXqX40qvvcEsnvPpmg566SBpfFqj2fcCh8RjM6AyOoWlXc8zx7giBD3ZN85NVAEjZAgrcLU0z+R2yg==", "dev": true, "requires": { "@types/argparse": "1.0.38", @@ -350,14 +6062,10 @@ }, "@types/node": { "version": "12.20.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", - "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", "dev": true }, "js-yaml": { "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -366,8 +6074,6 @@ }, "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -375,14 +6081,10 @@ }, "validator": { "version": "13.7.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", - "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", "dev": true }, "z-schema": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", - "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", "dev": true, "requires": { "commander": "^2.20.3", @@ -395,8 +6097,6 @@ }, "@microsoft/api-extractor": { "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.23.0.tgz", - "integrity": "sha512-fbdX05RVE1EMA7nvyRHuS9nx1pryhjgURDx6pQlE/9yOXQ5PO7MpYdfWGaRsQwyYuU3+tPxgro819c0R3AK6KA==", "dev": true, "requires": { "@microsoft/api-extractor-model": "7.17.2", @@ -415,14 +6115,10 @@ "dependencies": { "@microsoft/tsdoc": { "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", - "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", "dev": true }, "@rushstack/node-core-library": { "version": "3.45.4", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", - "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", "dev": true, "requires": { "@types/node": "12.20.24", @@ -438,8 +6134,6 @@ }, "@rushstack/ts-command-line": { "version": "4.10.10", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.10.10.tgz", - "integrity": "sha512-F+MH7InPDXqX40qvvcEsnvPpmg566SBpfFqj2fcCh8RjM6AyOoWlXc8zx7giBD3ZN85NVAEjZAgrcLU0z+R2yg==", "dev": true, "requires": { "@types/argparse": "1.0.38", @@ -450,14 +6144,10 @@ }, "@types/node": { "version": "12.20.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", - "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", "dev": true }, "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -465,14 +6155,10 @@ }, "validator": { "version": "13.7.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", - "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", "dev": true }, "z-schema": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", - "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", "dev": true, "requires": { "commander": "^2.20.3", @@ -485,8 +6171,6 @@ }, "@microsoft/api-extractor-model": { "version": "7.17.2", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.17.2.tgz", - "integrity": "sha512-fYfCeBeLm7jnZligC64qHiH4/vzswFLDfyPpX+uKO36OI2kIeMHrYG0zaezmuinKvE4vg1dAz38zZeDbPvBKGg==", "dev": true, "requires": { "@microsoft/tsdoc": "0.14.1", @@ -496,14 +6180,10 @@ "dependencies": { "@microsoft/tsdoc": { "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", - "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", "dev": true }, "@rushstack/node-core-library": { "version": "3.45.4", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.4.tgz", - "integrity": "sha512-FMoEQWjK7nWAO2uFgV1eVpVhY9ZDGOdIIomi9zTej64cKJ+8/Nvu+ny0xKaUDEjw/ALftN2D2ml7L0RDpW/Z9g==", "dev": true, "requires": { "@types/node": "12.20.24", @@ -519,14 +6199,10 @@ }, "@types/node": { "version": "12.20.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", - "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", "dev": true }, "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -534,14 +6210,10 @@ }, "validator": { "version": "13.7.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", - "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", "dev": true }, "z-schema": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", - "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", "dev": true, "requires": { "commander": "^2.20.3", @@ -554,14 +6226,10 @@ }, "@microsoft/tsdoc": { "version": "0.12.24", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz", - "integrity": "sha512-Mfmij13RUTmHEMi9vRUhMXD7rnGR2VvxeNYtaGtaJ4redwwjT4UXYJ+nzmVJF7hhd4pn/Fx5sncDKxMVFJSWPg==", "dev": true }, "@microsoft/tsdoc-config": { "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.1.tgz", - "integrity": "sha512-2RqkwiD4uN6MLnHFljqBlZIXlt/SaUT6cuogU1w2ARw4nKuuppSmR0+s+NC+7kXBQykd9zzu0P4HtBpZT5zBpQ==", "dev": true, "requires": { "@microsoft/tsdoc": "0.14.1", @@ -572,14 +6240,10 @@ "dependencies": { "@microsoft/tsdoc": { "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz", - "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==", "dev": true }, "resolve": { "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "dev": true, "requires": { "is-core-module": "^2.1.0", @@ -590,42 +6254,30 @@ }, "@panva/asn1.js": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz", - "integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==", "dev": true }, "@protobufjs/aspromise": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=", "dev": true, "optional": true }, "@protobufjs/base64": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", "dev": true, "optional": true }, "@protobufjs/codegen": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", "dev": true, "optional": true }, "@protobufjs/eventemitter": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=", "dev": true, "optional": true }, "@protobufjs/fetch": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "dev": true, "optional": true, "requires": { @@ -635,43 +6287,31 @@ }, "@protobufjs/float": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=", "dev": true, "optional": true }, "@protobufjs/inquire": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=", "dev": true, "optional": true }, "@protobufjs/path": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=", "dev": true, "optional": true }, "@protobufjs/pool": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=", "dev": true, "optional": true }, "@protobufjs/utf8": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=", "dev": true, "optional": true }, "@rushstack/node-core-library": { "version": "3.36.0", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.36.0.tgz", - "integrity": "sha512-bID2vzXpg8zweXdXgQkKToEdZwVrVCN9vE9viTRk58gqzYaTlz4fMId6V3ZfpXN6H0d319uGi2KDlm+lUEeqCg==", "dev": true, "requires": { "@types/node": "10.17.13", @@ -687,14 +6327,10 @@ "dependencies": { "@types/node": { "version": "10.17.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", - "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==", "dev": true }, "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -704,8 +6340,6 @@ }, "@rushstack/rig-package": { "version": "0.3.11", - "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.11.tgz", - "integrity": "sha512-uI1/g5oQPtyrT9nStoyX/xgZSLa2b+srRFaDk3r1eqC7zA5th4/bvTGl2QfV3C9NcP+coSqmk5mFJkUfH6i3Lw==", "dev": true, "requires": { "resolve": "~1.17.0", @@ -714,8 +6348,6 @@ "dependencies": { "resolve": { "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -723,16 +6355,12 @@ }, "strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true } } }, "@rushstack/ts-command-line": { "version": "4.7.8", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz", - "integrity": "sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA==", "dev": true, "requires": { "@types/argparse": "1.0.38", @@ -743,8 +6371,6 @@ }, "@sinonjs/commons": { "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", - "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -752,8 +6378,6 @@ }, "@sinonjs/formatio": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", "dev": true, "requires": { "@sinonjs/commons": "^1", @@ -762,8 +6386,6 @@ }, "@sinonjs/samsam": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", "dev": true, "requires": { "@sinonjs/commons": "^1.3.0", @@ -773,73 +6395,51 @@ }, "@sinonjs/text-encoding": { "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, "@tootallnate/once": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, "optional": true }, "@tsconfig/node10": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", "dev": true }, "@tsconfig/node12": { "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", "dev": true }, "@tsconfig/node14": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", "dev": true }, "@tsconfig/node16": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", "dev": true }, "@types/argparse": { "version": "1.0.38", - "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", - "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==", "dev": true }, "@types/body-parser": { "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", "requires": { "@types/connect": "*", "@types/node": "*" }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + "version": "17.0.29" } } }, "@types/chai": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz", - "integrity": "sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==", "dev": true }, "@types/chai-as-promised": { "version": "7.1.5", - "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz", - "integrity": "sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==", "dev": true, "requires": { "@types/chai": "*" @@ -847,48 +6447,28 @@ }, "@types/connect": { "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", "requires": { "@types/node": "*" }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + "version": "17.0.29" } } }, "@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + "version": "2.8.12" }, "@types/express": { "version": "4.17.3", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", - "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", "requires": { "@types/body-parser": "*", "@types/express-serve-static-core": "*", "@types/serve-static": "*" } }, - "@types/express-jwt": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz", - "integrity": "sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==", - "dev": true, - "requires": { - "@types/express": "*", - "@types/express-unless": "*" - } - }, "@types/express-serve-static-core": { "version": "4.17.28", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz", - "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==", "requires": { "@types/node": "*", "@types/qs": "*", @@ -896,25 +6476,12 @@ }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + "version": "17.0.29" } } }, - "@types/express-unless": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.3.tgz", - "integrity": "sha512-TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw==", - "dev": true, - "requires": { - "@types/express": "*" - } - }, "@types/jsonwebtoken": { "version": "8.5.8", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", - "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", "dev": true, "requires": { "@types/node": "*" @@ -922,32 +6489,22 @@ }, "@types/lodash": { "version": "4.14.182", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", "dev": true }, "@types/long": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", - "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==", "dev": true, "optional": true }, "@types/mime": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", - "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" + "version": "1.3.2" }, "@types/mocha": { "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", "dev": true }, "@types/mock-require": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/mock-require/-/mock-require-2.0.1.tgz", - "integrity": "sha512-O7U5DVGboY/Crueb5/huUCIRjKtRVRaLmRDbZJBlDQgJn966z3aiFDN+6AtYviu2ExwMkl34LjT/IiC0OPtKuQ==", "dev": true, "requires": { "@types/node": "*" @@ -955,8 +6512,6 @@ }, "@types/nock": { "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", - "integrity": "sha512-OthuN+2FuzfZO3yONJ/QVjKmLEuRagS9TV9lEId+WHL9KhftYG+/2z+pxlr0UgVVXSpVD8woie/3fzQn8ft/Ow==", "dev": true, "requires": { "@types/node": "*" @@ -964,61 +6519,43 @@ }, "@types/node": { "version": "8.10.66", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", - "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", "dev": true }, "@types/node-fetch": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-3.0.3.tgz", - "integrity": "sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==", "dev": true, "requires": { "node-fetch": "*" } }, "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==" + "version": "6.9.7" }, "@types/range-parser": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", - "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" + "version": "1.2.4" }, "@types/serve-static": { "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", - "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", "requires": { "@types/mime": "^1", "@types/node": "*" }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" + "version": "17.0.29" } } }, "@types/sinon": { "version": "7.5.2", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", - "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", "dev": true }, "abab": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", "dev": true }, "abort-controller": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "dev": true, "optional": true, "requires": { @@ -1027,8 +6564,6 @@ }, "accepts": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "requires": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -1036,14 +6571,10 @@ }, "acorn": { "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, "acorn-globals": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", "dev": true, "requires": { "acorn": "^7.1.1", @@ -1052,22 +6583,16 @@ "dependencies": { "acorn": { "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true } } }, "acorn-walk": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true }, "agent-base": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "requires": { "debug": "4" @@ -1075,8 +6600,6 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -1084,16 +6607,12 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, "ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1104,20 +6623,14 @@ }, "ansi-colors": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", "dev": true }, "ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { "color-convert": "^2.0.1" @@ -1125,14 +6638,10 @@ }, "any-promise": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", "dev": true }, "api-extractor-model-me": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/api-extractor-model-me/-/api-extractor-model-me-0.1.1.tgz", - "integrity": "sha512-Ez801ZMADfkseOWNRFquvyQYDm3D9McpxfkKMWL6JFCGcpub0miJ+TFNphIR1nSZbrsxz3kIeOovNMY4VlL6Bw==", "dev": true, "requires": { "@microsoft/tsdoc": "0.12.24", @@ -1141,41 +6650,29 @@ }, "arg": { "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, "argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" } }, "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "version": "1.1.1" }, "array-from": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", "dev": true }, "arrify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "dev": true, "optional": true }, "asn1.js": { "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { "bn.js": "^4.0.0", @@ -1186,14 +6683,10 @@ }, "assertion-error": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true }, "async": { "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" @@ -1201,8 +6694,6 @@ }, "async-retry": { "version": "1.3.3", - "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz", - "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==", "dev": true, "optional": true, "requires": { @@ -1211,40 +6702,28 @@ }, "asynckit": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, "balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "optional": true }, "bignumber.js": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz", - "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==", "dev": true, "optional": true }, "bn.js": { "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", "dev": true }, "body-parser": { "version": "1.20.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", - "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.4", @@ -1262,8 +6741,6 @@ }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -1272,43 +6749,29 @@ }, "brorand": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "dev": true }, "browser-process-hrtime": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, "browser-stdout": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, "buffer-equal-constant-time": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=", "dev": true }, "builtin-modules": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + "version": "3.1.2" }, "call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -1316,14 +6779,10 @@ }, "camelcase": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, "chai": { "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", "dev": true, "requires": { "assertion-error": "^1.1.0", @@ -1337,8 +6796,6 @@ }, "chai-as-promised": { "version": "7.1.1", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", - "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", "dev": true, "requires": { "check-error": "^1.0.2" @@ -1346,8 +6803,6 @@ }, "chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -1357,8 +6812,6 @@ "dependencies": { "ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "^1.9.0" @@ -1366,8 +6819,6 @@ }, "color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { "color-name": "1.1.3" @@ -1375,14 +6826,10 @@ }, "color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -1392,14 +6839,10 @@ }, "check-error": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "dev": true }, "child-process-promise": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", - "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", "dev": true, "requires": { "cross-spawn": "^4.0.2", @@ -1409,8 +6852,6 @@ }, "cliui": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "optional": true, "requires": { @@ -1421,8 +6862,6 @@ }, "color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { "color-name": "~1.1.4" @@ -1430,20 +6869,14 @@ }, "color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "colors": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", - "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", "dev": true }, "combined-stream": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { "delayed-stream": "~1.0.0" @@ -1451,14 +6884,10 @@ }, "commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "compressible": { "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "optional": true, "requires": { @@ -1467,14 +6896,10 @@ }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "configstore": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", "dev": true, "optional": true, "requires": { @@ -1488,31 +6913,21 @@ }, "content-disposition": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "requires": { "safe-buffer": "5.2.1" } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "version": "1.0.4" }, "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + "version": "0.5.0" }, "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "version": "1.0.6" }, "cors": { "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "requires": { "object-assign": "^4", "vary": "^1" @@ -1520,14 +6935,10 @@ }, "create-require": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, "cross-spawn": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "dev": true, "requires": { "lru-cache": "^4.0.1", @@ -1536,21 +6947,15 @@ }, "crypto-random-string": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true, "optional": true }, "cssom": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", "dev": true }, "cssstyle": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", "dev": true, "requires": { "cssom": "~0.3.6" @@ -1558,16 +6963,12 @@ "dependencies": { "cssom": { "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", "dev": true } } }, "data-urls": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", "dev": true, "requires": { "abab": "^2.0.3", @@ -1577,8 +6978,6 @@ "dependencies": { "tr46": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, "requires": { "punycode": "^2.1.1" @@ -1586,14 +6985,10 @@ }, "webidl-conversions": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true }, "whatwg-url": { "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, "requires": { "lodash": "^4.7.0", @@ -1603,37 +6998,22 @@ } } }, - "date-and-time": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-2.3.1.tgz", - "integrity": "sha512-OaIRmSJXifwEN21rMVVDs0Kz8uhJ3wWPYd86atkRiqN54liaMQYEbbrgjZQea75YXOBWL4ZFb3rG/waenw1TEg==", - "dev": true, - "optional": true - }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } }, "decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, "decimal.js": { "version": "10.3.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", - "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", "dev": true }, "deep-eql": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", "dev": true, "requires": { "type-detect": "^4.0.0" @@ -1641,8 +7021,6 @@ }, "deep-equal": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { "is-arguments": "^1.0.4", @@ -1655,14 +7033,10 @@ }, "deep-is": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "define-properties": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, "requires": { "has-property-descriptors": "^1.0.0", @@ -1671,39 +7045,20 @@ }, "delayed-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + "version": "2.0.0" }, "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" - }, - "dicer": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.1.tgz", - "integrity": "sha512-ObioMtXnmjYs3aRtpIJt9rgQSPCIhKVkFPip+E9GUDyWl8N435znUxK/JfNwGZJ2wnn5JKQ7Ly3vOK5Q5dylGA==", - "dev": true, - "requires": { - "streamsearch": "^1.1.0" - } + "version": "1.2.0" }, "diff": { "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "domexception": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "requires": { "webidl-conversions": "^5.0.0" @@ -1711,16 +7066,12 @@ "dependencies": { "webidl-conversions": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", "dev": true } } }, "dot-prop": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "optional": true, "requires": { @@ -1729,8 +7080,6 @@ }, "duplexify": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", - "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==", "dev": true, "optional": true, "requires": { @@ -1742,22 +7091,16 @@ }, "ecdsa-sig-formatter": { "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", "dev": true, "requires": { "safe-buffer": "^5.0.1" } }, "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "version": "1.1.1" }, "elliptic": { "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "dev": true, "requires": { "bn.js": "^4.11.9", @@ -1771,19 +7114,13 @@ }, "emoji-regex": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "version": "1.0.2" }, "end-of-stream": { "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "optional": true, "requires": { @@ -1792,15 +7129,11 @@ }, "ent": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true, "optional": true }, "es-abstract": { "version": "1.19.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz", - "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -1827,8 +7160,6 @@ "dependencies": { "object.assign": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "dev": true, "requires": { "call-bind": "^1.0.0", @@ -1841,8 +7172,6 @@ }, "es-to-primitive": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { "is-callable": "^1.1.4", @@ -1852,26 +7181,18 @@ }, "escalade": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true, "optional": true }, "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "version": "1.0.3" }, "escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, "escodegen": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", "dev": true, "requires": { "esprima": "^4.0.1", @@ -1883,8 +7204,6 @@ }, "eslint-plugin-prettier": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz", - "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==", "dev": true, "requires": { "fast-diff": "^1.1.1", @@ -1893,38 +7212,26 @@ }, "esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "version": "1.8.1" }, "event-target-shim": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", "dev": true, "optional": true }, "express": { "version": "4.18.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.0.tgz", - "integrity": "sha512-EJEXxiTQJS3lIPrU1AE2vRuT7X7E+0KBbpm5GSoK524yl0K8X+er8zS2P14E64eqsVNoWbMCT7MpmQ+ErAhgRg==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -1961,46 +7268,32 @@ }, "extend": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true, "optional": true }, "fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "fast-diff": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, "fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, "fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, "fast-text-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", - "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==", + "version": "1.0.4", "dev": true, "optional": true }, "faye-websocket": { "version": "0.11.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", - "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -2008,8 +7301,6 @@ }, "finalhandler": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -2022,42 +7313,35 @@ }, "find-up": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { "locate-path": "^3.0.0" } }, "firebase-admin": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.1.0.tgz", - "integrity": "sha512-4i4wu+EFgNfY4+D4DxXkZcmbD832ozUMNvHMkOFQrf8upyp51n6jrDJS+wLok9sd62yeqcImbnsLOympGlISPA==", + "version": "10.3.0", "dev": true, "requires": { - "@firebase/database-compat": "^0.1.1", - "@firebase/database-types": "^0.9.3", + "@fastify/busboy": "^1.1.0", + "@firebase/database-compat": "^0.2.0", + "@firebase/database-types": "^0.9.7", "@google-cloud/firestore": "^4.15.1", "@google-cloud/storage": "^5.18.3", "@types/node": ">=12.12.47", - "dicer": "^0.3.0", "jsonwebtoken": "^8.5.1", "jwks-rsa": "^2.0.2", - "node-forge": "^1.3.1" + "node-forge": "^1.3.1", + "uuid": "^8.3.2" }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", + "version": "18.0.4", "dev": true } } }, "flat": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz", - "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==", "dev": true, "requires": { "is-buffer": "~2.0.3" @@ -2065,8 +7349,6 @@ }, "form-data": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "requires": { "asynckit": "^0.4.0", @@ -2075,19 +7357,13 @@ } }, "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + "version": "0.2.0" }, "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "version": "0.5.2" }, "fs-extra": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -2097,32 +7373,22 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.1" }, "functional-red-black-tree": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true, "optional": true }, "functions-have-names": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true }, "gaxios": { "version": "4.3.3", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz", - "integrity": "sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==", "dev": true, "optional": true, "requires": { @@ -2135,8 +7401,6 @@ }, "gcp-metadata": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz", - "integrity": "sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==", "dev": true, "optional": true, "requires": { @@ -2146,37 +7410,22 @@ }, "get-caller-file": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-func-name": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, "get-intrinsic": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1" } }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "optional": true - }, "get-symbol-description": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -2185,8 +7434,6 @@ }, "glob": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2199,8 +7446,6 @@ }, "google-auth-library": { "version": "7.14.1", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz", - "integrity": "sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==", "dev": true, "optional": true, "requires": { @@ -2217,8 +7462,6 @@ "dependencies": { "lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "optional": true, "requires": { @@ -2227,22 +7470,18 @@ }, "yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, "optional": true } } }, "google-gax": { - "version": "2.30.2", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.30.2.tgz", - "integrity": "sha512-BCNCT26kb0iC52zj2SosyOZMhI5sVfXuul1h0Aw5uT9nGAbmS5eOvQ49ft53ft6XotDj11sUSDV6XESEiQqCqg==", + "version": "2.30.5", "dev": true, "optional": true, "requires": { "@grpc/grpc-js": "~1.6.0", - "@grpc/proto-loader": "^0.6.1", + "@grpc/proto-loader": "^0.6.12", "@types/long": "^4.0.0", "abort-controller": "^3.0.0", "duplexify": "^4.0.0", @@ -2252,14 +7491,12 @@ "node-fetch": "^2.6.1", "object-hash": "^3.0.0", "proto3-json-serializer": "^0.1.8", - "protobufjs": "6.11.2", + "protobufjs": "6.11.3", "retry-request": "^4.0.0" } }, "google-p12-pem": { "version": "3.1.4", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz", - "integrity": "sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==", "dev": true, "optional": true, "requires": { @@ -2268,20 +7505,14 @@ }, "graceful-fs": { "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, "growl": { "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, "gtoken": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz", - "integrity": "sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==", "dev": true, "optional": true, "requires": { @@ -2290,57 +7521,32 @@ "jws": "^4.0.0" } }, - "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, - "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" - } - }, "has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "requires": { "function-bind": "^1.1.1" } }, "has-bigints": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true }, "has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, "has-property-descriptors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "requires": { "get-intrinsic": "^1.1.1" } }, "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "version": "1.0.3" }, "has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "requires": { "has-symbols": "^1.0.2" @@ -2348,15 +7554,11 @@ }, "hash-stream-validation": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz", - "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==", "dev": true, "optional": true }, "hash.js": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -2365,14 +7567,10 @@ }, "he": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, "hmac-drbg": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { "hash.js": "^1.0.3", @@ -2382,8 +7580,6 @@ }, "html-encoding-sniffer": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", "dev": true, "requires": { "whatwg-encoding": "^1.0.5" @@ -2391,8 +7587,6 @@ }, "http-errors": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "requires": { "depd": "2.0.0", "inherits": "2.0.4", @@ -2402,15 +7596,11 @@ } }, "http-parser-js": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz", - "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==", + "version": "0.5.8", "dev": true }, "http-proxy-agent": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "optional": true, "requires": { @@ -2421,8 +7611,6 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "optional": true, "requires": { @@ -2431,8 +7619,6 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true, "optional": true } @@ -2440,8 +7626,6 @@ }, "https-proxy-agent": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, "requires": { "agent-base": "6", @@ -2450,8 +7634,6 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -2459,37 +7641,27 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, "iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, "import-lazy": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", "dev": true }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true, "optional": true }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { "once": "^1.3.0", @@ -2497,14 +7669,10 @@ } }, "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "version": "2.0.4" }, "internal-slot": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", "dev": true, "requires": { "get-intrinsic": "^1.1.0", @@ -2513,14 +7681,10 @@ } }, "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + "version": "1.9.1" }, "is-arguments": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -2529,8 +7693,6 @@ }, "is-bigint": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, "requires": { "has-bigints": "^1.0.1" @@ -2538,8 +7700,6 @@ }, "is-boolean-object": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -2548,20 +7708,14 @@ }, "is-buffer": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", "dev": true }, "is-callable": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", "dev": true }, "is-core-module": { "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "requires": { "has": "^1.0.3" @@ -2569,8 +7723,6 @@ }, "is-date-object": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, "requires": { "has-tostringtag": "^1.0.0" @@ -2578,20 +7730,14 @@ }, "is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "is-negative-zero": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, "is-number-object": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, "requires": { "has-tostringtag": "^1.0.0" @@ -2599,21 +7745,15 @@ }, "is-obj": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true, "optional": true }, "is-potential-custom-element-name": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "dev": true }, "is-regex": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -2622,8 +7762,6 @@ }, "is-shared-array-buffer": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, "requires": { "call-bind": "^1.0.2" @@ -2631,22 +7769,16 @@ }, "is-stream": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, "optional": true }, "is-stream-ended": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==", "dev": true, "optional": true }, "is-string": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, "requires": { "has-tostringtag": "^1.0.0" @@ -2654,8 +7786,6 @@ }, "is-symbol": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, "requires": { "has-symbols": "^1.0.2" @@ -2663,15 +7793,11 @@ }, "is-typedarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true, "optional": true }, "is-weakref": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, "requires": { "call-bind": "^1.0.2" @@ -2679,32 +7805,22 @@ }, "isarray": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "jest-docblock": { "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", "dev": true }, "jju": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", "dev": true }, "jose": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz", - "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==", "dev": true, "requires": { "@panva/asn1.js": "^1.0.0" @@ -2712,14 +7828,10 @@ }, "js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, "js-yaml": { "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -2728,8 +7840,6 @@ }, "jsdom": { "version": "16.7.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", - "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", "dev": true, "requires": { "abab": "^2.0.5", @@ -2763,14 +7873,10 @@ "dependencies": { "@tootallnate/once": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -2778,8 +7884,6 @@ }, "http-proxy-agent": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { "@tootallnate/once": "1", @@ -2789,14 +7893,10 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "tr46": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, "requires": { "punycode": "^2.1.1" @@ -2804,14 +7904,10 @@ }, "webidl-conversions": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true }, "whatwg-url": { "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, "requires": { "lodash": "^4.7.0", @@ -2823,8 +7919,6 @@ }, "json-bigint": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", "dev": true, "optional": true, "requires": { @@ -2833,26 +7927,20 @@ }, "json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, "json-stringify-safe": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, "jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", + "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==", "dev": true }, "jsonfile": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { "graceful-fs": "^4.1.6" @@ -2860,8 +7948,6 @@ }, "jsonwebtoken": { "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", "dev": true, "requires": { "jws": "^3.2.2", @@ -2878,8 +7964,6 @@ "dependencies": { "jwa": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", "dev": true, "requires": { "buffer-equal-constant-time": "1.0.1", @@ -2889,8 +7973,6 @@ }, "jws": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", "dev": true, "requires": { "jwa": "^1.4.1", @@ -2899,28 +7981,20 @@ }, "ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "just-extend": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", - "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, "jwa": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", "dev": true, "optional": true, "requires": { @@ -2931,8 +8005,6 @@ }, "jwk-to-pem": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", - "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", "dev": true, "requires": { "asn1.js": "^5.3.0", @@ -2941,22 +8013,29 @@ } }, "jwks-rsa": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.0.tgz", - "integrity": "sha512-GKOSDBWWBCiQTzawei6mEdRQvji5gecj8F9JwMt0ZOPnBPSmTjo5CKFvvbhE7jGPkU159Cpi0+OTLuABFcNOQQ==", + "version": "2.1.4", "dev": true, "requires": { - "@types/express-jwt": "0.0.42", + "@types/express": "^4.17.13", + "@types/jsonwebtoken": "^8.5.8", "debug": "^4.3.4", "jose": "^2.0.5", "limiter": "^1.1.5", "lru-memoizer": "^2.1.4" }, "dependencies": { + "@types/express": { + "version": "4.17.13", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.18", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -2964,16 +8043,12 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, "jws": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", "dev": true, "optional": true, "requires": { @@ -2983,8 +8058,6 @@ }, "levn": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { "prelude-ls": "~1.1.2", @@ -2993,20 +8066,14 @@ }, "limiter": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", - "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", "dev": true }, "lines-and-columns": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, "locate-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { "p-locate": "^3.0.0", @@ -3014,81 +8081,55 @@ } }, "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "version": "4.17.21" }, "lodash.camelcase": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", "dev": true, "optional": true }, "lodash.clonedeep": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, "lodash.get": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, "lodash.includes": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", "dev": true }, "lodash.isboolean": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", "dev": true }, "lodash.isequal": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, "lodash.isinteger": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", "dev": true }, "lodash.isnumber": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", "dev": true }, "lodash.isplainobject": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", "dev": true }, "lodash.isstring": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", "dev": true }, "lodash.once": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", "dev": true }, "log-symbols": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "dev": true, "requires": { "chalk": "^2.0.1" @@ -3096,21 +8137,15 @@ }, "lolex": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", - "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", "dev": true }, "long": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", "dev": true, "optional": true }, "loupe": { "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", "dev": true, "requires": { "get-func-name": "^2.0.0" @@ -3118,8 +8153,6 @@ }, "lru-cache": { "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { "pseudomap": "^1.0.2", @@ -3128,8 +8161,6 @@ }, "lru-memoizer": { "version": "2.1.4", - "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", - "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", "dev": true, "requires": { "lodash.clonedeep": "^4.5.0", @@ -3138,8 +8169,6 @@ "dependencies": { "lru-cache": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz", - "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=", "dev": true, "requires": { "pseudomap": "^1.0.1", @@ -3150,14 +8179,10 @@ }, "lunr": { "version": "2.3.9", - "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", "dev": true }, "make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "optional": true, "requires": { @@ -3166,8 +8191,6 @@ "dependencies": { "semver": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true, "optional": true } @@ -3175,65 +8198,45 @@ }, "make-error": { "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, "marked": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", - "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz", + "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==", "dev": true }, "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + "version": "0.3.0" }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "version": "1.0.1" }, "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + "version": "1.1.2" }, "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "version": "1.6.0" }, "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + "version": "1.52.0" }, "mime-types": { "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "requires": { "mime-db": "1.52.0" } }, "minimalistic-assert": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "dev": true }, "minimalistic-crypto-utils": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", "dev": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -3241,14 +8244,10 @@ }, "minimist": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "mkdirp": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", "dev": true, "requires": { "minimist": "^1.2.5" @@ -3256,8 +8255,6 @@ }, "mocha": { "version": "6.2.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz", - "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -3287,14 +8284,10 @@ "dependencies": { "ansi-regex": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "^1.9.0" @@ -3302,8 +8295,6 @@ }, "cliui": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { "string-width": "^3.1.0", @@ -3313,8 +8304,6 @@ }, "color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { "color-name": "1.1.3" @@ -3322,14 +8311,10 @@ }, "color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "debug": { "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -3337,20 +8322,14 @@ }, "emoji-regex": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "js-yaml": { "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -3359,14 +8338,10 @@ }, "ms": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true }, "string-width": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { "emoji-regex": "^7.0.1", @@ -3376,8 +8351,6 @@ }, "strip-ansi": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { "ansi-regex": "^4.1.0" @@ -3385,8 +8358,6 @@ }, "wrap-ansi": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { "ansi-styles": "^3.2.0", @@ -3396,14 +8367,10 @@ }, "y18n": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yargs": { "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { "cliui": "^5.0.0", @@ -3420,8 +8387,6 @@ }, "yargs-parser": { "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -3432,8 +8397,6 @@ }, "mock-require": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", - "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", "dev": true, "requires": { "get-caller-file": "^1.0.2", @@ -3442,21 +8405,15 @@ "dependencies": { "get-caller-file": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true } } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "version": "2.0.0" }, "mz": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", "dev": true, "requires": { "any-promise": "^1.0.0", @@ -3465,20 +8422,10 @@ } }, "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "version": "0.6.3" }, "nise": { "version": "1.5.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", - "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", "dev": true, "requires": { "@sinonjs/formatio": "^3.2.1", @@ -3490,8 +8437,6 @@ "dependencies": { "lolex": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" @@ -3499,8 +8444,6 @@ }, "path-to-regexp": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", "dev": true, "requires": { "isarray": "0.0.1" @@ -3510,8 +8453,6 @@ }, "nock": { "version": "10.0.6", - "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", - "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", "dev": true, "requires": { "chai": "^4.1.2", @@ -3527,8 +8468,6 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -3536,22 +8475,16 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "node-environment-flags": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", "dev": true, "requires": { "object.getownpropertydescriptors": "^2.0.3", @@ -3560,36 +8493,27 @@ "dependencies": { "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "node-fetch": { "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dev": true, "requires": { "whatwg-url": "^5.0.0" } }, "node-forge": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true }, "node-version": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", - "integrity": "sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==", "dev": true }, "normalize-path": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { "remove-trailing-separator": "^1.0.1" @@ -3597,31 +8521,21 @@ }, "nwsapi": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "version": "4.1.1" }, "object-hash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", "dev": true, "optional": true }, "object-inspect": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", - "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" + "version": "1.12.0" }, "object-is": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", - "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -3630,14 +8544,10 @@ }, "object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, "object.assign": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "dev": true, "requires": { "define-properties": "^1.1.2", @@ -3648,8 +8558,6 @@ }, "object.getownpropertydescriptors": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz", - "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -3659,16 +8567,12 @@ }, "on-finished": { "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "requires": { "ee-first": "1.1.1" } }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" @@ -3676,8 +8580,6 @@ }, "optionator": { "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { "deep-is": "~0.1.3", @@ -3690,8 +8592,6 @@ }, "p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "optional": true, "requires": { @@ -3700,8 +8600,6 @@ }, "p-locate": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { "p-limit": "^2.0.0" @@ -3709,8 +8607,6 @@ "dependencies": { "p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -3720,54 +8616,36 @@ }, "p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, "parse5": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + "version": "1.3.3" }, "path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "version": "0.1.7" }, "pathval": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, "portfinder": { "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { "async": "^2.6.2", @@ -3777,8 +8655,6 @@ "dependencies": { "debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -3786,8 +8662,6 @@ }, "mkdirp": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "requires": { "minimist": "^1.2.6" @@ -3795,46 +8669,28 @@ }, "ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } }, "prelude-ls": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, "prettier": { "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "promise-polyfill": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", - "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=", "dev": true }, "propagate": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz", - "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=", "dev": true }, "proto3-json-serializer": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.8.tgz", - "integrity": "sha512-ACilkB6s1U1gWnl5jtICpnDai4VCxmI9GFxuEaYdxtDG2oVI3sVFIUsvUZcQbJgtPM6p+zqKbjTKQZp6Y4FpQw==", + "version": "0.1.9", "dev": true, "optional": true, "requires": { @@ -3842,9 +8698,7 @@ } }, "protobufjs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", - "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", + "version": "6.11.3", "dev": true, "optional": true, "requires": { @@ -3864,9 +8718,7 @@ }, "dependencies": { "@types/node": { - "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", + "version": "18.0.4", "dev": true, "optional": true } @@ -3874,8 +8726,6 @@ }, "proxy-addr": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "requires": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -3883,20 +8733,14 @@ }, "pseudomap": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, "psl": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", "dev": true }, "pump": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "optional": true, "requires": { @@ -3906,8 +8750,6 @@ }, "pumpify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz", - "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==", "dev": true, "optional": true, "requires": { @@ -3918,27 +8760,19 @@ }, "punycode": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, "qs": { "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", "requires": { "side-channel": "^1.0.4" } }, "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + "version": "1.2.1" }, "raw-body": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "requires": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -3948,8 +8782,6 @@ }, "readable-stream": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "optional": true, "requires": { @@ -3960,8 +8792,6 @@ }, "regexp.prototype.flags": { "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -3971,26 +8801,18 @@ }, "remove-trailing-separator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, "require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, "require-main-filename": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, "resolve": { "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "requires": { "is-core-module": "^2.8.1", @@ -4000,15 +8822,11 @@ }, "retry": { "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, "optional": true }, "retry-request": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz", - "integrity": "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==", "dev": true, "optional": true, "requires": { @@ -4018,8 +8836,6 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "optional": true, "requires": { @@ -4028,27 +8844,19 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true, "optional": true } } }, "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "version": "5.2.1" }, "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "version": "2.1.2" }, "saxes": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", "dev": true, "requires": { "xmlchars": "^2.2.0" @@ -4056,8 +8864,6 @@ }, "semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -4065,8 +8871,6 @@ "dependencies": { "lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { "yallist": "^4.0.0" @@ -4074,16 +8878,12 @@ }, "yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } } }, "send": { "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -4101,16 +8901,12 @@ }, "dependencies": { "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "version": "2.1.3" } } }, "serve-static": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -4120,19 +8916,15 @@ }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "version": "1.2.0" }, "shiki": { - "version": "0.9.15", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz", - "integrity": "sha512-/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", + "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", @@ -4142,8 +8934,6 @@ }, "side-channel": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -4152,15 +8942,11 @@ }, "signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, "optional": true }, "sinon": { "version": "7.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", - "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", "dev": true, "requires": { "@sinonjs/commons": "^1.4.0", @@ -4174,8 +8960,6 @@ "dependencies": { "supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -4183,34 +8967,19 @@ } } }, - "snakeize": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz", - "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=", - "dev": true, - "optional": true - }, "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + "version": "2.0.1" }, "stream-events": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", "dev": true, "optional": true, "requires": { @@ -4219,27 +8988,23 @@ }, "stream-shift": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true, "optional": true }, - "streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", - "dev": true + "string_decoder": { + "version": "1.3.0", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.2.0" + } }, "string-argv": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", "dev": true }, "string-width": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", @@ -4249,8 +9014,6 @@ }, "string.prototype.trimend": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -4259,28 +9022,14 @@ }, "string.prototype.trimstart": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.2.0" - } - }, "strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { "ansi-regex": "^5.0.1" @@ -4288,21 +9037,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, "stubs": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=", "dev": true, "optional": true }, "supports-color": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -4310,20 +9053,14 @@ }, "supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, "symbol-tree": { "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, "teeny-request": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz", - "integrity": "sha512-SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw==", "dev": true, "optional": true, "requires": { @@ -4334,10 +9071,12 @@ "uuid": "^8.0.0" } }, + "text-decoding": { + "version": "1.0.0", + "dev": true + }, "thenify": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", "dev": true, "requires": { "any-promise": "^1.0.0" @@ -4345,8 +9084,6 @@ }, "thenify-all": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", "dev": true, "requires": { "thenify": ">= 3.1.0 < 4" @@ -4354,19 +9091,13 @@ }, "timsort": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + "version": "1.0.1" }, "tough-cookie": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", "dev": true, "requires": { "psl": "^1.1.33", @@ -4376,13 +9107,10 @@ }, "tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + "dev": true }, "ts-node": { "version": "10.7.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", - "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", "dev": true, "requires": { "@cspotcode/source-map-support": "0.7.0", @@ -4402,28 +9130,20 @@ "dependencies": { "acorn-walk": { "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, "diff": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true } } }, "tslib": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", "dev": true }, "tslint": { "version": "5.20.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", - "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -4443,34 +9163,24 @@ "dependencies": { "diff": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, "tslib": { "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } }, "tslint-config-prettier": { "version": "1.18.0", - "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz", - "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==", "dev": true }, "tslint-no-unused-expression-chai": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/tslint-no-unused-expression-chai/-/tslint-no-unused-expression-chai-0.1.4.tgz", - "integrity": "sha512-frEWKNTcq7VsaWKgUxMDOB2N/cmQadVkUtUGIut+2K4nv/uFXPfgJyPjuNC/cHyfUVqIkHMAvHOCL+d/McU3nQ==", "dev": true, "requires": { "tsutils": "^3.0.0" @@ -4478,14 +9188,10 @@ "dependencies": { "tslib": { "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, "tsutils": { "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, "requires": { "tslib": "^1.8.1" @@ -4495,8 +9201,6 @@ }, "tslint-plugin-prettier": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", - "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", "dev": true, "requires": { "eslint-plugin-prettier": "^2.2.0", @@ -4506,16 +9210,12 @@ "dependencies": { "tslib": { "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } }, "tsutils": { "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { "tslib": "^1.8.1" @@ -4523,16 +9223,12 @@ "dependencies": { "tslib": { "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } }, "type-check": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { "prelude-ls": "~1.1.2" @@ -4540,14 +9236,10 @@ }, "type-detect": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, "type-is": { "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -4555,8 +9247,6 @@ }, "typedarray-to-buffer": { "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", "dev": true, "optional": true, "requires": { @@ -4564,61 +9254,43 @@ } }, "typedoc": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.21.2.tgz", - "integrity": "sha512-SR1ByJB3USg+jxoxwzMRP07g/0f/cQUE5t7gOh1iTUyjTPyJohu9YSKRlK+MSXXqlhIq+m0jkEHEG5HoY7/Adg==", + "version": "0.23.7", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.7.tgz", + "integrity": "sha512-Vl/Yh4KYBaxQQOYImBgLQDX61hfaA7XaP/DZVd/w7rQvaqLEsdQH6gEMK8CMjyHo0bSzVnNYwxtD1KPSENoWug==", "dev": true, "requires": { - "glob": "^7.1.7", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", "lunr": "^2.3.9", - "marked": "^2.1.1", - "minimatch": "^3.0.0", - "progress": "^2.0.3", - "shiki": "^0.9.3", - "typedoc-default-themes": "^0.12.10" + "marked": "^4.0.16", + "minimatch": "^5.1.0", + "shiki": "^0.10.1" }, "dependencies": { - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "brace-expansion": "^2.0.1" } } } }, - "typedoc-default-themes": { - "version": "0.12.10", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.12.10.tgz", - "integrity": "sha512-fIS001cAYHkyQPidWXmHuhs8usjP5XVJjWB8oZGqkTowZaz3v7g3KDZeeqE82FBrmkAnIBOY3jgy7lnPnqATbA==", - "dev": true - }, "typescript": { "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, - "uglify-js": { - "version": "3.15.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz", - "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==", - "dev": true, - "optional": true - }, "unbox-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -4629,8 +9301,6 @@ }, "unique-string": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", "dev": true, "optional": true, "requires": { @@ -4639,19 +9309,13 @@ }, "universalify": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "version": "1.0.0" }, "uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "requires": { "punycode": "^2.1.0" @@ -4659,39 +9323,26 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "version": "1.0.1" }, "uuid": { "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "optional": true + "dev": true }, "v8-compile-cache-lib": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, "validator": { "version": "8.2.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz", - "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==", "dev": true }, "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "version": "1.1.2" }, "vscode-oniguruma": { "version": "1.6.2", @@ -4707,8 +9358,6 @@ }, "w3c-hr-time": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", "dev": true, "requires": { "browser-process-hrtime": "^1.0.0" @@ -4716,8 +9365,6 @@ }, "w3c-xmlserializer": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", "dev": true, "requires": { "xml-name-validator": "^3.0.0" @@ -4725,13 +9372,10 @@ }, "webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + "dev": true }, "websocket-driver": { "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, "requires": { "http-parser-js": ">=0.5.1", @@ -4741,14 +9385,10 @@ }, "websocket-extensions": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "whatwg-encoding": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", "dev": true, "requires": { "iconv-lite": "0.4.24" @@ -4756,14 +9396,11 @@ }, "whatwg-mimetype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", "dev": true }, "whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, "requires": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -4771,8 +9408,6 @@ }, "which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -4780,8 +9415,6 @@ }, "which-boxed-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, "requires": { "is-bigint": "^1.0.1", @@ -4793,14 +9426,10 @@ }, "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, "wide-align": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { "string-width": "^1.0.2 || 2" @@ -4808,20 +9437,14 @@ "dependencies": { "ansi-regex": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", - "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -4830,8 +9453,6 @@ }, "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { "ansi-regex": "^3.0.0" @@ -4841,20 +9462,10 @@ }, "word-wrap": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, "wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "optional": true, "requires": { @@ -4865,14 +9476,10 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "write-file-atomic": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, "optional": true, "requires": { @@ -4884,46 +9491,33 @@ }, "ws": { "version": "7.5.7", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true + "dev": true, + "requires": {} }, "xdg-basedir": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true, "optional": true }, "xml-name-validator": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", "dev": true }, "xmlchars": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, "y18n": { "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, "optional": true }, "yallist": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { "cliui": "^6.0.0", @@ -4941,8 +9535,6 @@ "dependencies": { "cliui": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { "string-width": "^4.2.0", @@ -4952,8 +9544,6 @@ }, "find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { "locate-path": "^5.0.0", @@ -4962,8 +9552,6 @@ }, "locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { "p-locate": "^4.1.0" @@ -4971,8 +9559,6 @@ }, "p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -4980,8 +9566,6 @@ }, "p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { "p-limit": "^2.2.0" @@ -4989,14 +9573,10 @@ }, "path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "wrap-ansi": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { "ansi-styles": "^4.0.0", @@ -5006,14 +9586,10 @@ }, "y18n": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yargs-parser": { "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -5024,15 +9600,11 @@ }, "yargs-parser": { "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, "optional": true }, "yargs-unparser": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", "dev": true, "requires": { "flat": "^4.1.0", @@ -5042,14 +9614,10 @@ "dependencies": { "ansi-regex": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "^1.9.0" @@ -5057,8 +9625,6 @@ }, "cliui": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { "string-width": "^3.1.0", @@ -5068,8 +9634,6 @@ }, "color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { "color-name": "1.1.3" @@ -5077,26 +9641,18 @@ }, "color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, "emoji-regex": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "string-width": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { "emoji-regex": "^7.0.1", @@ -5106,8 +9662,6 @@ }, "strip-ansi": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { "ansi-regex": "^4.1.0" @@ -5115,8 +9669,6 @@ }, "wrap-ansi": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { "ansi-styles": "^3.2.0", @@ -5126,14 +9678,10 @@ }, "y18n": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yargs": { "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { "cliui": "^5.0.0", @@ -5150,8 +9698,6 @@ }, "yargs-parser": { "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -5162,21 +9708,15 @@ }, "yn": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true }, "yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "optional": true }, "z-schema": { "version": "3.18.4", - "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz", - "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==", "dev": true, "requires": { "commander": "^2.7.1", diff --git a/package.json b/package.json index 0769610d7..13cf1bbf1 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && npm run docgen:v2:toc", "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen", - "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", + "build:pack": "rm -rf lib && npm install --production && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", "build:watch": "npm run build -- -w", @@ -205,7 +205,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "child-process-promise": "^2.2.1", - "firebase-admin": "^10.1.0", + "firebase-admin": "^10.3.0", "js-yaml": "^3.13.1", "jsdom": "^16.2.1", "jsonwebtoken": "^8.5.1", @@ -224,7 +224,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-no-unused-expression-chai": "^0.1.4", "tslint-plugin-prettier": "^2.0.1", - "typedoc": "0.21.2", + "typedoc": "0.23.7", "typescript": "^4.3.5", "yargs": "^15.3.1" }, diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts index 8916a371a..a87aa844d 100644 --- a/spec/common/providers/https.spec.ts +++ b/spec/common/providers/https.spec.ts @@ -361,7 +361,7 @@ describe('onCallHandler', () => { body: { result: null }, }, }); - mock.done(); + expect(mock.isDone()).to.be.true; }); it('should reject bad AppCheck token', async () => { diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts index 5accb339e..a1f55c8e1 100644 --- a/spec/fixtures/mockrequest.ts +++ b/spec/fixtures/mockrequest.ts @@ -111,7 +111,7 @@ export function mockFetchAppCheckPublicJwks(): nock.Scope { }; return nock('https://firebaseappcheck.googleapis.com:443') - .get('/v1beta/jwks') + .get('/v1/jwks') .reply(200, mockedResponse); } From 7d2c8dc5a45261f64d74cae94be9ce53410364a8 Mon Sep 17 00:00:00 2001 From: Victor Fan Date: Tue, 19 Jul 2022 02:32:26 -0700 Subject: [PATCH 482/705] Allow users to present String and Integer params in a ManifestSpec (#1166) --- .../fixtures/sources/commonjs-params/index.js | 21 +++++++++++++++++ .../sources/commonjs-params/package.json | 3 +++ spec/runtime/loader.spec.ts | 5 ++++ src/runtime/loader.ts | 8 ++++++- src/runtime/manifest.ts | 3 +++ src/v2/params/index.ts | 1 + src/v2/params/types.ts | 23 ++++++++----------- 7 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 spec/fixtures/sources/commonjs-params/index.js create mode 100644 spec/fixtures/sources/commonjs-params/package.json diff --git a/spec/fixtures/sources/commonjs-params/index.js b/spec/fixtures/sources/commonjs-params/index.js new file mode 100644 index 000000000..d038a2f77 --- /dev/null +++ b/spec/fixtures/sources/commonjs-params/index.js @@ -0,0 +1,21 @@ +const functions = require("../../../../src/index"); +const functionsv2 = require("../../../../src/v2/index"); +const { defineString } = require("../../../../src/v2/params"); + +defineString("FOO"); + +exports.v1http = functions.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v1callable = functions.https.onCall(() => { + return "PASS"; +}); + +exports.v2http = functionsv2.https.onRequest((req, resp) => { + resp.status(200).send("PASS"); +}); + +exports.v2callable = functionsv2.https.onCall(() => { + return "PASS"; +}); diff --git a/spec/fixtures/sources/commonjs-params/package.json b/spec/fixtures/sources/commonjs-params/package.json new file mode 100644 index 000000000..91f8c11da --- /dev/null +++ b/spec/fixtures/sources/commonjs-params/package.json @@ -0,0 +1,3 @@ +{ + "name": "commonjs-params" +} diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index 9994557c4..bb959a3cb 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -310,6 +310,11 @@ describe('loadStack', () => { }, }, }, + { + name: 'has params', + modulePath: './spec/fixtures/sources/commonjs-params', + expected: { ...expected, params: [{ name: 'FOO', type: 'string' }] }, + }, ]; for (const tc of testcases) { diff --git a/src/runtime/loader.ts b/src/runtime/loader.ts index de31eefd3..4dd4b41d2 100644 --- a/src/runtime/loader.ts +++ b/src/runtime/loader.ts @@ -28,6 +28,8 @@ import { ManifestStack, } from './manifest'; +import * as params from '../v2/params'; + /** * Dynamically load import function to prevent TypeScript from * transpiling into a require. @@ -112,9 +114,13 @@ export async function loadStack(functionsDir: string): Promise { extractStack(mod, endpoints, requiredAPIs); - return { + const stack: ManifestStack = { endpoints, specVersion: 'v1alpha1', requiredAPIs: mergeRequiredAPIs(requiredAPIs), }; + if (params.declaredParams.length > 0) { + stack.params = params.declaredParams.map((p) => p.toSpec()); + } + return stack; } diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 562d1a52f..d63088303 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -20,6 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { ParamSpec } from '../v2/params/types'; + /** * An definition of a function as appears in the Manifest. */ @@ -87,6 +89,7 @@ export interface ManifestRequiredAPI { */ export interface ManifestStack { specVersion: 'v1alpha1'; + params?: ParamSpec[]; requiredAPIs: ManifestRequiredAPI[]; endpoints: Record; } diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index bf45e8c45..3f8a080b6 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -24,6 +24,7 @@ * @hidden * @alpha */ + import { BooleanParam, FloatParam, diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index 9612dc8dc..fc898c15c 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -28,16 +28,13 @@ export interface ParamSpec { default?: T; label?: string; description?: string; - valueType?: ParamValueType; + type: ParamValueType; } -export type ParamOptions = Omit< - ParamSpec, - 'name' | 'valueType' ->; +export type ParamOptions = Omit, 'name' | 'type'>; export class Param { - static valueType: ParamValueType = 'string'; + static type: ParamValueType = 'string'; constructor(readonly name: string, readonly options: ParamOptions = {}) {} @@ -61,7 +58,7 @@ export class Param { const out: ParamSpec = { name: this.name, ...this.options, - valueType: (this.constructor as typeof Param).valueType, + type: (this.constructor as typeof Param).type, }; if (this.options.default && typeof this.options.default !== 'string') { out.default = (this.options.default as @@ -78,7 +75,7 @@ export class StringParam extends Param { } export class IntParam extends Param { - static valueType: ParamValueType = 'int'; + static type: ParamValueType = 'int'; get value(): number { const intVal = parseInt( @@ -97,7 +94,7 @@ export class IntParam extends Param { } export class FloatParam extends Param { - static valueType: ParamValueType = 'float'; + static type: ParamValueType = 'float'; get value(): number { const floatVal = parseFloat( @@ -115,7 +112,7 @@ export class FloatParam extends Param { } export class BooleanParam extends Param { - static valueType: ParamValueType = 'boolean'; + static type: ParamValueType = 'boolean'; get value(): boolean { const lowerVal = ( @@ -137,7 +134,7 @@ export class BooleanParam extends Param { } export class ListParam extends Param { - static valueType: ParamValueType = 'list'; + static type: ParamValueType = 'list'; get value(): string[] { return typeof this.rawValue === 'string' @@ -148,7 +145,7 @@ export class ListParam extends Param { toSpec(): ParamSpec { const out: ParamSpec = { name: this.name, - valueType: 'list', + type: 'list', ...this.options, }; if (this.options.default && this.options.default.length > 0) { @@ -160,7 +157,7 @@ export class ListParam extends Param { } export class JSONParam extends Param { - static valueType: ParamValueType = 'json'; + static type: ParamValueType = 'json'; get value(): T { if (this.rawValue) { From 724a8b0a79271dac957acb7e077d208f590676af Mon Sep 17 00:00:00 2001 From: Kai Bolay Date: Tue, 19 Jul 2022 12:20:04 -0400 Subject: [PATCH 483/705] Add support for App Distribution in-app Feedback (#1167) Add `InAppFeedbackPayload` and `onNewInAppFeedbackPublished()`. --- .../providers/alerts/appDistribution.spec.ts | 83 ++++++++++++++ src/v2/providers/alerts/alerts.ts | 1 + src/v2/providers/alerts/appDistribution.ts | 105 ++++++++++++++++++ 3 files changed, 189 insertions(+) diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts index 5fb112daa..9b699bc62 100644 --- a/spec/v2/providers/alerts/appDistribution.spec.ts +++ b/spec/v2/providers/alerts/appDistribution.spec.ts @@ -97,6 +97,89 @@ describe('appDistribution', () => { }); }); + describe('onInAppfeedbackPublished', () => { + it('should create a function with alertType & appId', () => { + const func = appDistribution.onInAppFeedbackPublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: appDistribution.inAppFeedbackAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = appDistribution.onInAppFeedbackPublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alerttype: appDistribution.inAppFeedbackAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appid in opts', () => { + const func = appDistribution.onInAppFeedbackPublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: appDistribution.inAppFeedbackAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function without opts or appId', () => { + const func = appDistribution.onInAppFeedbackPublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alerttype: appDistribution.inAppFeedbackAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with a run method', () => { + const func = appDistribution.onInAppFeedbackPublished( + APPID, + (event) => event + ); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); + describe('getOptsAndApp', () => { it('should parse a string', () => { const [opts, appId] = appDistribution.getOptsAndApp(APPID); diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 4cb0ac2de..556b2b77b 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -68,6 +68,7 @@ export type AlertType = | 'billing.planUpdate' | 'billing.automatedPlanUpdate' | 'appDistribution.newTesterIosDevice' + | 'appDistribution.inAppFeedback' | string; /** diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index c3f058cff..ffac2d43d 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -45,6 +45,36 @@ export interface NewTesterDevicePayload { testerDeviceIdentifier: string; } +/** + * The internal payload object for receiving in-app feedback from a tester. + * Payload is wrapped inside a `FirebaseAlertData` object. + */ +export interface InAppFeedbackPayload { + ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload'; + /** Resource name. Format: `projects/{project_number}/apps/{app_id}/releases/{release_id}/feedbackReports/{feedback_id}` */ + feedbackReport: string; + /** Name of the tester */ + testerName?: string; + /** Email of the tester */ + testerEmail: string; + /** + * Display version of the release. For an Android release, the display version + * is the `versionName`. For an iOS release, the display version is the + * `CFBundleShortVersionString`. + */ + displayVersion: string; + /** + * Build version of the release. For an Android release, the build version + * is the `versionCode`. For an iOS release, the build version is the + * `CFBundleVersion`. + */ + buildVersion: string; + /** Text entered by the tester */ + text: string; + /** URIs to download screenshot(s) */ + screenshotUris?: string[]; +} + /** * A custom CloudEvent for Firebase Alerts (with custom extension attributes). * @typeParam T - the data type for app distribution alerts that is wrapped in a `FirebaseAlertData` object. @@ -59,6 +89,8 @@ export interface AppDistributionEvent /** @internal */ export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice'; +/** @internal */ +export const inAppFeedbackAlert = 'appDistribution.inAppFeedback'; /** * Configuration for app distribution functions. @@ -234,6 +266,79 @@ export function onNewTesterIosDevicePublished( return func; } +/** + * Declares a function that can handle receiving new in-app feedback from a tester. + * @param handler - Event handler which is run every time new feedback is received. + * @returns A function that you can export and deploy. + */ +export function onInAppFeedbackPublished( + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving new in-app feedback from a tester. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler which is run every time new feedback is received. + * @returns A function that you can export and deploy. + */ +export function onInAppFeedbackPublished( + appId: string, + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving new in-app feedback from a tester. + * @param opts - Options that can be set on the function. + * @param handler - Event handler which is run every time new feedback is received. + * @returns A function that you can export and deploy. + */ +export function onInAppFeedbackPublished( + opts: AppDistributionOptions, + handler: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving new in-app feedback from a tester. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler which is run every time new feedback is received. + * @returns A function that you can export and deploy. + */ +export function onInAppFeedbackPublished( + appIdOrOptsOrHandler: + | string + | AppDistributionOptions + | (( + event: AppDistributionEvent + ) => any | Promise), + handler?: ( + event: AppDistributionEvent + ) => any | Promise +): CloudFunction> { + if (typeof appIdOrOptsOrHandler === 'function') { + handler = appIdOrOptsOrHandler as ( + event: AppDistributionEvent + ) => any | Promise; + appIdOrOptsOrHandler = {}; + } + + const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); + + const func = (raw: CloudEvent) => { + return handler(raw as AppDistributionEvent); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(opts, inAppFeedbackAlert, appId); + + return func; +} + /** * Helper function to parse the function opts and appId. * @internal From 526dcac9f98dff1e6e07d5a2ca25f893662681b8 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 19 Jul 2022 22:23:43 -0700 Subject: [PATCH 484/705] Modify docgen script for v1. (#1174) --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 13cf1bbf1..ae4d09adb 100644 --- a/package.json +++ b/package.json @@ -162,7 +162,8 @@ "scripts": { "apidocs": "node docgen/generate-docs.js", "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local", - "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && api-documenter-fire toc -i docgen/v1 -o docgen/v1/markdown/toc -p /docs/reference/functions", + "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1/markdown --output docgen/v1/markdown/toc --path /docs/functions/reference", + "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && npm run docgen:v1:toc", "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", From 733e90069d427b27cbcab15e2832a43ab29908eb Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 20 Jul 2022 13:54:41 -0700 Subject: [PATCH 485/705] Update api-documenter to the latest version supporting new project (#1175) header. --- package-lock.json | 200 +++++++++++++++++++++++++++++++++++++++------- package.json | 4 +- 2 files changed, 172 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index c778ba086..d739d07c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "firebase-functions": "lib/bin/firebase-functions.js" }, "devDependencies": { - "@firebase/api-documenter": "^0.1.2", + "@firebase/api-documenter": "^0.2.0", "@microsoft/api-documenter": "^7.13.45", "@microsoft/api-extractor": "^7.18.7", "@types/chai": "^4.1.7", @@ -130,32 +130,88 @@ } }, "node_modules/@firebase/api-documenter": { - "version": "0.1.2", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@firebase/api-documenter/-/api-documenter-0.2.0.tgz", + "integrity": "sha512-WQcOP5TvtRWMfGkpJpKpyVDjcB2UYCZWFmQm/nXUYUdI6PZ/Im1yb2YydgpnSlhrZxz6C1YkYFGLYCrltks1Yw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@microsoft/tsdoc": "0.12.24", - "@rushstack/node-core-library": "3.36.0", - "@rushstack/ts-command-line": "4.7.8", + "@rushstack/node-core-library": "3.45.5", + "@rushstack/ts-command-line": "4.11.0", "api-extractor-model-me": "0.1.1", - "colors": "~1.2.1", - "js-yaml": "4.0.0", - "resolve": "~1.17.0", + "colors": "~1.4.0", + "js-yaml": "4.1.0", + "resolve": "~1.22.0", "tslib": "^2.1.0" }, "bin": { "api-documenter-fire": "dist/start.js" } }, + "node_modules/@firebase/api-documenter/node_modules/@rushstack/node-core-library": { + "version": "3.45.5", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.5.tgz", + "integrity": "sha512-KbN7Hp9vH3bD3YJfv6RnVtzzTAwGYIBl7y2HQLY4WEQqRbvE3LgI78W9l9X+cTAXCX//p0EeoiUYNTFdqJrMZg==", + "dev": true, + "dependencies": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + } + }, + "node_modules/@firebase/api-documenter/node_modules/@rushstack/node-core-library/node_modules/colors": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", + "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "dev": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@firebase/api-documenter/node_modules/@rushstack/node-core-library/node_modules/resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@firebase/api-documenter/node_modules/@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, "node_modules/@firebase/api-documenter/node_modules/argparse": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@firebase/api-documenter/node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "dev": true, - "license": "Python-2.0" + "engines": { + "node": ">=0.1.90" + } }, "node_modules/@firebase/api-documenter/node_modules/js-yaml": { - "version": "4.0.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -163,15 +219,33 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/@firebase/api-documenter/node_modules/resolve": { - "version": "1.17.0", + "node_modules/@firebase/api-documenter/node_modules/validator": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/@firebase/api-documenter/node_modules/z-schema": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", + "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", "dev": true, - "license": "MIT", "dependencies": { - "path-parse": "^1.0.6" + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "bin": { + "z-schema": "bin/z-schema" + }, + "engines": { + "node": ">=8.0.0" + }, + "optionalDependencies": { + "commander": "^2.20.3" } }, "node_modules/@firebase/app-types": { @@ -840,9 +914,10 @@ } }, "node_modules/@rushstack/ts-command-line": { - "version": "4.7.8", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.11.0.tgz", + "integrity": "sha512-ptG9L0mjvJ5QtK11GsAFY+jGfsnqHDS6CY6Yw1xT7a9bhjfNYnf6UPwjV+pF6UgiucfNcMDNW9lkDLxvZKKxMg==", "dev": true, - "license": "MIT", "dependencies": { "@types/argparse": "1.0.38", "argparse": "~1.0.9", @@ -5811,35 +5886,98 @@ } }, "@firebase/api-documenter": { - "version": "0.1.2", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@firebase/api-documenter/-/api-documenter-0.2.0.tgz", + "integrity": "sha512-WQcOP5TvtRWMfGkpJpKpyVDjcB2UYCZWFmQm/nXUYUdI6PZ/Im1yb2YydgpnSlhrZxz6C1YkYFGLYCrltks1Yw==", "dev": true, "requires": { "@microsoft/tsdoc": "0.12.24", - "@rushstack/node-core-library": "3.36.0", - "@rushstack/ts-command-line": "4.7.8", + "@rushstack/node-core-library": "3.45.5", + "@rushstack/ts-command-line": "4.11.0", "api-extractor-model-me": "0.1.1", - "colors": "~1.2.1", - "js-yaml": "4.0.0", - "resolve": "~1.17.0", + "colors": "~1.4.0", + "js-yaml": "4.1.0", + "resolve": "~1.22.0", "tslib": "^2.1.0" }, "dependencies": { + "@rushstack/node-core-library": { + "version": "3.45.5", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.5.tgz", + "integrity": "sha512-KbN7Hp9vH3bD3YJfv6RnVtzzTAwGYIBl7y2HQLY4WEQqRbvE3LgI78W9l9X+cTAXCX//p0EeoiUYNTFdqJrMZg==", + "dev": true, + "requires": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "timsort": "~0.3.0", + "z-schema": "~5.0.2" + }, + "dependencies": { + "colors": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", + "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, "argparse": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "dev": true }, "js-yaml": { - "version": "4.0.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { "argparse": "^2.0.1" } }, - "resolve": { - "version": "1.17.0", + "validator": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==", + "dev": true + }, + "z-schema": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.3.tgz", + "integrity": "sha512-sGvEcBOTNum68x9jCpCVGPFJ6mWnkD0YxOcddDlJHRx3tKdB2q8pCHExMVZo/AV/6geuVJXG7hljDaWG8+5GDw==", "dev": true, "requires": { - "path-parse": "^1.0.6" + "commander": "^2.20.3", + "lodash.get": "^4.4.2", + "lodash.isequal": "^4.5.0", + "validator": "^13.7.0" } } } @@ -6360,7 +6498,9 @@ } }, "@rushstack/ts-command-line": { - "version": "4.7.8", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.11.0.tgz", + "integrity": "sha512-ptG9L0mjvJ5QtK11GsAFY+jGfsnqHDS6CY6Yw1xT7a9bhjfNYnf6UPwjV+pF6UgiucfNcMDNW9lkDLxvZKKxMg==", "dev": true, "requires": { "@types/argparse": "1.0.38", diff --git a/package.json b/package.json index ae4d09adb..ca4b9ba36 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "apidocs": "node docgen/generate-docs.js", "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local", "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1/markdown --output docgen/v1/markdown/toc --path /docs/functions/reference", - "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown && npm run docgen:v1:toc", + "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown --project functions && npm run docgen:v1:toc", "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", @@ -189,7 +189,7 @@ "node-fetch": "^2.6.7" }, "devDependencies": { - "@firebase/api-documenter": "^0.1.2", + "@firebase/api-documenter": "^0.2.0", "@microsoft/api-documenter": "^7.13.45", "@microsoft/api-extractor": "^7.18.7", "@types/chai": "^4.1.7", From 9b6da2d8d12c70914e5ca6258c50b56239e4ad88 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Wed, 20 Jul 2022 15:03:57 -0700 Subject: [PATCH 486/705] Fixing path I should have noticed in review. (#1176) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca4b9ba36..000d85096 100644 --- a/package.json +++ b/package.json @@ -162,7 +162,7 @@ "scripts": { "apidocs": "node docgen/generate-docs.js", "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local", - "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1/markdown --output docgen/v1/markdown/toc --path /docs/functions/reference", + "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1/markdown --output docgen/v1/markdown/toc --path /docs/reference/functions", "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown --project functions && npm run docgen:v1:toc", "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", From 1877e980d72d565807482a314c51b8651bf9a554 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 26 Jul 2022 14:59:20 -0700 Subject: [PATCH 487/705] Fix integration tests (#1179) One notable change made here is that we generate and include ID tokens in requests to http/callable functions since we aren't allowed to run public functions on internal GCP project. --- integration_test/README.md | 13 +++++- integration_test/firebase.json | 3 ++ integration_test/functions/src/index.ts | 43 +++++++++++-------- .../functions/src/v1/https-tests.ts | 17 +++++--- .../functions/src/v2/https-tests.ts | 2 +- integration_test/functions/tsconfig.json | 2 +- integration_test/run_tests.sh | 4 +- package.json | 2 +- 8 files changed, 54 insertions(+), 32 deletions(-) diff --git a/integration_test/README.md b/integration_test/README.md index c6a0ca32d..3b0f5413f 100644 --- a/integration_test/README.md +++ b/integration_test/README.md @@ -8,6 +8,15 @@ Run the integration test as follows: ./run_tests.sh [] ``` -If just one project_id is provided, the both the node6 and node8 tests will be run on that project, in series. If two project_ids are provided, the node6 tests will be run on the first project and the node8 tests will be run on the second one, in parallel. +Test runs cycles of testing, once for Node.js 14 and another for Node.js 16. -The tests run fully automatically, and will print the result on standard out. The integration test for HTTPS is that it properly kicks off other integration tests and returns a result. From there the other integration test suites will write their results back to the database, where you can check the detailed results if you'd like. +Test uses locally installed firebase to invoke commands for deploying function. The test also requires that you have +gcloud CLI installed and authenticated (`gcloud auth login`). + +Integration test is triggered by invoking HTTP function integrationTest which in turns invokes each function trigger +by issuing actions necessary to trigger it (e.g. write to storage bucket). + +### Debugging + +The status and result of each test is stored in RTDB of the project used for testing. You can also inspect Cloud Logging +for more clues. diff --git a/integration_test/firebase.json b/integration_test/firebase.json index ce496e265..382d79c84 100644 --- a/integration_test/firebase.json +++ b/integration_test/firebase.json @@ -5,5 +5,8 @@ "firestore": { "rules": "firestore.rules", "indexes": "firestore.indexes.json" + }, + "functions": { + "predeploy": ["npm --prefix \"$RESOURCE_DIR\" run build"] } } diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index e8c6918a5..3a5fd8474 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,4 +1,5 @@ import { PubSub } from '@google-cloud/pubsub'; +import { GoogleAuth } from 'google-auth-library'; import { Request, Response } from 'express'; import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; @@ -22,17 +23,19 @@ const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG); admin.initializeApp(); async function callHttpsTrigger(name: string, data: any) { - const resp = await fetch( - `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ data }), - } + const url = `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`; + const client = await new GoogleAuth().getIdTokenClient( + '32555940559.apps.googleusercontent.com' ); - if (!resp.ok) { + const resp = await client.request({ + url, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ data }), + }); + if (resp.status > 200) { throw Error(resp.statusText); } } @@ -42,7 +45,7 @@ async function callV2HttpsTrigger( data: any, accessToken: string ) { - let resp = await fetch( + const getFnResp = await fetch( `https://cloudfunctions.googleapis.com/v2beta/projects/${firebaseConfig.projectId}/locations/${REGION}/functions/${name}`, { headers: { @@ -50,23 +53,28 @@ async function callV2HttpsTrigger( }, } ); - if (!resp.ok) { - throw new Error(resp.statusText); + if (!getFnResp.ok) { + throw new Error(getFnResp.statusText); } - const fn = await resp.json(); + const fn = await getFnResp.json(); const uri = fn.serviceConfig?.uri; if (!uri) { throw new Error(`Cannot call v2 https trigger ${name} - no uri found`); } - resp = await fetch(uri, { + + const client = await new GoogleAuth().getIdTokenClient( + '32555940559.apps.googleusercontent.com' + ); + const invokeFnREsp = await client.request({ + url: uri, method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ data }), }); - if (!resp.ok) { - throw new Error(resp.statusText); + if (invokeFnREsp.status > 200) { + throw Error(invokeFnREsp.statusText); } } @@ -170,6 +178,7 @@ export const integrationTests: any = functions .region(REGION) .runWith({ timeoutSeconds: 540, + invoker: 'private', }) .https.onRequest(async (req: Request, resp: Response) => { const testId = admin diff --git a/integration_test/functions/src/v1/https-tests.ts b/integration_test/functions/src/v1/https-tests.ts index 8acf8932f..bce05f341 100644 --- a/integration_test/functions/src/v1/https-tests.ts +++ b/integration_test/functions/src/v1/https-tests.ts @@ -2,10 +2,13 @@ import * as functions from 'firebase-functions'; import { REGION } from '../region'; import { expectEq, TestSuite } from '../testing'; -export const callableTests: any = functions.region(REGION).https.onCall((d) => { - return new TestSuite('https onCall') - .it('should have the correct data', (data: any) => - expectEq(data?.foo, 'bar') - ) - .run(d.testId, d); -}); +export const callableTests: any = functions + .runWith({ invoker: 'private' }) + .region(REGION) + .https.onCall((d) => { + return new TestSuite('https onCall') + .it('should have the correct data', (data: any) => + expectEq(data?.foo, 'bar') + ) + .run(d.testId, d); + }); diff --git a/integration_test/functions/src/v2/https-tests.ts b/integration_test/functions/src/v2/https-tests.ts index 4936c48ea..448464ef0 100644 --- a/integration_test/functions/src/v2/https-tests.ts +++ b/integration_test/functions/src/v2/https-tests.ts @@ -1,7 +1,7 @@ import { onCall } from 'firebase-functions/v2/https'; import { expectEq, TestSuite } from '../testing'; -export const callabletests = onCall((req) => { +export const callabletests = onCall({ invoker: 'private' }, (req) => { return new TestSuite('v2 https onCall') .it('should have the correct data', (data: any) => expectEq(data?.foo, 'bar') diff --git a/integration_test/functions/tsconfig.json b/integration_test/functions/tsconfig.json index a5bd57033..77fb279d5 100644 --- a/integration_test/functions/tsconfig.json +++ b/integration_test/functions/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "lib": ["es6", "dom"], "module": "commonjs", - "target": "es6", + "target": "es2020", "noImplicitAny": false, "outDir": "lib", "declaration": true, diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 814ddc492..9098c912c 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -74,8 +74,6 @@ function delete_all_functions { } function deploy { - cd "${DIR}" - ./functions/node_modules/.bin/tsc -p functions/ # Deploy functions, and security rules for database and Firestore. If the deploy fails, retry twice if [[ "${TOKEN}" == "" ]]; then for i in 1 2 3; do firebase deploy --project="${PROJECT_ID}" --only functions,database,firestore && break; done @@ -97,7 +95,7 @@ function run_tests { TEST_URL="https://${FIREBASE_FUNCTIONS_TEST_REGION}-${PROJECT_ID}.${TEST_DOMAIN}/integrationTests" echo "${TEST_URL}" - curl --fail "${TEST_URL}" + curl --fail -H "Authorization: Bearer $(gcloud auth print-identity-token)" "${TEST_URL}" } function cleanup { diff --git a/package.json b/package.json index 000d85096..e6c277745 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && npm run docgen:v2:toc", "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen", - "build:pack": "rm -rf lib && npm install --production && tsc -p tsconfig.release.json && npm pack", + "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", "build": "tsc -p tsconfig.release.json", "build:watch": "npm run build -- -w", From 6edbb95a9b7fba1b8015eeb05785637581bfe1f3 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 29 Jul 2022 12:08:54 -0700 Subject: [PATCH 488/705] Automatically run integration test on PR merge (#1182) Setup Github Workflow to automatically run integration test on commits to master branch. The test can be triggered manually by visiting https://github.com/firebase/firebase-functions/actions/workflows/postmerge.yaml. You can also manually trigger the test via: ``` GCLOUD_PROJECT= npm run test:postmerge ``` Make sure your test project has all necessary resources enambled (i.e. enable Firestore, Storage, RTDB, Auth, etc.) Only one test can run at a time, so I've enforced/disabled concurrency on the workflow. --- .github/workflows/postmerge.yaml | 55 ++++++++++++++++++++++++++++++++ integration_test/run_tests.sh | 34 ++++---------------- package.json | 3 +- 3 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/postmerge.yaml diff --git a/.github/workflows/postmerge.yaml b/.github/workflows/postmerge.yaml new file mode 100644 index 000000000..f5105958c --- /dev/null +++ b/.github/workflows/postmerge.yaml @@ -0,0 +1,55 @@ +# Copyright 2022 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +name: Post-merge tests + +on: + workflow_dispatch: + workflow_run: + workflows: ['CI Tests'] + types: [completed] + branches: [master] + +concurrency: + group: postmerge-${{ github.ref }} + cancel-in-progress: true + +env: + CI: true + +jobs: + postmerge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + + - uses: google-github-actions/auth@v0 + with: + credentials_json: '${{ secrets.CF3_INTEGRATION_TEST_GOOGLE_CREDENTIALS }}' + create_credentials_file: true + + - name: 'Set up Cloud SDK' + uses: google-github-actions/setup-gcloud@v0 + + - name: 'Setup Firebase CLI' + run: npm i -g firebase-tools + + - name: 'Run integration test' + run: npm run test:postmerge + + - name: Print debug logs + if: failure() + run: find . -type f -name "*debug.log" | xargs cat diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh index 9098c912c..681d2dc1e 100755 --- a/integration_test/run_tests.sh +++ b/integration_test/run_tests.sh @@ -3,26 +3,14 @@ # Exit immediately if a command exits with a non-zero status. set -e -function usage { - echo "Usage: ${0} []" - exit 1 -} +PROJECT_ID="${GCLOUD_PROJECT}" +TIMESTAMP=$(date +%s) -# This script takes in one required argument specifying a project_id and an -# optional arguement for a CI token that can be obtained by running -# `firebase login:ci` -# Example usage (from root dir) without token: -# ./integration_test/run_tests.sh chenky-test-proj -# Example usage (from root dir) with token: -# ./integration_test/run_tests.sh chenky-test-proj $TOKEN -if [[ "${1}" == "" ]]; then - usage +if [[ "${PROJECT_ID}" == "" ]]; then + echo "process.env.GCLOUD_PROJECT cannot be empty" + exit 1 fi -PROJECT_ID="${1}" -TIMESTAMP=$(date +%s) -TOKEN="${2}" - # Directory where this script lives. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -64,22 +52,14 @@ function delete_all_functions { cd "${DIR}" # Try to delete, if there are errors it is because the project is already empty, # in that case do nothing. - if [[ "${TOKEN}" == "" ]]; then - firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID || : & - else - firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID --token=$TOKEN || : & - fi + firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID || : & wait announce "Project emptied." } function deploy { # Deploy functions, and security rules for database and Firestore. If the deploy fails, retry twice - if [[ "${TOKEN}" == "" ]]; then - for i in 1 2 3; do firebase deploy --project="${PROJECT_ID}" --only functions,database,firestore && break; done - else - for i in 1 2 3; do firebase deploy --project="${PROJECT_ID}" --token="${TOKEN}" --only functions,database,firestore && break; done - fi + for i in 1 2; do firebase deploy --project="${PROJECT_ID}" --only functions,database,firestore && break; done } function run_tests { diff --git a/package.json b/package.json index e6c277745..a8ea942e3 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,8 @@ "lint": "tslint --config tslint.json --project tsconfig.json ", "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json", "test": "mocha --file ./mocha/setup.ts \"spec/**/*.spec.ts\"", - "test:bin": "./scripts/bin-test/run.sh" + "test:bin": "./scripts/bin-test/run.sh", + "test:postmerge": "./integration_test/run_tests.sh" }, "dependencies": { "@types/cors": "^2.8.5", From d22ff201ed5c216da81085121146eb598a74a637 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 5 Aug 2022 10:28:49 -0700 Subject: [PATCH 489/705] Export Auth types to have them show up in the reference docs. (#1186) --- src/v2/providers/identity.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index b68136d8e..80d1cf0b8 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -28,6 +28,7 @@ import { BlockingFunction } from '../../cloud-functions'; import { AuthBlockingEvent, + AuthUserRecord, AuthBlockingEventType, BeforeCreateResponse, BeforeSignInResponse, @@ -36,7 +37,7 @@ import { } from '../../common/providers/identity'; import * as options from '../options'; -export { HttpsError }; +export { AuthUserRecord, AuthBlockingEvent, HttpsError }; /** @hidden Internally used when parsing the options. */ interface InternalOptions { From 0e4ffb6f75d938d02372d0a87dcf281fbb178fe7 Mon Sep 17 00:00:00 2001 From: Josh Ladieu Date: Thu, 11 Aug 2022 12:46:25 -0400 Subject: [PATCH 490/705] Make `screenshotUris` non-optional. (#1188) If omitted, default to an empty list. --- src/v2/providers/alerts/appDistribution.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index ffac2d43d..c4511c066 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -72,7 +72,7 @@ export interface InAppFeedbackPayload { /** Text entered by the tester */ text: string; /** URIs to download screenshot(s) */ - screenshotUris?: string[]; + screenshotUris: string[]; } /** @@ -330,7 +330,10 @@ export function onInAppFeedbackPublished( const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); const func = (raw: CloudEvent) => { - return handler(raw as AppDistributionEvent); + const event = raw as AppDistributionEvent; + // Consolidate the case of empty array and null array + event.data.payload.screenshotUris = event.data.payload.screenshotUris || []; + return handler(event); }; func.run = handler; From f751f5ce7d5ba7b940a6d39f1631bfb17cf36e15 Mon Sep 17 00:00:00 2001 From: Josh Ladieu Date: Thu, 11 Aug 2022 14:10:46 -0400 Subject: [PATCH 491/705] Update `InAppFeedbackPayload` (#1187) * Add `feedbackConsoleUri` * Clarify fast expiry of `screenshotUris` --- src/v2/providers/alerts/appDistribution.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index c4511c066..6e519a23e 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -53,6 +53,8 @@ export interface InAppFeedbackPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload'; /** Resource name. Format: `projects/{project_number}/apps/{app_id}/releases/{release_id}/feedbackReports/{feedback_id}` */ feedbackReport: string; + /** Deep link back to the Firebase console. */ + feedbackConsoleUri: string; /** Name of the tester */ testerName?: string; /** Email of the tester */ @@ -71,7 +73,7 @@ export interface InAppFeedbackPayload { buildVersion: string; /** Text entered by the tester */ text: string; - /** URIs to download screenshot(s) */ + /** URIs to download screenshot(s). These URIs are fast expiring. */ screenshotUris: string[]; } From f9ecee4214e27bbe0f9e52323729506eba150a50 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Tue, 23 Aug 2022 13:28:48 -0400 Subject: [PATCH 492/705] Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199) * adding customClaims and sessionClaims to updateMask & fix tests * add changelog --- CHANGELOG.md | 1 + integration_test/functions/src/index.ts | 2 +- spec/common/providers/identity.spec.ts | 15 +-------------- src/common/providers/identity.ts | 3 --- src/v2/providers/identity.ts | 2 +- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..d61eb5f0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199). diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index 3a5fd8474..a880c64ea 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -1,9 +1,9 @@ import { PubSub } from '@google-cloud/pubsub'; -import { GoogleAuth } from 'google-auth-library'; import { Request, Response } from 'express'; import * as admin from 'firebase-admin'; import * as functions from 'firebase-functions'; import * as fs from 'fs'; +import { GoogleAuth } from 'google-auth-library'; import fetch from 'node-fetch'; import * as v1 from './v1'; diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts index 592d14767..2b2ea71e9 100644 --- a/spec/common/providers/identity.spec.ts +++ b/spec/common/providers/identity.spec.ts @@ -765,19 +765,6 @@ describe('identity', () => { expect(identity.getUpdateMask()).to.eq(''); }); - it('should return empty on only customClaims and sessionClaims', () => { - const response = { - customClaims: { - claim1: 'abc', - }, - sessionClaims: { - claim2: 'def', - }, - }; - - expect(identity.getUpdateMask(response)).to.eq(''); - }); - it('should return the right claims on a response', () => { const response = { displayName: 'john', @@ -793,7 +780,7 @@ describe('identity', () => { }; expect(identity.getUpdateMask(response)).to.eq( - 'displayName,disabled,emailVerified,photoURL' + 'displayName,disabled,emailVerified,photoURL,customClaims,sessionClaims' ); }); }); diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts index 2c0ce0a2e..0a376be9e 100644 --- a/src/common/providers/identity.ts +++ b/src/common/providers/identity.ts @@ -799,9 +799,6 @@ export function getUpdateMask( } const updateMask: string[] = []; for (const key in authResponse) { - if (key === 'customClaims' || key === 'sessionClaims') { - continue; - } if ( authResponse.hasOwnProperty(key) && typeof authResponse[key] !== 'undefined' diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index 80d1cf0b8..eb03c747b 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -28,8 +28,8 @@ import { BlockingFunction } from '../../cloud-functions'; import { AuthBlockingEvent, - AuthUserRecord, AuthBlockingEventType, + AuthUserRecord, BeforeCreateResponse, BeforeSignInResponse, HttpsError, From c0e0361ef869f5d8b15fe2a25c74355ebc87e09b Mon Sep 17 00:00:00 2001 From: Kai Bolay Date: Wed, 24 Aug 2022 17:25:22 -0400 Subject: [PATCH 493/705] Change payload based on API council feedback: (#1209) - combine `display_version` and `build_version` into `app_version`. - change repeated field `screenshot_uris` to (optional) field `screenshot_uri`. --- src/v2/providers/alerts/appDistribution.ts | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 6e519a23e..512c3e95a 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -60,21 +60,14 @@ export interface InAppFeedbackPayload { /** Email of the tester */ testerEmail: string; /** - * Display version of the release. For an Android release, the display version - * is the `versionName`. For an iOS release, the display version is the - * `CFBundleShortVersionString`. + * Version consisting of `versionName` and `versionCode` for Android and + * `CFBundleShortVersionString` and `CFBundleVersion` for iOS. */ - displayVersion: string; - /** - * Build version of the release. For an Android release, the build version - * is the `versionCode`. For an iOS release, the build version is the - * `CFBundleVersion`. - */ - buildVersion: string; + appVersion: string; /** Text entered by the tester */ text: string; - /** URIs to download screenshot(s). These URIs are fast expiring. */ - screenshotUris: string[]; + /** URI to download screenshot. This URIs are is fast expiring. */ + screenshotUri?: string; } /** @@ -332,10 +325,7 @@ export function onInAppFeedbackPublished( const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); const func = (raw: CloudEvent) => { - const event = raw as AppDistributionEvent; - // Consolidate the case of empty array and null array - event.data.payload.screenshotUris = event.data.payload.screenshotUris || []; - return handler(event); + return handler(raw as AppDistributionEvent); }; func.run = handler; From eed7d59e33ae0ff131070fc8facee839ad73d977 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Thu, 25 Aug 2022 12:52:12 -0400 Subject: [PATCH 494/705] Add v2 Schedule Triggers (#1177) Adds schedule triggers to the v2 namespace. - Replaces pub/sub with an http underlying function - Updated syntax to match with the other v2 triggers This change does not add the `invoker` property to the container contract. ``` export const sch = v2.scheduler.onSchedule("* * * * *", () => {}); export const sch = v2.scheduler.onSchedule( { schedule: "* * * * *", timeZone: "utc", }, () => {} ); ``` --- CHANGELOG.md | 1 + integration_test/functions/src/index.ts | 28 + integration_test/functions/src/v2/index.ts | 1 + .../functions/src/v2/scheduled-tests.ts | 23 + package.json | 6 +- spec/v2/providers/scheduler.spec.ts | 140 +++++ src/common/timezone.ts | 542 ++++++++++++++++++ src/runtime/manifest.ts | 8 +- src/v2/index.ts | 2 + src/v2/providers/scheduler.ts | 210 +++++++ v2/scheduler.js | 26 + 11 files changed, 982 insertions(+), 5 deletions(-) create mode 100644 integration_test/functions/src/v2/scheduled-tests.ts create mode 100644 spec/v2/providers/scheduler.spec.ts create mode 100644 src/common/timezone.ts create mode 100644 src/v2/providers/scheduler.ts create mode 100644 v2/scheduler.js diff --git a/CHANGELOG.md b/CHANGELOG.md index d61eb5f0d..8dd094b29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199). +- Add v2 Schedule Triggers (#1177). diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts index a880c64ea..43378bf42 100644 --- a/integration_test/functions/src/index.ts +++ b/integration_test/functions/src/index.ts @@ -101,6 +101,32 @@ async function callScheduleTrigger( return; } +async function callV2ScheduleTrigger( + functionName: string, + region: string, + accessToken: string +) { + const response = await fetch( + `https://cloudscheduler.googleapis.com/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`, + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${accessToken}`, + }, + } + ); + if (!response.ok) { + throw new Error(`Failed request with status ${response.status}!`); + } + const data = await response.text(); + functions.logger.log( + `Successfully scheduled v2 function ${functionName}`, + data + ); + return; +} + async function updateRemoteConfig( testId: string, accessToken: string @@ -171,6 +197,8 @@ function v2Tests(testId: string, accessToken: string): Array> { return [ // Invoke a callable HTTPS trigger. callV2HttpsTrigger('v2-callabletests', { foo: 'bar', testId }, accessToken), + // Invoke a scheduled trigger. + callV2ScheduleTrigger('v2-schedule', 'us-central1', accessToken), ]; } diff --git a/integration_test/functions/src/v2/index.ts b/integration_test/functions/src/v2/index.ts index def01bfbb..6b8f55e2a 100644 --- a/integration_test/functions/src/v2/index.ts +++ b/integration_test/functions/src/v2/index.ts @@ -3,3 +3,4 @@ import { REGION } from '../region'; setGlobalOptions({ region: REGION }); export * from './https-tests'; +export * from './scheduled-tests'; diff --git a/integration_test/functions/src/v2/scheduled-tests.ts b/integration_test/functions/src/v2/scheduled-tests.ts new file mode 100644 index 000000000..ffffb386c --- /dev/null +++ b/integration_test/functions/src/v2/scheduled-tests.ts @@ -0,0 +1,23 @@ +import * as admin from 'firebase-admin'; +import { onSchedule } from 'firebase-functions/v2/scheduler'; +import { REGION } from '../region'; +import { success, TestSuite } from '../testing'; + +export const schedule: any = onSchedule( + { + schedule: 'every 10 hours', + region: REGION, + }, + async (event) => { + const db = admin.database(); + const snap = await db + .ref('testRuns') + .orderByChild('timestamp') + .limitToLast(1) + .once('value'); + const testId = Object.keys(snap.val())[0]; + return new TestSuite('scheduler scheduleOnRun') + .it('should trigger when the scheduler fires', () => success()) + .run(testId, null); + } +); diff --git a/package.json b/package.json index a8ea942e3..69265b485 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,8 @@ "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js", "./v2/eventarc": "./lib/v2/providers/eventarc.js", "./v2/identity": "./lib/v2/providers/identity.js", - "./v2/database": "./lib/v2/providers/database.js" + "./v2/database": "./lib/v2/providers/database.js", + "./v2/scheduler": "./lib/v2/providers/scheduler.js" }, "typesVersions": { "*": { @@ -153,6 +154,9 @@ ], "v2/tasks": [ "lib/v2/providers/tasks" + ], + "v2/scheduler": [ + "lib/v2/providers/scheduler" ] } }, diff --git a/spec/v2/providers/scheduler.spec.ts b/spec/v2/providers/scheduler.spec.ts new file mode 100644 index 000000000..7d690cbe5 --- /dev/null +++ b/spec/v2/providers/scheduler.spec.ts @@ -0,0 +1,140 @@ +// 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. + +import { expect } from 'chai'; +import * as schedule from '../../../src/v2/providers/scheduler'; + +describe('schedule', () => { + describe('getOpts', () => { + it('should handle a schedule', () => { + expect(schedule.getOpts('* * * * *')).to.deep.eq({ + schedule: '* * * * *', + opts: {}, + }); + }); + + it('should handle full options', () => { + const options: schedule.ScheduleOptions = { + schedule: '* * * * *', + timeZone: 'utc', + retryCount: 3, + maxRetrySeconds: 1, + minBackoffSeconds: 2, + maxBackoffSeconds: 3, + maxDoublings: 4, + memory: '128MiB', + region: 'us-central1', + }; + + expect(schedule.getOpts(options)).to.deep.eq({ + schedule: '* * * * *', + timeZone: 'utc', + retryCount: 3, + maxRetrySeconds: 1, + minBackoffSeconds: 2, + maxBackoffSeconds: 3, + maxDoublings: 4, + opts: { + ...options, + memory: '128MiB', + region: 'us-central1', + }, + }); + }); + }); + + describe('onSchedule', () => { + it('should create a schedule function given a schedule', () => { + const schfn = schedule.onSchedule('* * * * *', (event) => console.log(1)); + + expect(schfn.__endpoint).to.deep.eq({ + platform: 'gcfv2', + labels: {}, + scheduleTrigger: { + schedule: '* * * * *', + retryConfig: {}, + }, + }); + expect(schfn.__requiredAPIs).to.deep.eq([ + { + api: 'cloudscheduler.googleapis.com', + reason: 'Needed for scheduled functions.', + }, + ]); + }); + + it('should create a schedule function given options', () => { + const schfn = schedule.onSchedule( + { + schedule: '* * * * *', + timeZone: 'utc', + retryCount: 3, + maxRetrySeconds: 10, + minBackoffSeconds: 11, + maxBackoffSeconds: 12, + maxDoublings: 2, + region: 'us-central1', + labels: { key: 'val' }, + }, + (event) => {} + ); + + expect(schfn.__endpoint).to.deep.eq({ + platform: 'gcfv2', + labels: { key: 'val' }, + region: ['us-central1'], + scheduleTrigger: { + schedule: '* * * * *', + timeZone: 'utc', + retryConfig: { + retryCount: 3, + maxRetrySeconds: 10, + minBackoffSeconds: 11, + maxBackoffSeconds: 12, + maxDoublings: 2, + }, + }, + }); + expect(schfn.__requiredAPIs).to.deep.eq([ + { + api: 'cloudscheduler.googleapis.com', + reason: 'Needed for scheduled functions.', + }, + ]); + }); + + it('should have a .run method', () => { + const testObj = { + foo: 'bar', + }; + const schfn = schedule.onSchedule('* * * * *', (event) => { + testObj.foo = 'newBar'; + }); + + schfn.run('input' as any); + + expect(testObj).to.deep.eq({ + foo: 'newBar', + }); + }); + }); +}); diff --git a/src/common/timezone.ts b/src/common/timezone.ts new file mode 100644 index 000000000..5af4980fc --- /dev/null +++ b/src/common/timezone.ts @@ -0,0 +1,542 @@ +export const tzDatabase: Record = { + 'Africa/Abidjan': '+00:00', + 'Africa/Accra': '+00:00', + 'Africa/Addis_Ababa': '+03:00', + 'Africa/Algiers': '+01:00', + 'Africa/Asmara': '+03:00', + 'Africa/Asmera': '+03:00', + 'Africa/Bamako': '+00:00', + 'Africa/Bangui': '+01:00', + 'Africa/Banjul': '+00:00', + 'Africa/Blantyre': '+02:00', + 'Africa/Brazzaville': '+01:00', + 'Africa/Bujumbura': '+02:00', + 'Africa/Cairo': '+02:00', + 'Africa/Casablanca': '+00:00', + 'Africa/Ceuta': '+01:00', + 'Africa/Conakry': '+00:00', + 'Africa/Dakar': '+00:00', + 'Africa/Dar_es_Salaam': '+03:00', + 'Africa/Djibouti': '+03:00', + 'Africa/Douala': '+01:00', + 'Africa/El_Aaiun': '+00:00', + 'Africa/Freetown': '+00:00', + 'Africa/Gaborone': '+02:00', + 'Africa/Harare': '+02:00', + 'Africa/Johannesburg': '+02:00', + 'Africa/Juba': '+03:00', + 'Africa/Kampala': '+03:00', + 'Africa/Khartoum': '+03:00', + 'Africa/Kigali': '+02:00', + 'Africa/Kinshasa': '+01:00', + 'Africa/Lagos': '+01:00', + 'Africa/Libreville': '+01:00', + 'Africa/Lome': '+00:00', + 'Africa/Luanda': '+01:00', + 'Africa/Lubumbashi': '+02:00', + 'Africa/Lusaka': '+02:00', + 'Africa/Malabo': '+01:00', + 'Africa/Maputo': '+02:00', + 'Africa/Maseru': '+02:00', + 'Africa/Mbabane': '+02:00', + 'Africa/Mogadishu': '+03:00', + 'Africa/Monrovia': '+00:00', + 'Africa/Nairobi': '+03:00', + 'Africa/Ndjamena': '+01:00', + 'Africa/Niamey': '+01:00', + 'Africa/Nouakchott': '+00:00', + 'Africa/Ouagadougou': '+00:00', + 'Africa/Porto-Novo': '+01:00', + 'Africa/Sao_Tome': '+00:00', + 'Africa/Timbuktu': '+00:00', + 'Africa/Tripoli': '+02:00', + 'Africa/Tunis': '+01:00', + 'Africa/Windhoek': '+01:00', + 'America/Adak': '-10:00', + 'America/Anchorage': '-09:00', + 'America/Anguilla': '-04:00', + 'America/Antigua': '-04:00', + 'America/Araguaina': '-03:00', + 'America/Argentina/Buenos_Aires': '-03:00', + 'America/Argentina/Catamarca': '-03:00', + 'America/Argentina/ComodRivadavia': '-03:00', + 'America/Argentina/Cordoba': '-03:00', + 'America/Argentina/Jujuy': '-03:00', + 'America/Argentina/La_Rioja': '-03:00', + 'America/Argentina/Mendoza': '-03:00', + 'America/Argentina/Rio_Gallegos': '-03:00', + 'America/Argentina/Salta': '-03:00', + 'America/Argentina/San_Juan': '-03:00', + 'America/Argentina/San_Luis': '-03:00', + 'America/Argentina/Tucuman': '-03:00', + 'America/Argentina/Ushuaia': '-03:00', + 'America/Aruba': '-04:00', + 'America/Asuncion': '-04:00', + 'America/Atikokan': '-05:00', + 'America/Atka': '-10:00', + 'America/Bahia': '-03:00', + 'America/Bahia_Banderas': '-06:00', + 'America/Barbados': '-04:00', + 'America/Belem': '-03:00', + 'America/Belize': '-06:00', + 'America/Blanc-Sablon': '-04:00', + 'America/Boa_Vista': '-04:00', + 'America/Bogota': '-05:00', + 'America/Boise': '-07:00', + 'America/Buenos_Aires': '-03:00', + 'America/Cambridge_Bay': '-07:00', + 'America/Campo_Grande': '-04:00', + 'America/Cancun': '-06:00', + 'America/Caracas': '-04:30', + 'America/Catamarca': '-03:00', + 'America/Cayenne': '-03:00', + 'America/Cayman': '-05:00', + 'America/Chicago': '-06:00', + 'America/Chihuahua': '-07:00', + 'America/Coral_Harbour': '-05:00', + 'America/Cordoba': '-03:00', + 'America/Costa_Rica': '-06:00', + 'America/Creston': '-07:00', + 'America/Cuiaba': '-04:00', + 'America/Curacao': '-04:00', + 'America/Danmarkshavn': '+00:00', + 'America/Dawson': '-08:00', + 'America/Dawson_Creek': '-07:00', + 'America/Denver': '-07:00', + 'America/Detroit': '-05:00', + 'America/Dominica': '-04:00', + 'America/Edmonton': '-07:00', + 'America/Eirunepe': '-05:00', + 'America/El_Salvador': '-06:00', + 'America/Ensenada': '-08:00', + 'America/Fort_Wayne': '-05:00', + 'America/Fortaleza': '-03:00', + 'America/Glace_Bay': '-04:00', + 'America/Godthab': '-03:00', + 'America/Goose_Bay': '-04:00', + 'America/Grand_Turk': '-05:00', + 'America/Grenada': '-04:00', + 'America/Guadeloupe': '-04:00', + 'America/Guatemala': '-06:00', + 'America/Guayaquil': '-05:00', + 'America/Guyana': '-04:00', + 'America/Halifax': '-04:00', + 'America/Havana': '-05:00', + 'America/Hermosillo': '-07:00', + 'America/Indiana/Indianapolis': '-05:00', + 'America/Indiana/Knox': '-06:00', + 'America/Indiana/Marengo': '-05:00', + 'America/Indiana/Petersburg': '-05:00', + 'America/Indiana/Tell_City': '-06:00', + 'America/Indiana/Valparaiso': '-06:00', + 'America/Indiana/Vevay': '-05:00', + 'America/Indiana/Vincennes': '-05:00', + 'America/Indiana/Winamac': '-05:00', + 'America/Indianapolis': '-05:00', + 'America/Inuvik': '-07:00', + 'America/Iqaluit': '-05:00', + 'America/Jamaica': '-05:00', + 'America/Jujuy': '-03:00', + 'America/Juneau': '-09:00', + 'America/Kentucky/Louisville': '-05:00', + 'America/Kentucky/Monticello': '-05:00', + 'America/Knox_IN': '-06:00', + 'America/Kralendijk': '-04:00', + 'America/La_Paz': '-04:00', + 'America/Lima': '-05:00', + 'America/Los_Angeles': '-08:00', + 'America/Louisville': '-05:00', + 'America/Lower_Princes': '-04:00', + 'America/Maceio': '-03:00', + 'America/Managua': '-06:00', + 'America/Manaus': '-04:00', + 'America/Marigot': '-04:00', + 'America/Martinique': '-04:00', + 'America/Matamoros': '-06:00', + 'America/Mazatlan': '-07:00', + 'America/Mendoza': '-03:00', + 'America/Menominee': '-06:00', + 'America/Merida': '-06:00', + 'America/Metlakatla': '-08:00', + 'America/Mexico_City': '-06:00', + 'America/Miquelon': '-03:00', + 'America/Moncton': '-04:00', + 'America/Monterrey': '-06:00', + 'America/Montevideo': '-03:00', + 'America/Montreal': '-05:00', + 'America/Montserrat': '-04:00', + 'America/Nassau': '-05:00', + 'America/New_York': '-05:00', + 'America/Nipigon': '-05:00', + 'America/Nome': '-09:00', + 'America/Noronha': '-02:00', + 'America/North_Dakota/Beulah': '-06:00', + 'America/North_Dakota/Center': '-06:00', + 'America/North_Dakota/New_Salem': '-06:00', + 'America/Ojinaga': '-07:00', + 'America/Panama': '-05:00', + 'America/Pangnirtung': '-05:00', + 'America/Paramaribo': '-03:00', + 'America/Phoenix': '-07:00', + 'America/Port_of_Spain': '-04:00', + 'America/Port-au-Prince': '-05:00', + 'America/Porto_Acre': '-05:00', + 'America/Porto_Velho': '-04:00', + 'America/Puerto_Rico': '-04:00', + 'America/Rainy_River': '-06:00', + 'America/Rankin_Inlet': '-06:00', + 'America/Recife': '-03:00', + 'America/Regina': '-06:00', + 'America/Resolute': '-06:00', + 'America/Rio_Branco': '-05:00', + 'America/Rosario': '-03:00', + 'America/Santa_Isabel': '-08:00', + 'America/Santarem': '-03:00', + 'America/Santiago': '-03:00', + 'America/Santo_Domingo': '-04:00', + 'America/Sao_Paulo': '-03:00', + 'America/Scoresbysund': '-01:00', + 'America/Shiprock': '-07:00', + 'America/Sitka': '-09:00', + 'America/St_Barthelemy': '-04:00', + 'America/St_Johns': '-03:30', + 'America/St_Kitts': '-04:00', + 'America/St_Lucia': '-04:00', + 'America/St_Thomas': '-04:00', + 'America/St_Vincent': '-04:00', + 'America/Swift_Current': '-06:00', + 'America/Tegucigalpa': '-06:00', + 'America/Thule': '-04:00', + 'America/Thunder_Bay': '-05:00', + 'America/Tijuana': '-08:00', + 'America/Toronto': '-05:00', + 'America/Tortola': '-04:00', + 'America/Vancouver': '-08:00', + 'America/Virgin': '-04:00', + 'America/Whitehorse': '-08:00', + 'America/Winnipeg': '-06:00', + 'America/Yakutat': '-09:00', + 'America/Yellowknife': '-07:00', + 'Antarctica/Casey': '+11:00', + 'Antarctica/Davis': '+05:00', + 'Antarctica/DumontDUrville': '+10:00', + 'Antarctica/Macquarie': '+11:00', + 'Antarctica/Mawson': '+05:00', + 'Antarctica/McMurdo': '+12:00', + 'Antarctica/Palmer': '-04:00', + 'Antarctica/Rothera': '-03:00', + 'Antarctica/South_Pole': '+12:00', + 'Antarctica/Syowa': '+03:00', + 'Antarctica/Troll': '+00:00', + 'Antarctica/Vostok': '+06:00', + 'Arctic/Longyearbyen': '+01:00', + 'Asia/Aden': '+03:00', + 'Asia/Almaty': '+06:00', + 'Asia/Amman': '+02:00', + 'Asia/Anadyr': '+12:00', + 'Asia/Aqtau': '+05:00', + 'Asia/Aqtobe': '+05:00', + 'Asia/Ashgabat': '+05:00', + 'Asia/Ashkhabad': '+05:00', + 'Asia/Baghdad': '+03:00', + 'Asia/Bahrain': '+03:00', + 'Asia/Baku': '+04:00', + 'Asia/Bangkok': '+07:00', + 'Asia/Beirut': '+02:00', + 'Asia/Bishkek': '+06:00', + 'Asia/Brunei': '+08:00', + 'Asia/Calcutta': '+05:30', + 'Asia/Choibalsan': '+08:00', + 'Asia/Chongqing': '+08:00', + 'Asia/Chungking': '+08:00', + 'Asia/Colombo': '+05:30', + 'Asia/Dacca': '+06:00', + 'Asia/Damascus': '+02:00', + 'Asia/Dhaka': '+06:00', + 'Asia/Dili': '+09:00', + 'Asia/Dubai': '+04:00', + 'Asia/Dushanbe': '+05:00', + 'Asia/Gaza': '+02:00', + 'Asia/Harbin': '+08:00', + 'Asia/Hebron': '+02:00', + 'Asia/Ho_Chi_Minh': '+07:00', + 'Asia/Hong_Kong': '+08:00', + 'Asia/Hovd': '+07:00', + 'Asia/Irkutsk': '+08:00', + 'Asia/Istanbul': '+02:00', + 'Asia/Jakarta': '+07:00', + 'Asia/Jayapura': '+09:00', + 'Asia/Jerusalem': '+02:00', + 'Asia/Kabul': '+04:30', + 'Asia/Kamchatka': '+12:00', + 'Asia/Karachi': '+05:00', + 'Asia/Kashgar': '+08:00', + 'Asia/Kathmandu': '+05:45', + 'Asia/Katmandu': '+05:45', + 'Asia/Khandyga': '+09:00', + 'Asia/Kolkata': '+05:30', + 'Asia/Krasnoyarsk': '+07:00', + 'Asia/Kuala_Lumpur': '+08:00', + 'Asia/Kuching': '+08:00', + 'Asia/Kuwait': '+03:00', + 'Asia/Macao': '+08:00', + 'Asia/Macau': '+08:00', + 'Asia/Magadan': '+10:00', + 'Asia/Makassar': '+08:00', + 'Asia/Manila': '+08:00', + 'Asia/Muscat': '+04:00', + 'Asia/Nicosia': '+02:00', + 'Asia/Novokuznetsk': '+07:00', + 'Asia/Novosibirsk': '+06:00', + 'Asia/Omsk': '+06:00', + 'Asia/Oral': '+05:00', + 'Asia/Phnom_Penh': '+07:00', + 'Asia/Pontianak': '+07:00', + 'Asia/Pyongyang': '+09:00', + 'Asia/Qatar': '+03:00', + 'Asia/Qyzylorda': '+06:00', + 'Asia/Rangoon': '+06:30', + 'Asia/Riyadh': '+03:00', + 'Asia/Saigon': '+07:00', + 'Asia/Sakhalin': '+11:00', + 'Asia/Samarkand': '+05:00', + 'Asia/Seoul': '+09:00', + 'Asia/Shanghai': '+08:00', + 'Asia/Singapore': '+08:00', + 'Asia/Taipei': '+08:00', + 'Asia/Tashkent': '+05:00', + 'Asia/Tbilisi': '+04:00', + 'Asia/Tehran': '+03:30', + 'Asia/Tel_Aviv': '+02:00', + 'Asia/Thimbu': '+06:00', + 'Asia/Thimphu': '+06:00', + 'Asia/Tokyo': '+09:00', + 'Asia/Ujung_Pandang': '+08:00', + 'Asia/Ulaanbaatar': '+08:00', + 'Asia/Ulan_Bator': '+08:00', + 'Asia/Urumqi': '+08:00', + 'Asia/Ust-Nera': '+10:00', + 'Asia/Vientiane': '+07:00', + 'Asia/Vladivostok': '+10:00', + 'Asia/Yakutsk': '+09:00', + 'Asia/Yekaterinburg': '+05:00', + 'Asia/Yerevan': '+04:00', + 'Atlantic/Azores': '-01:00', + 'Atlantic/Bermuda': '-04:00', + 'Atlantic/Canary': '+00:00', + 'Atlantic/Cape_Verde': '-01:00', + 'Atlantic/Faeroe': '+00:00', + 'Atlantic/Faroe': '+00:00', + 'Atlantic/Jan_Mayen': '+01:00', + 'Atlantic/Madeira': '+00:00', + 'Atlantic/Reykjavik': '+00:00', + 'Atlantic/South_Georgia': '-02:00', + 'Atlantic/St_Helena': '+00:00', + 'Atlantic/Stanley': '-03:00', + 'Australia/ACT': '+10:00', + 'Australia/Adelaide': '+09:30', + 'Australia/Brisbane': '+10:00', + 'Australia/Broken_Hill': '+09:30', + 'Australia/Canberra': '+10:00', + 'Australia/Currie': '+10:00', + 'Australia/Darwin': '+09:30', + 'Australia/Eucla': '+08:45', + 'Australia/Hobart': '+10:00', + 'Australia/LHI': '+10:30', + 'Australia/Lindeman': '+10:00', + 'Australia/Lord_Howe': '+10:30', + 'Australia/Melbourne': '+10:00', + 'Australia/North': '+09:30', + 'Australia/NSW': '+10:00', + 'Australia/Perth': '+08:00', + 'Australia/Queensland': '+10:00', + 'Australia/South': '+09:30', + 'Australia/Sydney': '+10:00', + 'Australia/Tasmania': '+10:00', + 'Australia/Victoria': '+10:00', + 'Australia/West': '+08:00', + 'Australia/Yancowinna': '+09:30', + 'Brazil/Acre': '-05:00', + 'Brazil/DeNoronha': '-02:00', + 'Brazil/East': '-03:00', + 'Brazil/West': '-04:00', + 'Canada/Atlantic': '-04:00', + 'Canada/Central': '-06:00', + 'Canada/Eastern': '-05:00', + 'Canada/East-Saskatchewan': '-06:00', + 'Canada/Mountain': '-07:00', + 'Canada/Newfoundland': '-03:30', + 'Canada/Pacific': '-08:00', + 'Canada/Saskatchewan': '-06:00', + 'Canada/Yukon': '-08:00', + 'Chile/Continental': '-03:00', + 'Chile/EasterIsland': '-05:00', + Cuba: '-05:00', + Egypt: '+02:00', + Eire: '+00:00', + 'Etc/GMT': '+00:00', + 'Etc/GMT+0': '+00:00', + 'Etc/UCT': '+00:00', + 'Etc/Universal': '+00:00', + 'Etc/UTC': '+00:00', + 'Etc/Zulu': '+00:00', + 'Europe/Amsterdam': '+01:00', + 'Europe/Andorra': '+01:00', + 'Europe/Athens': '+02:00', + 'Europe/Belfast': '+00:00', + 'Europe/Belgrade': '+01:00', + 'Europe/Berlin': '+01:00', + 'Europe/Bratislava': '+01:00', + 'Europe/Brussels': '+01:00', + 'Europe/Bucharest': '+02:00', + 'Europe/Budapest': '+01:00', + 'Europe/Busingen': '+01:00', + 'Europe/Chisinau': '+02:00', + 'Europe/Copenhagen': '+01:00', + 'Europe/Dublin': '+00:00', + 'Europe/Gibraltar': '+01:00', + 'Europe/Guernsey': '+00:00', + 'Europe/Helsinki': '+02:00', + 'Europe/Isle_of_Man': '+00:00', + 'Europe/Istanbul': '+02:00', + 'Europe/Jersey': '+00:00', + 'Europe/Kaliningrad': '+02:00', + 'Europe/Kiev': '+02:00', + 'Europe/Lisbon': '+00:00', + 'Europe/Ljubljana': '+01:00', + 'Europe/London': '+00:00', + 'Europe/Luxembourg': '+01:00', + 'Europe/Madrid': '+01:00', + 'Europe/Malta': '+01:00', + 'Europe/Mariehamn': '+02:00', + 'Europe/Minsk': '+03:00', + 'Europe/Monaco': '+01:00', + 'Europe/Moscow': '+03:00', + 'Europe/Nicosia': '+02:00', + 'Europe/Oslo': '+01:00', + 'Europe/Paris': '+01:00', + 'Europe/Podgorica': '+01:00', + 'Europe/Prague': '+01:00', + 'Europe/Riga': '+02:00', + 'Europe/Rome': '+01:00', + 'Europe/Samara': '+04:00', + 'Europe/San_Marino': '+01:00', + 'Europe/Sarajevo': '+01:00', + 'Europe/Simferopol': '+03:00', + 'Europe/Skopje': '+01:00', + 'Europe/Sofia': '+02:00', + 'Europe/Stockholm': '+01:00', + 'Europe/Tallinn': '+02:00', + 'Europe/Tirane': '+01:00', + 'Europe/Tiraspol': '+02:00', + 'Europe/Uzhgorod': '+02:00', + 'Europe/Vaduz': '+01:00', + 'Europe/Vatican': '+01:00', + 'Europe/Vienna': '+01:00', + 'Europe/Vilnius': '+02:00', + 'Europe/Volgograd': '+03:00', + 'Europe/Warsaw': '+01:00', + 'Europe/Zagreb': '+01:00', + 'Europe/Zaporozhye': '+02:00', + 'Europe/Zurich': '+01:00', + GB: '+00:00', + 'GB-Eire': '+00:00', + GMT: '+00:00', + 'GMT+0': '+00:00', + GMT0: '+00:00', + 'GMT-0': '+00:00', + Greenwich: '+00:00', + Hongkong: '+08:00', + Iceland: '+00:00', + 'Indian/Antananarivo': '+03:00', + 'Indian/Chagos': '+06:00', + 'Indian/Christmas': '+07:00', + 'Indian/Cocos': '+06:30', + 'Indian/Comoro': '+03:00', + 'Indian/Kerguelen': '+05:00', + 'Indian/Mahe': '+04:00', + 'Indian/Maldives': '+05:00', + 'Indian/Mauritius': '+04:00', + 'Indian/Mayotte': '+03:00', + 'Indian/Reunion': '+04:00', + Iran: '+03:30', + Israel: '+02:00', + Jamaica: '-05:00', + Japan: '+09:00', + Kwajalein: '+12:00', + Libya: '+02:00', + 'Mexico/BajaNorte': '-08:00', + 'Mexico/BajaSur': '-07:00', + 'Mexico/General': '-06:00', + Navajo: '-07:00', + NZ: '+12:00', + 'NZ-CHAT': '+12:45', + 'Pacific/Apia': '+13:00', + 'Pacific/Auckland': '+12:00', + 'Pacific/Chatham': '+12:45', + 'Pacific/Chuuk': '+10:00', + 'Pacific/Easter': '-06:00', + 'Pacific/Efate': '+11:00', + 'Pacific/Enderbury': '+13:00', + 'Pacific/Fakaofo': '+13:00', + 'Pacific/Fiji': '+12:00', + 'Pacific/Funafuti': '+12:00', + 'Pacific/Galapagos': '-06:00', + 'Pacific/Gambier': '-09:00', + 'Pacific/Guadalcanal': '+11:00', + 'Pacific/Guam': '+10:00', + 'Pacific/Honolulu': '-10:00', + 'Pacific/Johnston': '-10:00', + 'Pacific/Kiritimati': '+14:00', + 'Pacific/Kosrae': '+11:00', + 'Pacific/Kwajalein': '+12:00', + 'Pacific/Majuro': '+12:00', + 'Pacific/Marquesas': '-09:30', + 'Pacific/Midway': '-11:00', + 'Pacific/Nauru': '+12:00', + 'Pacific/Niue': '-11:00', + 'Pacific/Norfolk': '+11:30', + 'Pacific/Noumea': '+11:00', + 'Pacific/Pago_Pago': '-11:00', + 'Pacific/Palau': '+09:00', + 'Pacific/Pitcairn': '-08:00', + 'Pacific/Pohnpei': '+11:00', + 'Pacific/Ponape': '+11:00', + 'Pacific/Port_Moresby': '+10:00', + 'Pacific/Rarotonga': '-10:00', + 'Pacific/Saipan': '+10:00', + 'Pacific/Samoa': '-11:00', + 'Pacific/Tahiti': '-10:00', + 'Pacific/Tarawa': '+12:00', + 'Pacific/Tongatapu': '+13:00', + 'Pacific/Truk': '+10:00', + 'Pacific/Wake': '+12:00', + 'Pacific/Wallis': '+12:00', + 'Pacific/Yap': '+10:00', + Poland: '+01:00', + Portugal: '+00:00', + PRC: '+08:00', + ROC: '+08:00', + ROK: '+09:00', + Singapore: '+08:00', + Turkey: '+02:00', + UCT: '+00:00', + Universal: '+00:00', + 'US/Alaska': '-09:00', + 'US/Aleutian': '-10:00', + 'US/Arizona': '-07:00', + 'US/Central': '-06:00', + 'US/Eastern': '-05:00', + 'US/East-Indiana': '-05:00', + 'US/Hawaii': '-10:00', + 'US/Indiana-Starke': '-06:00', + 'US/Michigan': '-05:00', + 'US/Mountain': '-07:00', + 'US/Pacific': '-08:00', + 'US/Samoa': '-11:00', + UTC: '+00:00', + 'W-SU': '+03:00', + Zulu: '+00:00', +}; + +export type timezone = keyof typeof tzDatabase; diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index d63088303..f3548c6d9 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -63,12 +63,12 @@ export interface ManifestEndpoint { scheduleTrigger?: { schedule?: string; - timezone?: string; + timeZone?: string; retryConfig?: { retryCount?: number; - maxRetryDuration?: string; - minBackoffDuration?: string; - maxBackoffDuration?: string; + maxRetrySeconds?: number; + minBackoffSeconds?: number; + maxBackoffSeconds?: number; maxDoublings?: number; }; }; diff --git a/src/v2/index.ts b/src/v2/index.ts index dc460cd52..d1054504a 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -35,6 +35,7 @@ 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 scheduler from './providers/scheduler'; import * as storage from './providers/storage'; import * as tasks from './providers/tasks'; @@ -48,6 +49,7 @@ export { logger, tasks, eventarc, + scheduler, }; export { diff --git a/src/v2/providers/scheduler.ts b/src/v2/providers/scheduler.ts new file mode 100644 index 000000000..4c181ed11 --- /dev/null +++ b/src/v2/providers/scheduler.ts @@ -0,0 +1,210 @@ +// 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. + +import * as express from 'express'; +import { copyIfPresent } from '../../common/encoding'; +import { timezone } from '../../common/timezone'; +import * as logger from '../../logger'; +import { ManifestEndpoint, ManifestRequiredAPI } from '../../runtime/manifest'; +import * as options from '../options'; +import { HttpsFunction } from './https'; + +/** @hidden */ +interface ScheduleArgs { + schedule: string; + timeZone?: timezone; + retryCount?: number; + maxRetrySeconds?: number; + minBackoffSeconds?: number; + maxBackoffSeconds?: number; + maxDoublings?: number; + opts: options.GlobalOptions; +} + +/** @internal */ +export function getOpts(args: string | ScheduleOptions): ScheduleArgs { + if (typeof args === 'string') { + return { + schedule: args, + opts: {} as options.GlobalOptions, + }; + } + return { + schedule: args.schedule, + timeZone: args.timeZone, + retryCount: args.retryCount, + maxRetrySeconds: args.maxRetrySeconds, + minBackoffSeconds: args.minBackoffSeconds, + maxBackoffSeconds: args.maxBackoffSeconds, + maxDoublings: args.maxDoublings, + opts: args as options.GlobalOptions, + }; +} + +/** + * Interface representing a ScheduleEvent that is passed to the function handler. + */ +export interface ScheduledEvent { + /** + * The Cloud Scheduler job name. + * Populated via the X-CloudScheduler-JobName header. + * + * If invoked manually, this field is undefined. + */ + jobName?: string; + + /** + * For Cloud Scheduler jobs specified in the unix-cron format, + * this is the job schedule time in RFC3339 UTC "Zulu" format. + * Populated via the X-CloudScheduler-ScheduleTime header. + * + * If the schedule is manually triggered, this field will be + * the function execution time. + */ + scheduleTime: string; +} + +/** The Cloud Function type for Schedule triggers. */ +export interface ScheduleFunction extends HttpsFunction { + __requiredAPIs?: ManifestRequiredAPI[]; + run(data: ScheduledEvent): void | Promise; +} + +/** Options that can be set on a Schedule trigger. */ +export interface ScheduleOptions extends options.GlobalOptions { + /** The schedule, in Unix Crontab or AppEngine syntax. */ + schedule: string; + + /** The timezone that the schedule executes in. */ + timeZone?: timezone; + + /** The number of retry attempts for a failed run. */ + retryCount?: number; + + /** The time limit for retrying. */ + maxRetrySeconds?: number; + + /** The minimum time to wait before retying. */ + minBackoffSeconds?: number; + + /** The maximum time to wait before retrying. */ + maxBackoffSeconds?: number; + + /** The time between will double max doublings times. */ + maxDoublings?: number; +} + +/** + * Handler for scheduled functions. Triggered whenever the associated + * scheduler job sends a http request. + * @param schedule - The schedule, in Unix Crontab or AppEngine syntax. + * @param handler - A function to execute when triggered. + * @returns A function that you can export and deploy. + */ +export function onSchedule( + schedule: string, + handler: (req: ScheduledEvent) => void | Promise +): ScheduleFunction; + +/** + * Handler for scheduled functions. Triggered whenever the associated + * scheduler job sends a http request. + * @param options - Options to set on scheduled functions. + * @param handler - A function to execute when triggered. + * @returns A function that you can export and deploy. + */ +export function onSchedule( + options: ScheduleOptions, + handler: (req: ScheduledEvent) => void | Promise +): ScheduleFunction; + +/** + * Handler for scheduled functions. Triggered whenever the associated + * scheduler job sends a http request. + * @param args - Either a schedule or an object containing function options. + * @param handler - A function to execute when triggered. + * @returns A function that you can export and deploy. + */ +export function onSchedule( + args: string | ScheduleOptions, + handler: (req: ScheduledEvent) => void | Promise +): ScheduleFunction { + const separatedOpts = getOpts(args); + + const func: any = async ( + req: express.Request, + res: express.Response + ): Promise => { + const event: ScheduledEvent = { + jobName: req.header('X-CloudScheduler-JobName') || undefined, + scheduleTime: + req.header('X-CloudScheduler-ScheduleTime') || new Date().toISOString(), + }; + try { + await handler(event); + res.status(200).send(); + } catch (err) { + logger.error((err as Error).message); + res.status(500).send(); + } + }; + func.run = handler; + + const baseOptsEndpoint = options.optionsToEndpoint( + options.getGlobalOptions() + ); + const specificOptsEndpoint = options.optionsToEndpoint(separatedOpts.opts); + + const ep: ManifestEndpoint = { + platform: 'gcfv2', + ...baseOptsEndpoint, + ...specificOptsEndpoint, + labels: { + ...baseOptsEndpoint?.labels, + ...specificOptsEndpoint?.labels, + }, + scheduleTrigger: { + schedule: separatedOpts.schedule, + retryConfig: {}, + }, + }; + copyIfPresent(ep.scheduleTrigger, separatedOpts, 'timeZone'); + copyIfPresent( + ep.scheduleTrigger.retryConfig, + separatedOpts, + 'retryCount', + 'maxRetrySeconds', + 'minBackoffSeconds', + 'maxBackoffSeconds', + 'maxDoublings' + ); + func.__endpoint = ep; + + func.__requiredAPIs = [ + { + api: 'cloudscheduler.googleapis.com', + reason: 'Needed for scheduled functions.', + }, + ]; + + return func; +} diff --git a/v2/scheduler.js b/v2/scheduler.js new file mode 100644 index 000000000..ae33ba821 --- /dev/null +++ b/v2/scheduler.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 7057c4db01e2cdcbf4878180436849cf13c466a4 Mon Sep 17 00:00:00 2001 From: Kai Bolay Date: Thu, 25 Aug 2022 22:42:25 -0400 Subject: [PATCH 495/705] fix comment (#1211) --- src/v2/providers/alerts/appDistribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 512c3e95a..5b34c7b7c 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -66,7 +66,7 @@ export interface InAppFeedbackPayload { appVersion: string; /** Text entered by the tester */ text: string; - /** URI to download screenshot. This URIs are is fast expiring. */ + /** URI to download screenshot. This URI is fast expiring. */ screenshotUri?: string; } From d592847517c93b9240fbd2598bdf3dfefdb85948 Mon Sep 17 00:00:00 2001 From: Victor Fan Date: Mon, 29 Aug 2022 17:24:39 -0700 Subject: [PATCH 496/705] Insert Expression and Field types into GlobalOptions and inheriting types (#1171) This will plumb Param definitions and Expression types in Options to the CLI. --- package-lock.json | 5 +- .../fixtures/sources/commonjs-params/index.js | 12 +- spec/runtime/loader.spec.ts | 41 ++- spec/runtime/manifest.spec.ts | 67 ++++ spec/v2/params.spec.ts | 276 ---------------- src/bin/firebase-functions.ts | 3 +- src/common/providers/tasks.ts | 15 +- src/function-configuration.ts | 12 +- src/runtime/manifest.ts | 54 +++- src/v2/options.ts | 45 ++- src/v2/params/index.ts | 50 +-- src/v2/params/types.ts | 294 ++++++++++++------ src/v2/providers/alerts/alerts.ts | 11 +- src/v2/providers/alerts/appDistribution.ts | 11 +- src/v2/providers/alerts/crashlytics.ts | 11 +- src/v2/providers/database.ts | 13 +- src/v2/providers/eventarc.ts | 11 +- src/v2/providers/https.ts | 11 +- src/v2/providers/identity.ts | 11 +- src/v2/providers/pubsub.ts | 11 +- src/v2/providers/storage.ts | 11 +- src/v2/providers/tasks.ts | 13 +- 22 files changed, 506 insertions(+), 482 deletions(-) create mode 100644 spec/runtime/manifest.spec.ts delete mode 100644 spec/v2/params.spec.ts diff --git a/package-lock.json b/package-lock.json index d739d07c4..1f4742d4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2269,8 +2269,9 @@ }, "node_modules/firebase-admin": { "version": "10.3.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.3.0.tgz", + "integrity": "sha512-A0wgMLEjyVyUE+heyMJYqHRkPVjpebhOYsa47RHdrTM4ltApcx8Tn86sUmjqxlfh09gNnILAm7a8q5+FmgBYpg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@fastify/busboy": "^1.1.0", "@firebase/database-compat": "^0.2.0", @@ -7460,6 +7461,8 @@ }, "firebase-admin": { "version": "10.3.0", + "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.3.0.tgz", + "integrity": "sha512-A0wgMLEjyVyUE+heyMJYqHRkPVjpebhOYsa47RHdrTM4ltApcx8Tn86sUmjqxlfh09gNnILAm7a8q5+FmgBYpg==", "dev": true, "requires": { "@fastify/busboy": "^1.1.0", diff --git a/spec/fixtures/sources/commonjs-params/index.js b/spec/fixtures/sources/commonjs-params/index.js index d038a2f77..5c783dd18 100644 --- a/spec/fixtures/sources/commonjs-params/index.js +++ b/spec/fixtures/sources/commonjs-params/index.js @@ -1,8 +1,16 @@ const functions = require("../../../../src/index"); const functionsv2 = require("../../../../src/v2/index"); -const { defineString } = require("../../../../src/v2/params"); +const params = require("../../../../src/v2/params"); -defineString("FOO"); +params.defineString("BORING"); +params.defineString("FOO", {input: {text: {validationRegex:"\w+"}}}); +params.defineString("BAR", {default: "{{ params.FOO }}", label: "asdf"}); +params.defineString("BAZ", {input: {select: {options: [{value: "a"}, {value: "b"}]}}}); + +params.defineInt("AN_INT", {default: 22}); +params.defineInt("ANOTHER_INT", {input: {select: {options:[{label: "a", value: -2}, {"label": "b", value: 2}]}}}); + +params.defineSecret("SUPER_SECRET_FLAG") exports.v1http = functions.https.onRequest((req, resp) => { resp.status(200).send("PASS"); diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts index bb959a3cb..caae16d14 100644 --- a/spec/runtime/loader.spec.ts +++ b/spec/runtime/loader.spec.ts @@ -8,6 +8,7 @@ import { ManifestRequiredAPI, ManifestStack, } from '../../src/runtime/manifest'; +import { clearParams } from '../../src/v2/params'; describe('extractStack', () => { const httpFn = functions.https.onRequest(() => {}); @@ -104,6 +105,7 @@ describe('extractStack', () => { afterEach(() => { process.env.GCLOUD_PROJECT = prev; + clearParams(); }); it('extracts stack from a simple module', () => { @@ -313,7 +315,44 @@ describe('loadStack', () => { { name: 'has params', modulePath: './spec/fixtures/sources/commonjs-params', - expected: { ...expected, params: [{ name: 'FOO', type: 'string' }] }, + expected: { + ...expected, + params: [ + { name: 'BORING', type: 'string' }, + { + name: 'FOO', + type: 'string', + input: { text: { validationRegex: 'w+' } }, + }, + { + name: 'BAR', + type: 'string', + default: '{{ params.FOO }}', + label: 'asdf', + }, + { + name: 'BAZ', + type: 'string', + input: { + select: { options: [{ value: 'a' }, { value: 'b' }] }, + }, + }, + { name: 'AN_INT', type: 'int', default: 22 }, + { + name: 'ANOTHER_INT', + type: 'int', + input: { + select: { + options: [ + { label: 'a', value: -2 }, + { label: 'b', value: 2 }, + ], + }, + }, + }, + { name: 'SUPER_SECRET_FLAG', type: 'secret' }, + ], + }, }, ]; diff --git a/spec/runtime/manifest.spec.ts b/spec/runtime/manifest.spec.ts new file mode 100644 index 000000000..7710c54a6 --- /dev/null +++ b/spec/runtime/manifest.spec.ts @@ -0,0 +1,67 @@ +import { stackToWire, ManifestStack } from '../../src/runtime/manifest'; +import { expect } from 'chai'; +import * as params from '../../src/v2/params'; + +describe('stackToWire', () => { + afterEach(() => { + params.clearParams(); + }); + + it('converts Expression types in endpoint options to CEL', () => { + const intParam = params.defineInt('foo', { default: 11 }); + const stringParam = params.defineString('bar', { + default: 'America/Los_Angeles', + }); + + const stack: ManifestStack = { + endpoints: { + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + concurrency: intParam, + maxInstances: intParam.equals(24).then(-1, 1), + }, + v2schedule: { + platform: 'gcfv2', + entryPoint: 'v2callable', + labels: {}, + scheduleTrigger: { + schedule: stringParam + .equals('America/Mexico_City') + .then('mexico', 'usa'), + timeZone: stringParam, + }, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', + }; + const expected = { + endpoints: { + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + concurrency: '{{ params.foo }}', + maxInstances: '{{ params.foo == 24 ? -1 : 1 }}', + }, + v2schedule: { + platform: 'gcfv2', + entryPoint: 'v2callable', + labels: {}, + scheduleTrigger: { + schedule: + '{{ params.bar == "America/Mexico_City" ? "mexico" : "usa" }}', + timeZone: '{{ params.bar }}', + }, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', + }; + expect(stackToWire(stack)).to.deep.equal(expected); + }); +}); diff --git a/spec/v2/params.spec.ts b/spec/v2/params.spec.ts deleted file mode 100644 index 9885276cd..000000000 --- a/spec/v2/params.spec.ts +++ /dev/null @@ -1,276 +0,0 @@ -import { expect } from 'chai'; -import { - declaredParams, - defineBoolean, - defineFloat, - defineInt, - defineJSON, - defineList, - defineString, -} from '../../src/v2/params'; -import { ListParam, Param, ParamOptions } from '../../src/v2/params/types'; - -const TEST_PARAM = 'TEST_PARAM'; - -describe('params', () => { - beforeEach(() => { - delete process.env[TEST_PARAM]; - }); - - const VALUE_TESTS: Array<{ - method: (name: string, options: ParamOptions) => Param; - tests: Array<{ - title: string; - env?: string; - options?: ParamOptions; - expect?: any; - throws?: boolean; - }>; - }> = [ - { - method: defineString, - tests: [ - { - title: "should return a '' zero value when no value and no undefined", - expect: '', - }, - { - title: 'should return the default when no value and one is provided', - env: undefined, - options: { default: 'test_val' }, - expect: 'test_val', - }, - { - title: 'should return the value over the default', - env: 'expected_val', - options: { default: 'default_val' }, - expect: 'expected_val', - }, - ], - }, - { - method: defineInt, - tests: [ - { - title: 'should return 0 zero value', - expect: 0, - }, - { - title: 'should coerce a matching string into an int', - env: '25', - expect: 25, - }, - { - title: 'should return a matching default value', - options: { default: 10 }, - expect: 10, - }, - { - title: 'should throw when invalid value is passed', - env: 'not_a_number', - throws: true, - }, - ], - }, - { - method: defineFloat, - tests: [ - { - title: 'should return 0 zero value', - expect: 0, - }, - { - title: 'should coerce a matching string into a float', - env: '3.14', - expect: 3.14, - }, - { - title: 'should return a matching default value', - options: { default: 10.1 }, - expect: 10.1, - }, - { - title: 'should throw when invalid value is passed', - env: 'not_a_number', - throws: true, - }, - ], - }, - { - method: defineBoolean, - tests: [ - { - title: 'should return false zero value', - expect: false, - }, - { - title: 'should coerce "true" into true', - env: 'true', - expect: true, - }, - { - title: 'should coerce "TrUe" into true', - env: 'TrUe', - expect: true, - }, - { - title: 'should coerce "yes" into true', - env: 'yes', - expect: true, - }, - { - title: 'should coerce "1" into true', - env: '1', - expect: true, - }, - { - title: 'should coerce "false" into false', - env: 'false', - options: { default: true }, - expect: false, - }, - { - title: 'should coerce "FaLsE" into false', - env: 'FaLsE', - options: { default: true }, - expect: false, - }, - { - title: 'should coerce "no" into false', - env: 'no', - options: { default: true }, - expect: false, - }, - { - title: 'should coerce "0" into false', - env: '0', - options: { default: true }, - expect: false, - }, - { - title: 'should return a matching default value', - options: { default: true }, - expect: true, - }, - { - title: 'should error with non-true/false value', - env: 'foo', - throws: true, - }, - ], - }, - { - method: defineList, - tests: [ - { - title: 'should return [] zero value', - expect: [], - }, - { - title: 'should coerce comma-separated values into a string list', - env: 'first,second,third', - expect: ['first', 'second', 'third'], - }, - { - title: - 'should coerce a comma-and-space-separated values into a string list', - env: 'first, second, third', - expect: ['first', 'second', 'third'], - }, - { - title: 'should return a matching default value', - options: { default: ['a', 'b', 'c'] }, - expect: ['a', 'b', 'c'], - }, - ], - }, - { - method: defineJSON, - tests: [ - { - title: 'should return {} zero value', - expect: {}, - }, - { - title: 'should coerce objects from JSON', - env: '{"test":123}', - expect: { test: 123 }, - }, - { - title: 'should coerce arrays from JSON', - env: '["test",123]', - expect: ['test', 123], - }, - { - title: 'should return a matching default value', - options: { default: { test: 123 } }, - expect: { test: 123 }, - }, - { - title: 'should throw with invalid JSON', - env: '{"invalid":json', - throws: true, - }, - ], - }, - ]; - - for (const group of VALUE_TESTS) { - describe(`${group.method.name}().value`, () => { - for (const test of group.tests) { - it(test.title, () => { - if (typeof test.env !== 'undefined') { - process.env[TEST_PARAM] = test.env; - } - - if (test.throws) { - expect( - () => group.method(TEST_PARAM, test.options).value - ).to.throw(); - } else { - expect(group.method(TEST_PARAM, test.options).value).to.deep.eq( - test.expect - ); - } - }); - } - }); - } - - describe('Param', () => { - describe('#toSpec()', () => { - it('should cast non-string defaults to strings', () => { - expect(new Param(TEST_PARAM, { default: 123 }).toSpec().default).to.eq( - '123' - ); - }); - - it('should passthrough supplied options', () => { - expect( - new Param(TEST_PARAM, { description: 'hello expect' }).toSpec() - .description - ).to.eq('hello expect'); - }); - - it('ListParam should properly stringify its default', () => { - const spec = new ListParam(TEST_PARAM, { - default: ['a', 'b', 'c'], - }).toSpec(); - expect(spec.default).to.eq('a,b,c'); - }); - }); - }); - - it('should add a param to the declared params', () => { - const param = defineString(TEST_PARAM); - expect(declaredParams.find((p) => p === param)).to.eq(param); - }); - - it('should replace a samed-name param in the declared params', () => { - const oldParam = defineString(TEST_PARAM); - expect(declaredParams.find((p) => p === oldParam)).to.eq(oldParam); - const param = defineString(TEST_PARAM); - expect(declaredParams.find((p) => p === oldParam)).to.be.undefined; - expect(declaredParams.find((p) => p === param)).to.eq(param); - }); -}); diff --git a/src/bin/firebase-functions.ts b/src/bin/firebase-functions.ts index 646433fec..1be486b8c 100644 --- a/src/bin/firebase-functions.ts +++ b/src/bin/firebase-functions.ts @@ -24,6 +24,7 @@ import * as express from 'express'; import { loadStack } from '../runtime/loader'; +import { stackToWire } from '../runtime/manifest'; function printUsageAndExit() { console.error( @@ -63,7 +64,7 @@ if (process.env.FUNCTIONS_CONTROL_API === 'true') { try { const stack = await loadStack(functionsDir); res.setHeader('content-type', 'text/yaml'); - res.send(JSON.stringify(stack)); + res.send(JSON.stringify(stackToWire(stack))); } catch (e) { res .status(400) diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts index 52360af48..814087f01 100644 --- a/src/common/providers/tasks.ts +++ b/src/common/providers/tasks.ts @@ -24,6 +24,7 @@ import * as express from 'express'; import * as firebase from 'firebase-admin'; import * as logger from '../../logger'; +import { Expression } from '../../v2/params'; import * as https from './https'; /** How a task should be retried in the event of a non-2xx return. */ @@ -32,31 +33,31 @@ export interface RetryConfig { * Maximum number of times a request should be attempted. * If left unspecified, will default to 3. */ - maxAttempts?: number; + maxAttempts?: number | Expression | null; /** * Maximum amount of time for retrying failed task. * If left unspecified will retry indefinitely. */ - maxRetrySeconds?: number; + maxRetrySeconds?: number | Expression | null; /** * The maximum amount of time to wait between attempts. * If left unspecified will default to 1hr. */ - maxBackoffSeconds?: number; + maxBackoffSeconds?: number | Expression | null; /** * The maximum number of times to double the backoff between * retries. If left unspecified will default to 16. */ - maxDoublings?: number; + maxDoublings?: number | Expression | null; /** * The minimum time to wait between attempts. If left unspecified * will default to 100ms. */ - minBackoffSeconds?: number; + minBackoffSeconds?: number | Expression | null; } /** How congestion control should be applied to the function. */ @@ -65,13 +66,13 @@ export interface RateLimits { * The maximum number of requests that can be outstanding at a time. * If left unspecified, will default to 1000. */ - maxConcurrentDispatches?: number; + maxConcurrentDispatches?: number | Expression | null; /** * The maximum number of requests that can be invoked per second. * If left unspecified, will default to 500. */ - maxDispatchesPerSecond?: number; + maxDispatchesPerSecond?: number | Expression | null; } /** Metadata about the authorization used to invoke a function. */ diff --git a/src/function-configuration.ts b/src/function-configuration.ts index 73cc64eac..6a352e880 100644 --- a/src/function-configuration.ts +++ b/src/function-configuration.ts @@ -1,3 +1,5 @@ +import { Expression } from './v2/params'; + /** * List of all regions supported by Cloud Functions. */ @@ -72,11 +74,11 @@ export const INGRESS_SETTINGS_OPTIONS = [ * Scheduler retry options. Applies only to scheduled functions. */ export interface ScheduleRetryConfig { - retryCount?: number; - maxRetryDuration?: string; - minBackoffDuration?: string; - maxBackoffDuration?: string; - maxDoublings?: number; + retryCount?: number | Expression | null; + maxRetryDuration?: string | Expression | null; + minBackoffDuration?: string | Expression | null; + maxBackoffDuration?: string | Expression | null; + maxDoublings?: number | Expression | null; } /** diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index f3548c6d9..062966985 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -20,6 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import { Expression } from '../v2/params'; import { ParamSpec } from '../v2/params/types'; /** @@ -29,15 +30,15 @@ export interface ManifestEndpoint { entryPoint?: string; region?: string[]; platform?: string; - availableMemoryMb?: number; - maxInstances?: number; - minInstances?: number; - concurrency?: number; + availableMemoryMb?: number | Expression; + maxInstances?: number | Expression; + minInstances?: number | Expression; + concurrency?: number | Expression; serviceAccountEmail?: string; - timeoutSeconds?: number; + timeoutSeconds?: number | Expression; cpu?: number | 'gcf_gen1'; vpc?: { - connector: string; + connector: string | Expression; egressSettings?: string; }; labels?: Record; @@ -52,24 +53,24 @@ export interface ManifestEndpoint { callableTrigger?: {}; eventTrigger?: { - eventFilters: Record; - eventFilterPathPatterns?: Record; + eventFilters: Record>; + eventFilterPathPatterns?: Record>; channel?: string; eventType: string; - retry: boolean; + retry: boolean | Expression; region?: string; serviceAccountEmail?: string; }; scheduleTrigger?: { - schedule?: string; - timeZone?: string; + schedule?: string | Expression; + timeZone?: string | Expression; retryConfig?: { - retryCount?: number; - maxRetrySeconds?: number; - minBackoffSeconds?: number; - maxBackoffSeconds?: number; - maxDoublings?: number; + retryCount?: number | Expression; + maxRetrySeconds?: string | Expression; + minBackoffSeconds?: string | Expression; + maxBackoffSeconds?: string | Expression; + maxDoublings?: number | Expression; }; }; @@ -93,3 +94,24 @@ export interface ManifestStack { requiredAPIs: ManifestRequiredAPI[]; endpoints: Record; } + +/** + * Returns the JSON representation of a ManifestStack, which has CEL + * expressions in its options as object types, with its expressions + * transformed into the actual CEL strings. + * @internal + */ +export function stackToWire(stack: ManifestStack): Object { + let wireStack = stack as any; + let traverse = function traverse(obj: Object) { + for (const [key, val] of Object.entries(obj)) { + if (val instanceof Expression) { + obj[key] = val.toCEL(); + } else if (typeof val === 'object') { + traverse(val); + } + } + }; + traverse(wireStack.endpoints); + return wireStack; +} diff --git a/src/v2/options.ts b/src/v2/options.ts index c2ebf5248..b8a5a5dcd 100644 --- a/src/v2/options.ts +++ b/src/v2/options.ts @@ -34,7 +34,7 @@ import { import * as logger from '../logger'; import { ManifestEndpoint } from '../runtime/manifest'; import { TriggerAnnotation } from './core'; -import { declaredParams } from './params'; +import { declaredParams, Expression } from './params'; import { ParamSpec } from './params/types'; import { HttpsOptions } from './providers/https'; @@ -104,7 +104,7 @@ export interface GlobalOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: MemoryOption | null; + memory?: MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -116,7 +116,7 @@ export interface GlobalOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -124,13 +124,13 @@ export interface GlobalOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -139,7 +139,7 @@ export interface GlobalOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. @@ -217,8 +217,23 @@ export function getGlobalOptions(): GlobalOptions { * Additional fields that can be set on any event-handling Cloud Function. */ export interface EventHandlerOptions extends GlobalOptions { + eventType?: string; + + eventFilters?: Record>; + eventFilterPathPatterns?: Record>; + /** Whether failed executions should be delivered again. */ - retry?: boolean; + retry?: boolean | Expression | null; + + /** Region of the EventArc trigger. */ + //region?: string | Expression | null; + region?: string; + + /** The service account that EventArc should use to invoke this function. Requires the P4SA to have ActAs permission on this service account. */ + serviceAccount?: string | null; + + /** The name of the channel where the function receives events. */ + channel?: string; } /** @@ -246,8 +261,8 @@ export function optionsToTriggerAnnotations( opts, 'availableMemoryMb', 'memory', - (mem: MemoryOption) => { - return MemoryOptionToMB[mem]; + (mem: MemoryOption | Expression): number | Expression => { + return typeof mem === 'object' ? mem : MemoryOptionToMB[mem]; } ); convertIfPresent(annotation, opts, 'regions', 'region', (region) => { @@ -308,9 +323,15 @@ export function optionsToEndpoint( convertIfPresent(vpc, opts, 'egressSettings', 'vpcConnectorEgressSettings'); endpoint.vpc = vpc; } - convertIfPresent(endpoint, opts, 'availableMemoryMb', 'memory', (mem) => { - return MemoryOptionToMB[mem]; - }); + convertIfPresent( + endpoint, + opts, + 'availableMemoryMb', + 'memory', + (mem: MemoryOption | Expression): number | Expression => { + return typeof mem === 'object' ? mem : MemoryOptionToMB[mem]; + } + ); convertIfPresent(endpoint, opts, 'region', 'region', (region) => { if (typeof region === 'string') { return [region]; diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index 3f8a080b6..67080f308 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -29,23 +29,25 @@ import { BooleanParam, FloatParam, IntParam, - JSONParam, ListParam, Param, ParamOptions, StringParam, + SecretParam, + Expression, } from './types'; -export { ParamOptions }; +export { ParamOptions, Expression }; -export const declaredParams: Param[] = []; +type SecretOrExpr = Param | SecretParam; +export const declaredParams: SecretOrExpr[] = []; /** * Use a helper to manage the list such that params are uniquely * registered once only but order is preserved. * @internal */ -function registerParam(param: Param) { +function registerParam(param: SecretOrExpr) { for (let i = 0; i < declaredParams.length; i++) { if (declaredParams[i].name === param.name) { declaredParams.splice(i, 1); @@ -54,6 +56,29 @@ function registerParam(param: Param) { declaredParams.push(param); } +/** + * For testing. + * @internal + */ +export function clearParams() { + declaredParams.splice(0, declaredParams.length); +} + +/** + * Declares a secret param, that will persist values only in Cloud Secret Manager. + * Secrets are stored interally as bytestrings. Use ParamOptions.`as` to provide type + * hinting during parameter resolution. + * + * @param name The name of the environment variable to use to load the param. + * @param options Configuration options for the param. + * @returns A Param with a `string` return type for `.value`. + */ +export function defineSecret(name: string): SecretParam { + const param = new SecretParam(name); + registerParam(param); + return param; +} + /** * Declare a string param. * @@ -133,20 +158,3 @@ export function defineList( registerParam(param); return param; } - -/** - * Declare a JSON param. The associated environment variable will be treated - * as a JSON string when loading its value. - * - * @param name The name of the environment variable to use to load the param. - * @param options Configuration options for the param. - * @returns A Param with a specifiable return type for `.value`. - */ -export function defineJSON( - name: string, - options: ParamOptions = {} -): JSONParam { - const param = new JSONParam(name, options); - registerParam(param); - return param; -} diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index fc898c15c..16d194fda 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -20,129 +20,266 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +/* + * A CEL expression which can be evaluated during function deployment, and + * resolved to a value of the generic type parameter: i.e, you can pass + * an Expression as the value of an option that normally accepts numbers. + */ +export abstract class Expression< + T extends string | number | boolean | string[] +> { + // Returns the Expression's runtime value, based on the CLI's resolution of params. + value(): T { + throw new Error('Not implemented'); + } + + // Returns the Expression's representation as a braced CEL expression. + toCEL(): string { + return `{{ ${this.toString()} }}`; + } + + toJSON(): string { + return this.toString(); + } +} + +function quoteIfString( + literal: T +): T { + //TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here? + return typeof literal === 'string' ? (`"${literal}"` as T) : literal; +} + +/** + * A CEL expression corresponding to a ternary operator, e.g {{ cond ? ifTrue : ifFalse }} + */ +export class TernaryExpression< + T extends string | number | boolean | string[] +> extends Expression { + constructor( + private readonly test: Expression, + private readonly ifTrue: T, + private readonly ifFalse: T + ) { + super(); + this.ifTrue = ifTrue; + this.ifFalse = ifFalse; + } + + value(): T { + return !!this.test.value ? this.ifTrue : this.ifFalse; + } + + toString() { + return `${this.test} ? ${quoteIfString(this.ifTrue)} : ${quoteIfString( + this.ifFalse + )}`; + } +} + +/** + * A CEL expression that evaluates to boolean true or false based on a comparison + * between the value of another expression and a literal of that same type. + */ +export class CompareExpression< + T extends string | number | boolean | string[] +> extends Expression { + cmp: '==' | '>' | '>=' | '<' | '<='; + lhs: Expression; + rhs: T; + + constructor(cmp: '==' | '>' | '>=' | '<' | '<=', lhs: Expression, rhs: T) { + super(); + this.cmp = cmp; + this.lhs = lhs; + this.rhs = rhs; + } + + value(): boolean { + const left = this.lhs.value(); + switch (this.cmp) { + case '==': + return left === this.rhs; + case '>': + return left > this.rhs; + case '>=': + return left >= this.rhs; + case '<': + return left < this.rhs; + case '<=': + return left <= this.rhs; + default: + throw new Error('Unknown comparator ' + this.cmp); + } + } + + toString() { + return `${this.lhs} ${this.cmp} ${quoteIfString(this.rhs)}`; + } + + then(ifTrue: T, ifFalse: T) { + return new TernaryExpression(this, ifTrue, ifFalse); + } +} + /** @hidden */ -type ParamValueType = 'string' | 'list' | 'boolean' | 'int' | 'float' | 'json'; +type ParamValueType = + | 'string' + | 'list' + | 'boolean' + | 'int' + | 'float' + | 'secret'; + +type ParamInput = + | { text: TextInput } + | { select: SelectInput } + | { resource: ResourceInput }; + +/** + * Specifies that a Param's value should be determined by prompting the user + * to type it in interactively at deploy-time. Input that does not match the + * provided validationRegex, if present, will be retried. + */ +export interface TextInput { + example?: string; + validationRegex?: string; + validationErrorMessage?: string; +} + +/** + * Specifies that a Param's value should be determined by having the user + * select from a list containing all the project's resources of a certain + * type. Currently, only type:"storage.googleapis.com/Bucket" is supported. + */ +export interface ResourceInput { + resource: { + type: string; + }; +} -export interface ParamSpec { +/** + * Specifies that a Param's value should be determined by having the user select + * from a list of pre-canned options interactively at deploy-time. + */ +export interface SelectInput { + options: Array>; +} + +export interface SelectOptions { + label?: string; + value: T; +} + +export type ParamSpec = { name: string; default?: T; label?: string; description?: string; type: ParamValueType; -} + input?: ParamInput; +}; export type ParamOptions = Omit, 'name' | 'type'>; -export class Param { +export abstract class Param< + T extends string | number | boolean | string[] +> extends Expression { static type: ParamValueType = 'string'; - constructor(readonly name: string, readonly options: ParamOptions = {}) {} + constructor(readonly name: string, readonly options: ParamOptions = {}) { + super(); + } - get rawValue(): string | undefined { - return process.env[this.name]; + value(): T { + throw new Error('Not implemented'); } - get value(): any { - return this.rawValue || this.options.default || ''; + cmp(cmp: '==' | '>' | '>=' | '<' | '<=', rhs: T) { + return new CompareExpression(cmp, this, rhs); } - toString() { - return `{{params.${this.name}}}`; + equals(rhs: T) { + return this.cmp('==', rhs); } - toJSON() { - return this.toString(); + toString(): string { + return `params.${this.name}`; } - toSpec(): ParamSpec { + toSpec(): ParamSpec { const out: ParamSpec = { name: this.name, ...this.options, type: (this.constructor as typeof Param).type, }; - if (this.options.default && typeof this.options.default !== 'string') { - out.default = (this.options.default as - | { toString?: () => string } - | undefined)?.toString?.(); - } - return out as ParamSpec; + return out as ParamSpec; + } +} + +export class SecretParam { + name: string; + static type: ParamValueType = 'secret'; + + constructor(name: string) { + this.name = name; + } + + value(): string { + return process.env[this.name] || ''; + } + + toSpec(): ParamSpec { + return { + type: 'secret', + name: this.name, + }; } } export class StringParam extends Param { - // identical to the abstract class, just explicitly a string + value(): string { + return process.env[this.name] || ''; + } } export class IntParam extends Param { static type: ParamValueType = 'int'; - get value(): number { - const intVal = parseInt( - this.rawValue || this.options.default?.toString() || '0', - 10 - ); - if (Number.isNaN(intVal)) { - throw new Error( - `unable to load param "${this.name}", value ${JSON.stringify( - this.rawValue - )} could not be parsed as integer` - ); - } - return intVal; + value(): number { + return parseInt(process.env[this.name] || '0', 10) || 0; } } export class FloatParam extends Param { static type: ParamValueType = 'float'; - get value(): number { - const floatVal = parseFloat( - this.rawValue || this.options.default?.toString() || '0' - ); - if (Number.isNaN(floatVal)) { - throw new Error( - `unable to load param "${this.name}", value ${JSON.stringify( - this.rawValue - )} could not be parsed as float` - ); - } - return floatVal; + value(): number { + return parseFloat(process.env[this.name] || '0') || 0; } } -export class BooleanParam extends Param { +export class BooleanParam extends Param { static type: ParamValueType = 'boolean'; - get value(): boolean { - const lowerVal = ( - this.rawValue || - this.options.default?.toString() || - 'false' - ).toLowerCase(); - if ( - !['true', 'y', 'yes', '1', 'false', 'n', 'no', '0'].includes(lowerVal) - ) { - throw new Error( - `unable to load param "${this.name}", value ${JSON.stringify( - this.rawValue - )} could not be parsed as boolean` - ); - } - return ['true', 'y', 'yes', '1'].includes(lowerVal); + value(): boolean { + return !!process.env[this.name]; + } + + then(ifTrue: T, ifFalse: T) { + return new TernaryExpression(this, ifTrue, ifFalse); } } export class ListParam extends Param { static type: ParamValueType = 'list'; - get value(): string[] { - return typeof this.rawValue === 'string' - ? this.rawValue.split(/, ?/) - : this.options.default || []; + value(): string[] { + throw new Error('Not implemented'); } - toSpec(): ParamSpec { + toSpec(): ParamSpec { const out: ParamSpec = { name: this.name, type: 'list', @@ -152,25 +289,6 @@ export class ListParam extends Param { out.default = this.options.default.join(','); } - return out as ParamSpec; - } -} - -export class JSONParam extends Param { - static type: ParamValueType = 'json'; - - get value(): T { - if (this.rawValue) { - try { - return JSON.parse(this.rawValue!) as T; - } catch (e) { - throw new Error( - `unable to load param "${this.name}", value ${this.rawValue} could not be parsed as JSON: ${e.message}` - ); - } - } else if (this.options?.hasOwnProperty('default')) { - return this.options.default; - } - return {} as T; + return out as ParamSpec; } } diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 556b2b77b..6953e44b8 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -23,6 +23,7 @@ import { ManifestEndpoint } from '../../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; +import { Expression } from '../../params'; /** * The CloudEvent data emitted by Firebase Alerts. @@ -90,7 +91,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -102,7 +103,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -110,13 +111,13 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -125,7 +126,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 5b34c7b7c..977af5450 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -28,6 +28,7 @@ import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; +import { Expression } from '../../params'; /** * The internal payload object for adding a new tester device to app distribution. @@ -103,7 +104,7 @@ export interface AppDistributionOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -115,7 +116,7 @@ export interface AppDistributionOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -123,13 +124,13 @@ export interface AppDistributionOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -138,7 +139,7 @@ export interface AppDistributionOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index 6f814320f..af3d58bdc 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -28,6 +28,7 @@ import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; +import { Expression } from '../../params'; /** Generic Crashlytics issue interface */ export interface Issue { @@ -182,7 +183,7 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -194,7 +195,7 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -202,13 +203,13 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -217,7 +218,7 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts index acfdfb76d..2f3127dff 100644 --- a/src/v2/providers/database.ts +++ b/src/v2/providers/database.ts @@ -29,6 +29,7 @@ import { PathPattern } from '../../utilities/path-pattern'; import { applyChange } from '../../utils'; import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +import { Expression } from '../params'; export { DataSnapshot }; @@ -102,7 +103,7 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -114,7 +115,7 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -122,13 +123,13 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -137,7 +138,7 @@ export interface ReferenceOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. @@ -184,7 +185,7 @@ export interface ReferenceOptions extends options.EventHandlerOptions { secrets?: string[]; /** Whether failed executions should be delivered again. */ - retry?: boolean; + retry?: boolean | Expression | null; } /** diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts index fed753864..71e4b0174 100644 --- a/src/v2/providers/eventarc.ts +++ b/src/v2/providers/eventarc.ts @@ -29,6 +29,7 @@ import { convertIfPresent, copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +import { Expression } from '../params'; /** Options that can be set on an Eventarc trigger. */ export interface EventarcTriggerOptions extends options.EventHandlerOptions { @@ -67,7 +68,7 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -79,7 +80,7 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -87,13 +88,13 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -102,7 +103,7 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts index dad7355cd..0ab9c531c 100644 --- a/src/v2/providers/https.ts +++ b/src/v2/providers/https.ts @@ -40,6 +40,7 @@ import { import { ManifestEndpoint } from '../../runtime/manifest'; import * as options from '../options'; import { GlobalOptions, SupportedRegion } from '../options'; +import { Expression } from '../params'; export { Request, CallableRequest, FunctionsErrorCode, HttpsError }; @@ -60,7 +61,7 @@ export interface HttpsOptions extends Omit { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -72,7 +73,7 @@ export interface HttpsOptions extends Omit { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -80,13 +81,13 @@ export interface HttpsOptions extends Omit { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -95,7 +96,7 @@ export interface HttpsOptions extends Omit { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts index eb03c747b..ed823dd0f 100644 --- a/src/v2/providers/identity.ts +++ b/src/v2/providers/identity.ts @@ -36,6 +36,7 @@ import { wrapHandler, } from '../../common/providers/identity'; import * as options from '../options'; +import { Expression } from '../params'; export { AuthUserRecord, AuthBlockingEvent, HttpsError }; @@ -69,7 +70,7 @@ export interface BlockingOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -81,7 +82,7 @@ export interface BlockingOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -89,13 +90,13 @@ export interface BlockingOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -104,7 +105,7 @@ export interface BlockingOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts index 380ed6946..6f04f5cec 100644 --- a/src/v2/providers/pubsub.ts +++ b/src/v2/providers/pubsub.ts @@ -29,6 +29,7 @@ import { copyIfPresent } from '../../common/encoding'; import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +import { Expression } from '../params'; /** * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it. @@ -164,7 +165,7 @@ export interface PubSubOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -176,7 +177,7 @@ export interface PubSubOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -184,13 +185,13 @@ export interface PubSubOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -199,7 +200,7 @@ export interface PubSubOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts index 33281abd1..fd8a2131e 100644 --- a/src/v2/providers/storage.ts +++ b/src/v2/providers/storage.ts @@ -30,6 +30,7 @@ import { firebaseConfig } from '../../config'; import { ManifestEndpoint } from '../../runtime/manifest'; import { CloudEvent, CloudFunction } from '../core'; import * as options from '../options'; +import { Expression } from '../params'; /** * An object within Google Cloud Storage. @@ -209,7 +210,7 @@ export interface StorageOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -221,7 +222,7 @@ export interface StorageOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -229,13 +230,13 @@ export interface StorageOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -244,7 +245,7 @@ export interface StorageOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index df3b9b8c2..9883aea3e 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -39,8 +39,9 @@ import { } from '../../common/providers/tasks'; import * as options from '../options'; import { HttpsFunction } from './https'; +import { Expression } from '../params'; -export { AuthData, RateLimits, Request, RetryConfig }; +export { AuthData, Request }; export interface TaskQueueOptions extends options.EventHandlerOptions { /** How a task should be retried in the event of a non-2xx return. */ @@ -66,7 +67,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { * Amount of memory to allocate to a function. * A value of null restores the defaults of 256MB. */ - memory?: options.MemoryOption | null; + memory?: options.MemoryOption | Expression | null; /** * Timeout for the function in sections, possible values are 0 to 540. @@ -78,7 +79,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum * timeout of 1,800s (30 minutes) */ - timeoutSeconds?: number | null; + timeoutSeconds?: number | Expression | null; /** * Min number of actual instances to be running at a given time. @@ -86,13 +87,13 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { * while idle. * A value of null restores the default min instances. */ - minInstances?: number | null; + minInstances?: number | Expression | null; /** * Max number of instances to be running in parallel. * A value of null restores the default max instances. */ - maxInstances?: number | null; + maxInstances?: number | Expression | null; /** * Number of requests a function can serve at once. @@ -101,7 +102,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions { * 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 | null; + concurrency?: number | Expression | null; /** * Fractional number of CPUs to allocate to a function. From 941704dc5c3662f313f8717f19e10a7294918cc2 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 31 Aug 2022 20:33:26 +0000 Subject: [PATCH 497/705] 3.23.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f4742d4c..b05fdebe8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firebase-functions", - "version": "3.22.0", + "version": "3.23.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-functions", - "version": "3.22.0", + "version": "3.23.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 69265b485..5ae1df4b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.22.0", + "version": "3.23.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From 7783ae652f9acc09254230780e048d020e341e0b Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 31 Aug 2022 20:33:29 +0000 Subject: [PATCH 498/705] [firebase-release] Removed change log and reset repo after 3.23.0 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd094b29..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Fixes a bug that disallowed setting customClaims and/or sessionClaims in blocking functions (#1199). -- Add v2 Schedule Triggers (#1177). From c18e832d9250a3ec839b61403f7977792889d451 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 14 Sep 2022 11:37:43 -0400 Subject: [PATCH 499/705] Adds performance monitoring triggers to v2 alerts (#1223) * rebasing master * add return to app distro * merge changelog * yank trace * add alert type to index * add link into tsdoc * fix get opts * linter * lineup with master * linter * adding logic to convert a payload to api council spec * fix wording of optional fields --- CHANGELOG.md | 1 + package.json | 4 + spec/runtime/manifest.spec.ts | 2 +- spec/v2/providers/alerts/performance.spec.ts | 168 ++++++++++++++++ src/runtime/manifest.ts | 4 +- src/v2/params/index.ts | 4 +- src/v2/params/types.ts | 8 +- src/v2/providers/alerts/alerts.ts | 1 + src/v2/providers/alerts/appDistribution.ts | 2 +- src/v2/providers/alerts/index.ts | 3 +- src/v2/providers/alerts/performance.ts | 197 +++++++++++++++++++ src/v2/providers/tasks.ts | 2 +- v2/alerts/performance.js | 26 +++ 13 files changed, 410 insertions(+), 12 deletions(-) create mode 100644 spec/v2/providers/alerts/performance.spec.ts create mode 100644 src/v2/providers/alerts/performance.ts create mode 100644 v2/alerts/performance.js diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..db12f0f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Add performance monitoring triggers to v2 alerts (#1223). diff --git a/package.json b/package.json index 5ae1df4b8..a4a9711d5 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "./v2/alerts/appDistribution": "./lib/v2/providers/alerts/appDistribution.js", "./v2/alerts/billing": "./lib/v2/providers/alerts/billing.js", "./v2/alerts/crashlytics": "./lib/v2/providers/alerts/crashlytics.js", + "./v2/alerts/performance": "./lib/v2/providers/alerts/performance.js", "./v2/eventarc": "./lib/v2/providers/eventarc.js", "./v2/identity": "./lib/v2/providers/identity.js", "./v2/database": "./lib/v2/providers/database.js", @@ -125,6 +126,9 @@ "v2/alerts/crashlytics": [ "lib/v2/providers/alerts/crashlytics" ], + "v2/alerts/performance": [ + "lib/v2/providers/alerts/performance" + ], "v2/base": [ "lib/v2/base" ], diff --git a/spec/runtime/manifest.spec.ts b/spec/runtime/manifest.spec.ts index 7710c54a6..96a330914 100644 --- a/spec/runtime/manifest.spec.ts +++ b/spec/runtime/manifest.spec.ts @@ -1,5 +1,5 @@ -import { stackToWire, ManifestStack } from '../../src/runtime/manifest'; import { expect } from 'chai'; +import { ManifestStack, stackToWire } from '../../src/runtime/manifest'; import * as params from '../../src/v2/params'; describe('stackToWire', () => { diff --git a/spec/v2/providers/alerts/performance.spec.ts b/spec/v2/providers/alerts/performance.spec.ts new file mode 100644 index 000000000..99f99ddc7 --- /dev/null +++ b/spec/v2/providers/alerts/performance.spec.ts @@ -0,0 +1,168 @@ +import { expect } from 'chai'; +import * as alerts from '../../../../src/v2/providers/alerts'; +import * as performance from '../../../../src/v2/providers/alerts/performance'; +import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; + +const APPID = '123456789'; +const myHandler = () => 42; + +const APP_EVENT_FILTER = { + appid: APPID, +}; + +describe('performance', () => { + describe('onThresholdAlertPublished', () => { + it('should create a function with alertType & appId', () => { + const func = performance.onThresholdAlertPublished(APPID, myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: performance.thresholdAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with opts', () => { + const func = performance.onThresholdAlertPublished( + { ...FULL_OPTIONS }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alerttype: performance.thresholdAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with appid in opts', () => { + const func = performance.onThresholdAlertPublished( + { ...FULL_OPTIONS, appId: APPID }, + myHandler + ); + + expect(func.__endpoint).to.deep.equal({ + ...FULL_ENDPOINT, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + ...APP_EVENT_FILTER, + alerttype: performance.thresholdAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function without opts or appId', () => { + const func = performance.onThresholdAlertPublished(myHandler); + + expect(func.__endpoint).to.deep.equal({ + platform: 'gcfv2', + labels: {}, + eventTrigger: { + eventType: alerts.eventType, + eventFilters: { + alerttype: performance.thresholdAlert, + }, + retry: false, + }, + }); + }); + + it('should create a function with a run method', () => { + const func = performance.onThresholdAlertPublished( + APPID, + (event) => event + ); + + const res = func.run('input' as any); + + expect(res).to.equal('input'); + }); + }); + + describe('getOptsAndApp', () => { + it('should parse a string', () => { + const [opts, appId] = performance.getOptsAndApp(APPID); + + expect(opts).to.deep.equal({}); + expect(appId).to.equal(APPID); + }); + + it('should parse an options object without appId', () => { + const myOpts: performance.PerformanceOptions = { + region: 'us-west1', + }; + + const [opts, appId] = performance.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.be.undefined; + }); + + it('should parse an options object with appId', () => { + const myOpts: performance.PerformanceOptions = { + appId: APPID, + region: 'us-west1', + }; + + const [opts, appId] = performance.getOptsAndApp(myOpts); + + expect(opts).to.deep.equal({ region: 'us-west1' }); + expect(appId).to.equal(APPID); + }); + }); + + describe('convertPayload', () => { + it('should return the same payload', () => { + const payload = { + a: 'b', + conditionPercentile: 23, + appVersion: '3', + }; + + const convertedPayload = performance.convertPayload(payload as any); + + expect(convertedPayload).to.deep.eq(payload); + }); + + it('should return the same payload if the fields are undefined', () => { + const payload = { + a: 'b', + }; + + const convertedPayload = performance.convertPayload(payload as any); + + expect(convertedPayload).to.deep.eq({ + a: 'b', + }); + }); + + it('should remove fields', () => { + const payload = { + a: 'b', + conditionPercentile: 0, + appVersion: '', + }; + + const convertedPayload = performance.convertPayload(payload as any); + + expect(convertedPayload).to.deep.eq({ + a: 'b', + }); + }); + }); +}); diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index 062966985..d53165420 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -102,8 +102,8 @@ export interface ManifestStack { * @internal */ export function stackToWire(stack: ManifestStack): Object { - let wireStack = stack as any; - let traverse = function traverse(obj: Object) { + const wireStack = stack as any; + const traverse = function traverse(obj: Object) { for (const [key, val] of Object.entries(obj)) { if (val instanceof Expression) { obj[key] = val.toCEL(); diff --git a/src/v2/params/index.ts b/src/v2/params/index.ts index 67080f308..b638d68a5 100644 --- a/src/v2/params/index.ts +++ b/src/v2/params/index.ts @@ -27,14 +27,14 @@ import { BooleanParam, + Expression, FloatParam, IntParam, ListParam, Param, ParamOptions, - StringParam, SecretParam, - Expression, + StringParam, } from './types'; export { ParamOptions, Expression }; diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts index 16d194fda..b138150db 100644 --- a/src/v2/params/types.ts +++ b/src/v2/params/types.ts @@ -46,7 +46,7 @@ export abstract class Expression< function quoteIfString( literal: T ): T { - //TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here? + // TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here? return typeof literal === 'string' ? (`"${literal}"` as T) : literal; } @@ -171,14 +171,14 @@ export interface SelectOptions { value: T; } -export type ParamSpec = { +export interface ParamSpec { name: string; default?: T; label?: string; description?: string; type: ParamValueType; input?: ParamInput; -}; +} export type ParamOptions = Omit, 'name' | 'type'>; @@ -219,8 +219,8 @@ export abstract class Param< } export class SecretParam { - name: string; static type: ParamValueType = 'secret'; + name: string; constructor(name: string) { this.name = name; diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 6953e44b8..545e9bbcf 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -70,6 +70,7 @@ export type AlertType = | 'billing.automatedPlanUpdate' | 'appDistribution.newTesterIosDevice' | 'appDistribution.inAppFeedback' + | 'performance.threshold' | string; /** diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 977af5450..695bfc4df 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -27,8 +27,8 @@ import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; -import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; import { Expression } from '../../params'; +import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; /** * The internal payload object for adding a new tester device to app distribution. diff --git a/src/v2/providers/alerts/index.ts b/src/v2/providers/alerts/index.ts index d16ef00fe..e0988f5b8 100644 --- a/src/v2/providers/alerts/index.ts +++ b/src/v2/providers/alerts/index.ts @@ -30,6 +30,7 @@ import * as appDistribution from './appDistribution'; import * as billing from './billing'; import * as crashlytics from './crashlytics'; +import * as performance from './performance'; -export { appDistribution, billing, crashlytics }; +export { appDistribution, billing, crashlytics, performance }; export * from './alerts'; diff --git a/src/v2/providers/alerts/performance.ts b/src/v2/providers/alerts/performance.ts new file mode 100644 index 000000000..7fa82439f --- /dev/null +++ b/src/v2/providers/alerts/performance.ts @@ -0,0 +1,197 @@ +// 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. + +/** + * Cloud functions to handle Firebase Performance Monitoring events from Firebase Alerts. + * @packageDocumentation + */ + +import { FirebaseAlertData, getEndpointAnnotation } from '.'; +import { CloudEvent, CloudFunction } from '../../core'; +import { EventHandlerOptions } from '../../options'; + +/** + * The internal payload object for a performance threshold alert. + * Payload is wrapped inside a {@link FirebaseAlertData} object. + */ +export interface ThresholdAlertPayload { + /* Name of the trace or network request this alert is for (e.g. my_custom_trace, firebase.com/api/123) */ + eventName: string; + /* The resource type this alert is for (i.e. trace, network request, screen rendering, etc.) */ + eventType: string; + /* The metric type this alert is for (i.e. success rate, response time, duration, etc.) */ + metricType: string; + /* The number of events checked for this alert condition */ + numSamples: number; + /* The threshold value of the alert condition without units (e.g. "75", "2.1") */ + thresholdValue: number; + /* The unit for the alert threshold (e.g. "percent", "seconds") */ + thresholdUnit: string; + /* The percentile of the alert condition, can be 0 if percentile is not applicable to the alert condition and omitted; range: [1, 100] */ + conditionPercentile?: number; + /* The app version this alert was triggered for, can be omitted if the alert is for a network request (because the alert was checked against data from all versions of app) or a web app (where the app is versionless) */ + appVersion?: string; + /* The value that violated the alert condition (e.g. "76.5", "3") */ + violationValue: number; + /* The unit for the violation value (e.g. "percent", "seconds") */ + violationUnit: string; + /* The link to Fireconsole to investigate more into this alert */ + investigateUri: string; +} + +/** + * A custom CloudEvent for Firebase Alerts (with custom extension attributes). + * @typeParam T - the data type for performance alerts that is wrapped in a `FirebaseAlertData` object. + */ +export interface PerformanceEvent extends CloudEvent> { + /** The type of the alerts that got triggered. */ + alertType: string; + /** The Firebase App ID that’s associated with the alert. */ + appId: string; +} + +/** @internal */ +export const thresholdAlert = 'performance.threshold'; + +/** + * Configuration for app distribution functions. + */ +export interface PerformanceOptions extends EventHandlerOptions { + // Scope the function to trigger on a specific application. + appId?: string; +} + +/** + * Declares a function that can handle receiving performance threshold alerts. + * @param handler - Event handler which is run every time a threshold alert is received. + * @returns A function that you can export and deploy. + */ +export function onThresholdAlertPublished( + handler: ( + event: PerformanceEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving performance threshold alerts. + * @param appId - A specific application the handler will trigger on. + * @param handler - Event handler which is run every time a threshold alert is received. + * @returns A function that you can export and deploy. + */ +export function onThresholdAlertPublished( + appId: string, + handler: ( + event: PerformanceEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving performance threshold alerts. + * @param opts - Options that can be set on the function. + * @param handler - Event handler which is run every time a threshold alert is received. + * @returns A function that you can export and deploy. + */ +export function onThresholdAlertPublished( + opts: PerformanceOptions, + handler: ( + event: PerformanceEvent + ) => any | Promise +): CloudFunction>; + +/** + * Declares a function that can handle receiving performance threshold alerts. + * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. + * @param handler - Event handler which is run every time a threshold alert is received. + * @returns A function that you can export and deploy. + */ +export function onThresholdAlertPublished( + appIdOrOptsOrHandler: + | string + | PerformanceOptions + | ((event: PerformanceEvent) => any | Promise), + handler?: ( + event: PerformanceEvent + ) => any | Promise +): CloudFunction> { + if (typeof appIdOrOptsOrHandler === 'function') { + handler = appIdOrOptsOrHandler as ( + event: PerformanceEvent + ) => any | Promise; + appIdOrOptsOrHandler = {}; + } + + const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); + + const func = (raw: CloudEvent) => { + const event = raw as PerformanceEvent; + const convertedPayload = convertPayload(event.data.payload); + event.data.payload = convertedPayload; + return handler(event); + }; + + func.run = handler; + func.__endpoint = getEndpointAnnotation(opts, thresholdAlert, appId); + + return func; +} + +/** + * Helper function to parse the function opts and appId. + * @internal + */ +export function getOptsAndApp( + appIdOrOpts: string | PerformanceOptions +): [EventHandlerOptions, string | undefined] { + if (typeof appIdOrOpts === 'string') { + return [{}, appIdOrOpts]; + } + + const opts: EventHandlerOptions = { ...appIdOrOpts }; + const appId: string | undefined = appIdOrOpts.appId; + delete (opts as any).appId; + + return [opts, appId]; +} + +/** + * Helper function to convert the raw payload of a {@link PerformanceEvent} to a {@link ThresholdAlertPayload} + * @internal + */ +export function convertPayload( + raw: ThresholdAlertPayload +): ThresholdAlertPayload { + const payload: ThresholdAlertPayload = { ...raw }; + if ( + typeof payload.conditionPercentile !== 'undefined' && + payload.conditionPercentile === 0 + ) { + delete (payload as any).conditionPercentile; + } + if ( + typeof payload.appVersion !== 'undefined' && + payload.appVersion.length === 0 + ) { + delete (payload as any).appVersion; + } + + return payload; +} diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts index 9883aea3e..efc99e273 100644 --- a/src/v2/providers/tasks.ts +++ b/src/v2/providers/tasks.ts @@ -38,8 +38,8 @@ import { RetryConfig, } from '../../common/providers/tasks'; import * as options from '../options'; -import { HttpsFunction } from './https'; import { Expression } from '../params'; +import { HttpsFunction } from './https'; export { AuthData, Request }; diff --git a/v2/alerts/performance.js b/v2/alerts/performance.js new file mode 100644 index 000000000..ae33ba821 --- /dev/null +++ b/v2/alerts/performance.js @@ -0,0 +1,26 @@ +// 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. + +// This file is not part of the firebase-functions SDK. It is used to silence the +// imports eslint plugin until it can understand import paths defined by node +// package exports. +// For more information, see github.com/import-js/eslint-plugin-import/issues/1810 From 65e66a21388ffe08f923e194d28295090f9cf195 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Mon, 19 Sep 2022 20:08:22 -0400 Subject: [PATCH 500/705] Converting alert type and app id to camel case in the CloudEvent (#1236) * converting to camel case * add fix for generic alerts --- spec/v2/providers/alerts/alerts.spec.ts | 36 ++++++++++++++++++++++ src/v2/providers/alerts/alerts.ts | 23 +++++++++++++- src/v2/providers/alerts/appDistribution.ts | 14 +++++++-- src/v2/providers/alerts/billing.ts | 8 +++-- src/v2/providers/alerts/crashlytics.ts | 8 +++-- src/v2/providers/alerts/performance.ts | 10 ++++-- 6 files changed, 89 insertions(+), 10 deletions(-) diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts index 8c4741f43..592b2839e 100644 --- a/spec/v2/providers/alerts/alerts.spec.ts +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; +import { CloudEvent } from '../../../../src/v2'; import * as options from '../../../../src/v2/options'; import * as alerts from '../../../../src/v2/providers/alerts'; import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures'; @@ -174,4 +175,39 @@ describe('alerts', () => { expect(appId).to.be.equal(myOpts.appId); }); }); + + describe('convertAlertAndApp', () => { + const event: CloudEvent = { + specversion: '1.0', + id: 'id', + source: 'source', + type: 'type', + time: 'now', + data: 'data', + }; + + it('should leave event unchanged if alerttype & appid are missing', () => { + const raw = { ...event }; + + const converted = alerts.convertAlertAndApp(raw); + + expect(raw).to.deep.eq(converted); + }); + + it('should convert alerttype & appid when present', () => { + const raw = { + ...event, + alerttype: 'my-alert', + appid: 'my-app', + }; + + const converted = alerts.convertAlertAndApp(raw); + + expect(converted).to.deep.eq({ + ...event, + alertType: 'my-alert', + appId: 'my-app', + }); + }); + }); }); diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index 545e9bbcf..c021c6ebd 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -207,7 +207,7 @@ export function onAlertPublished( const [opts, alertType, appId] = getOptsAndAlertTypeAndApp(alertTypeOrOpts); const func = (raw: CloudEvent) => { - return handler(raw as AlertEvent); + return handler(convertAlertAndApp(raw) as AlertEvent); }; func.run = handler; @@ -271,3 +271,24 @@ export function getOptsAndAlertTypeAndApp( } return [opts, alertType, appId]; } + +/** + * Helper function to covert alert type & app id in the CloudEvent to camel case. + * @internal + */ +export function convertAlertAndApp( + raw: CloudEvent +): CloudEvent { + const event = { ...raw }; + + if ('alerttype' in event) { + (event as any).alertType = (event as any).alerttype; + delete (event as any).alerttype; + } + if ('appid' in event) { + (event as any).appId = (event as any).appid; + delete (event as any).appid; + } + + return event; +} diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 695bfc4df..3a9e7107c 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -28,7 +28,11 @@ import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; import { Expression } from '../../params'; -import { FirebaseAlertData, getEndpointAnnotation } from './alerts'; +import { + convertAlertAndApp, + FirebaseAlertData, + getEndpointAnnotation, +} from './alerts'; /** * The internal payload object for adding a new tester device to app distribution. @@ -253,7 +257,9 @@ export function onNewTesterIosDevicePublished( const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); const func = (raw: CloudEvent) => { - return handler(raw as AppDistributionEvent); + return handler( + convertAlertAndApp(raw) as AppDistributionEvent + ); }; func.run = handler; @@ -326,7 +332,9 @@ export function onInAppFeedbackPublished( const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); const func = (raw: CloudEvent) => { - return handler(raw as AppDistributionEvent); + return handler( + convertAlertAndApp(raw) as AppDistributionEvent + ); }; func.run = handler; diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts index 4d42af79b..955fd8791 100644 --- a/src/v2/providers/alerts/billing.ts +++ b/src/v2/providers/alerts/billing.ts @@ -25,9 +25,13 @@ * @packageDocumentation */ -import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; +import { + convertAlertAndApp, + FirebaseAlertData, + getEndpointAnnotation, +} from './alerts'; /** * The internal payload object for billing plan updates. @@ -167,7 +171,7 @@ export function onOperation( } const func = (raw: CloudEvent) => { - return handler(raw as BillingEvent); + return handler(convertAlertAndApp(raw) as BillingEvent); }; func.run = handler; diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts index af3d58bdc..1e6345b41 100644 --- a/src/v2/providers/alerts/crashlytics.ts +++ b/src/v2/providers/alerts/crashlytics.ts @@ -25,10 +25,14 @@ * @packageDocumentation */ -import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import * as options from '../../options'; import { Expression } from '../../params'; +import { + convertAlertAndApp, + FirebaseAlertData, + getEndpointAnnotation, +} from './alerts'; /** Generic Crashlytics issue interface */ export interface Issue { @@ -631,7 +635,7 @@ export function onOperation( ); const func = (raw: CloudEvent) => { - return handler(raw as CrashlyticsEvent); + return handler(convertAlertAndApp(raw) as CrashlyticsEvent); }; func.run = handler; diff --git a/src/v2/providers/alerts/performance.ts b/src/v2/providers/alerts/performance.ts index 7fa82439f..bc4ab22c9 100644 --- a/src/v2/providers/alerts/performance.ts +++ b/src/v2/providers/alerts/performance.ts @@ -25,9 +25,13 @@ * @packageDocumentation */ -import { FirebaseAlertData, getEndpointAnnotation } from '.'; import { CloudEvent, CloudFunction } from '../../core'; import { EventHandlerOptions } from '../../options'; +import { + convertAlertAndApp, + FirebaseAlertData, + getEndpointAnnotation, +} from './alerts'; /** * The internal payload object for a performance threshold alert. @@ -142,7 +146,9 @@ export function onThresholdAlertPublished( const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler); const func = (raw: CloudEvent) => { - const event = raw as PerformanceEvent; + const event = convertAlertAndApp(raw) as PerformanceEvent< + ThresholdAlertPayload + >; const convertedPayload = convertPayload(event.data.payload); event.data.payload = convertedPayload; return handler(event); From b93e397b32ae3884db79910a1c22242112514f90 Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 21 Sep 2022 14:48:27 -0400 Subject: [PATCH 501/705] Don't delete fields on a non-breaking change release (#1238) --- spec/v2/providers/alerts/alerts.spec.ts | 2 ++ src/v2/providers/alerts/alerts.ts | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts index 592b2839e..3decbd111 100644 --- a/spec/v2/providers/alerts/alerts.spec.ts +++ b/spec/v2/providers/alerts/alerts.spec.ts @@ -205,6 +205,8 @@ describe('alerts', () => { expect(converted).to.deep.eq({ ...event, + alerttype: 'my-alert', + appid: 'my-app', alertType: 'my-alert', appId: 'my-app', }); diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts index c021c6ebd..b36fb0c55 100644 --- a/src/v2/providers/alerts/alerts.ts +++ b/src/v2/providers/alerts/alerts.ts @@ -283,11 +283,9 @@ export function convertAlertAndApp( if ('alerttype' in event) { (event as any).alertType = (event as any).alerttype; - delete (event as any).alerttype; } if ('appid' in event) { (event as any).appId = (event as any).appid; - delete (event as any).appid; } return event; From e191af7148e848197d9c83a5fd4131928e995fb4 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 21 Sep 2022 18:58:31 +0000 Subject: [PATCH 502/705] 3.24.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b05fdebe8..da000cde7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firebase-functions", - "version": "3.23.0", + "version": "3.24.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-functions", - "version": "3.23.0", + "version": "3.24.0", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index a4a9711d5..838ad1658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.23.0", + "version": "3.24.0", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From bd0fcbc595c15e38deea4de9e2ceabcbbc26a539 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Wed, 21 Sep 2022 18:58:33 +0000 Subject: [PATCH 503/705] [firebase-release] Removed change log and reset repo after 3.24.0 release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db12f0f5d..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +0,0 @@ -- Add performance monitoring triggers to v2 alerts (#1223). From 1ac04adba97f5b17f31b06226dc6be8f5ec13b1d Mon Sep 17 00:00:00 2001 From: Cole Rogers Date: Wed, 21 Sep 2022 16:44:58 -0400 Subject: [PATCH 504/705] fix tsdoc comments (#1240) --- CHANGELOG.md | 1 + src/v2/providers/alerts/performance.ts | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb..0df54b4ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix reference docs for performance monitoring. diff --git a/src/v2/providers/alerts/performance.ts b/src/v2/providers/alerts/performance.ts index bc4ab22c9..ef0a5f5e0 100644 --- a/src/v2/providers/alerts/performance.ts +++ b/src/v2/providers/alerts/performance.ts @@ -38,27 +38,27 @@ import { * Payload is wrapped inside a {@link FirebaseAlertData} object. */ export interface ThresholdAlertPayload { - /* Name of the trace or network request this alert is for (e.g. my_custom_trace, firebase.com/api/123) */ + /** Name of the trace or network request this alert is for (e.g. my_custom_trace, firebase.com/api/123) */ eventName: string; - /* The resource type this alert is for (i.e. trace, network request, screen rendering, etc.) */ + /** The resource type this alert is for (i.e. trace, network request, screen rendering, etc.) */ eventType: string; - /* The metric type this alert is for (i.e. success rate, response time, duration, etc.) */ + /** The metric type this alert is for (i.e. success rate, response time, duration, etc.) */ metricType: string; - /* The number of events checked for this alert condition */ + /** The number of events checked for this alert condition */ numSamples: number; - /* The threshold value of the alert condition without units (e.g. "75", "2.1") */ + /** The threshold value of the alert condition without units (e.g. "75", "2.1") */ thresholdValue: number; - /* The unit for the alert threshold (e.g. "percent", "seconds") */ + /** The unit for the alert threshold (e.g. "percent", "seconds") */ thresholdUnit: string; - /* The percentile of the alert condition, can be 0 if percentile is not applicable to the alert condition and omitted; range: [1, 100] */ + /** The percentile of the alert condition, can be 0 if percentile is not applicable to the alert condition and omitted; range: [1, 100] */ conditionPercentile?: number; - /* The app version this alert was triggered for, can be omitted if the alert is for a network request (because the alert was checked against data from all versions of app) or a web app (where the app is versionless) */ + /** The app version this alert was triggered for, can be omitted if the alert is for a network request (because the alert was checked against data from all versions of app) or a web app (where the app is versionless) */ appVersion?: string; - /* The value that violated the alert condition (e.g. "76.5", "3") */ + /** The value that violated the alert condition (e.g. "76.5", "3") */ violationValue: number; - /* The unit for the violation value (e.g. "percent", "seconds") */ + /** The unit for the violation value (e.g. "percent", "seconds") */ violationUnit: string; - /* The link to Fireconsole to investigate more into this alert */ + /** The link to Fireconsole to investigate more into this alert */ investigateUri: string; } @@ -80,7 +80,7 @@ export const thresholdAlert = 'performance.threshold'; * Configuration for app distribution functions. */ export interface PerformanceOptions extends EventHandlerOptions { - // Scope the function to trigger on a specific application. + /** Scope the function to trigger on a specific application. */ appId?: string; } From cf27ac6b0b50a50b56bab37c9f3b5fd755d14229 Mon Sep 17 00:00:00 2001 From: egilmorez Date: Wed, 21 Sep 2022 14:20:26 -0700 Subject: [PATCH 505/705] Adding required --project flag to v2 docgen script. (#1239) Co-authored-by: Daniel Lee --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 838ad1658..0e69c233e 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen", "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local", "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference", - "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown && npm run docgen:v2:toc", + "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown --project functions && npm run docgen:v2:toc", "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen", "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack", "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json", From cc6e28e6ed807cef61add89ac7c7d09dd754d876 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 29 Sep 2022 16:34:28 -0700 Subject: [PATCH 506/705] Fix bug where function configuration with null couldn't be deployed. (#1246) --- CHANGELOG.md | 1 + spec/runtime/manifest.spec.ts | 30 ++++++++++++++++++++++++++++++ src/runtime/manifest.ts | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df54b4ec..f6a8ba1bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ - Fix reference docs for performance monitoring. +- Fix bug where function configuration wil null values couldn't be deployed. (#1246) diff --git a/spec/runtime/manifest.spec.ts b/spec/runtime/manifest.spec.ts index 96a330914..382a0b41e 100644 --- a/spec/runtime/manifest.spec.ts +++ b/spec/runtime/manifest.spec.ts @@ -7,6 +7,36 @@ describe('stackToWire', () => { params.clearParams(); }); + it('converts stack with null values values', () => { + const stack: ManifestStack = { + endpoints: { + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + maxInstances: null, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', + }; + const expected = { + endpoints: { + v2http: { + platform: 'gcfv2', + entryPoint: 'v2http', + labels: {}, + httpsTrigger: {}, + maxInstances: null, + }, + }, + requiredAPIs: [], + specVersion: 'v1alpha1', + }; + expect(stackToWire(stack)).to.deep.equal(expected); + }); + it('converts Expression types in endpoint options to CEL', () => { const intParam = params.defineInt('foo', { default: 11 }); const stringParam = params.defineString('bar', { diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts index d53165420..553854ae0 100644 --- a/src/runtime/manifest.ts +++ b/src/runtime/manifest.ts @@ -107,7 +107,7 @@ export function stackToWire(stack: ManifestStack): Object { for (const [key, val] of Object.entries(obj)) { if (val instanceof Expression) { obj[key] = val.toCEL(); - } else if (typeof val === 'object') { + } else if (typeof val === 'object' && val !== null) { traverse(val); } } From 3c5392dfee2ab44d30bced291912821ab544d0a3 Mon Sep 17 00:00:00 2001 From: Kai Bolay Date: Thu, 29 Sep 2022 21:29:19 -0400 Subject: [PATCH 507/705] Hide documentation for in-app feedback (#1245) --- src/v2/providers/alerts/appDistribution.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts index 3a9e7107c..3446379e4 100644 --- a/src/v2/providers/alerts/appDistribution.ts +++ b/src/v2/providers/alerts/appDistribution.ts @@ -53,6 +53,8 @@ export interface NewTesterDevicePayload { /** * The internal payload object for receiving in-app feedback from a tester. * Payload is wrapped inside a `FirebaseAlertData` object. + * + * @alpha */ export interface InAppFeedbackPayload { ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload'; @@ -272,6 +274,8 @@ export function onNewTesterIosDevicePublished( * Declares a function that can handle receiving new in-app feedback from a tester. * @param handler - Event handler which is run every time new feedback is received. * @returns A function that you can export and deploy. + * + * @alpha */ export function onInAppFeedbackPublished( handler: ( @@ -284,6 +288,8 @@ export function onInAppFeedbackPublished( * @param appId - A specific application the handler will trigger on. * @param handler - Event handler which is run every time new feedback is received. * @returns A function that you can export and deploy. + * + * @alpha */ export function onInAppFeedbackPublished( appId: string, @@ -297,6 +303,8 @@ export function onInAppFeedbackPublished( * @param opts - Options that can be set on the function. * @param handler - Event handler which is run every time new feedback is received. * @returns A function that you can export and deploy. + * + * @alpha */ export function onInAppFeedbackPublished( opts: AppDistributionOptions, @@ -310,6 +318,8 @@ export function onInAppFeedbackPublished( * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function. * @param handler - Event handler which is run every time new feedback is received. * @returns A function that you can export and deploy. + * + * @alpha */ export function onInAppFeedbackPublished( appIdOrOptsOrHandler: From e4bda7d683b8dda345e89c7a1daedc9d71f7f88d Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 30 Sep 2022 18:01:59 +0000 Subject: [PATCH 508/705] 3.24.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index da000cde7..9c9e905c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "firebase-functions", - "version": "3.24.0", + "version": "3.24.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "firebase-functions", - "version": "3.24.0", + "version": "3.24.1", "license": "MIT", "dependencies": { "@types/cors": "^2.8.5", diff --git a/package.json b/package.json index 0e69c233e..56e1ce4f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "firebase-functions", - "version": "3.24.0", + "version": "3.24.1", "description": "Firebase SDK for Cloud Functions", "keywords": [ "firebase", From b096107ab8f00fb89c279cc8a07780678c946bd7 Mon Sep 17 00:00:00 2001 From: Google Open Source Bot Date: Fri, 30 Sep 2022 18:02:02 +0000 Subject: [PATCH 509/705] [firebase-release] Removed change log and reset repo after 3.24.1 release --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6a8ba1bc..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +0,0 @@ -- Fix reference docs for performance monitoring. -- Fix bug where function configuration wil null values couldn't be deployed. (#1246) From ffa3a574087e12e0fd866d504328b6a6e3d7f344 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 13 Oct 2022 12:03:42 -0700 Subject: [PATCH 510/705] Functions SDK v4 (#1161) ### Breaking Changes - Deprecated `allowInvalidAppCheckToken` option. Instead use`enforceAppCheck`. - App Check enforcement on callable functions is disabled by default in v4. - Requests containing invalid App Check tokens won't be denied unless you - explicitly enable App Check enforcement using the new `enforceAppCheck` option. - Furthermore, when enforcement is enabled, callable functions will deny - all requests without App Check tokens. - Dropped support for Node.js versions 8, 10, and 12. - Dropped support for Admin SDK versions 8 and 9. - Removed the `functions.handler` namespace. - `DataSnapshot` passed to the Firebase Realtime Database trigger now matches the `DataSnapshot` returned by the Admin SDK, with null values removed. - Removed `__trigger` object on function handlers. - Reorganized source code location. This affects only apps that directly import files instead of using the recommend entry points specified in the - Reworked the `apps` library and removed `lodash` as a runtime dependency. - Unspecified function configuration value will be reset to platform default. Use `preserveExternalChanges` to prevent this behavior. ### Enhancements - Logs created with the `functions.logger` package in v2 functions are now annotated with each request's trace ID, making it easy to correlate log entries with the incoming request. Trace IDs are especially useful for cases where 2nd gen's concurrency feature permits a function to handle multiple requests at any given time. See [Correlate log entries](https://cloud.google.com/logging/docs/view/correlate-logs) to learn more. - `functions.logger.error` now always outputs an error object and is included in Google Cloud Error Reporting. - The logging severity of Auth/App Check token validation has changed from `info` to `debug` level. - Event parameters for 2nd generation functions are now strongly typed, permitting stronger TypeScript types for matched parameters. - Add new params package to support parameterized environment configuration. See https://firebase.google.com/docs/functions/config-env for more information. - Add new `functions.RESET_VALUE` and `functions.v2.options.RESET_VALUE` sentinel value for explicitly resetting function configuration to platform default. - Add new `preserveExternalChanges` option to prevent Firebase CLI from resetting unspecified configuration option to platform default --- .eslintignore | 11 + .eslintrc.js | 70 + .github/ISSUE_TEMPLATE/---report-a-bug.md | 8 +- .github/workflows/postmerge.yaml | 10 +- .github/workflows/test.yaml | 29 +- .mocharc.yaml | 4 +- .prettierignore | 7 +- .prettierrc | 5 - .prettierrc.js | 3 + CHANGELOG.md | 32 + README.md | 16 +- docgen/api-extractor.base.json | 728 ++-- docgen/api-extractor.v1.json | 2 +- docgen/generate-docs.js | 383 -- docgen/toc.ts | 216 +- docgen/type-aliases.json | 5 - docgen/typedoc.js | 26 - integration_test/firebase.json | 2 + integration_test/functions/src/index.ts | 173 +- integration_test/functions/src/region.ts | 2 +- integration_test/functions/src/testing.ts | 34 +- .../functions/src/v1/auth-tests.ts | 68 +- .../functions/src/v1/database-tests.ts | 47 +- .../functions/src/v1/firestore-tests.ts | 30 +- .../functions/src/v1/https-tests.ts | 14 +- integration_test/functions/src/v1/index.ts | 17 +- .../functions/src/v1/pubsub-tests.ts | 62 +- .../functions/src/v1/remoteConfig-tests.ts | 39 +- .../functions/src/v1/storage-tests.ts | 20 +- .../functions/src/v1/testLab-tests.ts | 18 +- .../functions/src/v1/testLab-utils.ts | 38 +- .../functions/src/v2/https-tests.ts | 12 +- integration_test/functions/src/v2/index.ts | 9 +- .../functions/src/v2/scheduled-tests.ts | 22 +- mocha/setup.ts | 6 +- package-lock.json | 3410 ++++++++++++++--- package.json | 125 +- scripts/bin-test/mocha-setup.ts | 4 +- .../sources/commonjs-preserve/index.js | 18 + .../sources/commonjs-preserve/package.json | 3 + scripts/bin-test/test.ts | 167 +- scripts/publish-container/cloudbuild.yaml | 6 +- scripts/publish/cloudbuild.yaml | 130 +- spec/common/change.spec.ts | 72 +- spec/common/config.spec.ts | 72 + spec/common/encoding.spec.ts | 48 +- spec/common/metaprogramming.ts | 25 + spec/common/options.ts | 36 + spec/common/params.spec.ts | 109 + spec/common/providers/https.spec.ts | 735 ++-- spec/common/providers/identity.spec.ts | 676 ++-- spec/common/providers/tasks.spec.ts | 130 +- spec/common/trace.spec.ts | 103 + spec/common/utilities/path-pattern.spec.ts | 129 + spec/common/utilities/path.spec.ts | 24 + spec/fixtures.ts | 64 + spec/fixtures/mockrequest.ts | 3 +- spec/fixtures/sources/commonjs-grouped/g1.js | 2 +- .../sources/commonjs-grouped/index.js | 4 +- .../sources/commonjs-main/functions.js | 4 +- .../fixtures/sources/commonjs-params/index.js | 35 +- spec/fixtures/sources/commonjs/index.js | 4 +- spec/helper.ts | 21 +- spec/logger.spec.ts | 120 +- spec/params/params.spec.ts | 292 ++ spec/runtime/loader.spec.ts | 251 +- spec/runtime/manifest.spec.ts | 139 +- spec/utilities/path-pattern.spec.ts | 145 - spec/utilities/path.spec.ts | 24 - spec/v1/apps.spec.ts | 143 - spec/v1/cloud-functions.spec.ts | 279 +- spec/v1/config.spec.ts | 110 +- spec/v1/function-builder.spec.ts | 356 +- spec/v1/providers/analytics.spec.input.ts | 64 +- spec/v1/providers/analytics.spec.ts | 272 +- spec/v1/providers/auth.spec.ts | 285 +- spec/v1/providers/database.spec.ts | 890 ++--- spec/v1/providers/firestore.spec.ts | 485 +-- spec/v1/providers/fixtures.ts | 50 + spec/v1/providers/https.spec.ts | 147 +- spec/v1/providers/pubsub.spec.ts | 408 +- spec/v1/providers/remoteConfig.spec.ts | 127 +- spec/v1/providers/storage.spec.ts | 531 +-- spec/v1/providers/tasks.spec.ts | 93 +- spec/v1/providers/testLab.spec.ts | 206 +- spec/v1/utils.spec.ts | 22 +- spec/v2/params.spec.ts | 0 spec/v2/providers/alerts/alerts.spec.ts | 121 +- .../providers/alerts/appDistribution.spec.ts | 102 +- spec/v2/providers/alerts/billing.spec.ts | 65 +- spec/v2/providers/alerts/crashlytics.spec.ts | 106 +- spec/v2/providers/alerts/performance.spec.ts | 85 +- spec/v2/providers/database.spec.ts | 426 +- spec/v2/providers/eventarc.spec.ts | 78 +- spec/v2/providers/fixtures.ts | 61 +- spec/v2/providers/https.spec.ts | 307 +- spec/v2/providers/identity.spec.ts | 145 +- spec/v2/providers/pubsub.spec.ts | 143 +- spec/v2/providers/remoteConfig.spec.ts | 77 + spec/v2/providers/scheduler.spec.ts | 103 +- spec/v2/providers/storage.spec.ts | 522 +-- spec/v2/providers/tasks.spec.ts | 121 +- spec/v2/providers/testLab.spec.ts | 74 + src/apps.ts | 134 - src/bin/firebase-functions.ts | 35 +- src/common/app.ts | 69 + src/common/change.ts | 29 +- src/common/config.ts | 57 + src/common/debug.ts | 4 +- src/common/encoding.ts | 43 +- src/common/options.ts | 48 + src/common/params.ts | 87 + src/common/providers/database.ts | 133 +- src/common/providers/https.ts | 396 +- src/common/providers/identity.ts | 218 +- src/common/providers/tasks.ts | 48 +- src/common/timezone.ts | 1076 +++--- src/common/trace.ts | 82 + src/{ => common}/utilities/assertions.ts | 4 +- src/{ => common/utilities}/encoder.ts | 2 +- src/{ => common}/utilities/path-pattern.ts | 41 +- src/{ => common}/utilities/path.ts | 12 +- .../common/utilities/utils.ts | 52 +- src/config.ts | 138 - src/function-configuration.ts | 180 - src/handler-builder.ts | 379 -- src/logger/common.ts | 24 +- src/logger/compat.ts | 30 +- src/logger/index.ts | 86 +- src/{v2 => }/params/index.ts | 74 +- src/params/types.ts | 434 +++ src/runtime/loader.ts | 47 +- src/runtime/manifest.ts | 233 +- src/setup.ts | 67 - src/types/global.d.ts | 1 + src/{ => v1}/cloud-functions.ts | 471 +-- src/v1/config.ts | 80 + src/{ => v1}/function-builder.ts | 214 +- src/v1/function-configuration.ts | 269 ++ src/v1/handler-builder.ts | 0 src/{ => v1}/index.ts | 42 +- src/{ => v1}/providers/analytics.ts | 175 +- src/{ => v1}/providers/auth.ts | 125 +- src/{ => v1}/providers/database.ts | 145 +- src/{ => v1}/providers/firestore.ts | 168 +- src/{ => v1}/providers/https.ts | 57 +- src/{ => v1}/providers/pubsub.ts | 78 +- src/{ => v1}/providers/remoteConfig.ts | 48 +- src/{ => v1}/providers/storage.ts | 108 +- src/{ => v1}/providers/tasks.ts | 64 +- src/{ => v1}/providers/testLab.ts | 245 +- src/v2/core.ts | 39 +- src/v2/index.ts | 31 +- src/v2/options.ts | 269 +- src/v2/params/types.ts | 294 -- src/v2/providers/alerts/alerts.ts | 80 +- src/v2/providers/alerts/appDistribution.ts | 120 +- src/v2/providers/alerts/billing.ts | 51 +- src/v2/providers/alerts/crashlytics.ts | 189 +- src/v2/providers/alerts/index.ts | 10 +- src/v2/providers/alerts/performance.ts | 50 +- src/v2/providers/database.ts | 249 +- src/v2/providers/eventarc.ts | 72 +- src/v2/providers/https.ts | 202 +- src/v2/providers/identity.ts | 122 +- src/v2/providers/pubsub.ts | 99 +- src/v2/providers/remoteConfig.ts | 154 + src/v2/providers/scheduler.ts | 98 +- src/v2/providers/storage.ts | 151 +- src/v2/providers/tasks.ts | 130 +- src/v2/providers/testLab.ts | 214 ++ src/v2/trace.ts | 33 + tsconfig.json | 6 +- tsconfig.release.json | 6 +- src/utils.ts => v2/remoteConfig.js | 28 +- v2/testLab.js | 26 + 176 files changed, 13348 insertions(+), 12229 deletions(-) create mode 100644 .eslintignore create mode 100644 .eslintrc.js delete mode 100644 .prettierrc create mode 100644 .prettierrc.js delete mode 100644 docgen/generate-docs.js delete mode 100644 docgen/type-aliases.json delete mode 100644 docgen/typedoc.js create mode 100644 scripts/bin-test/sources/commonjs-preserve/index.js create mode 100644 scripts/bin-test/sources/commonjs-preserve/package.json create mode 100644 spec/common/config.spec.ts create mode 100644 spec/common/metaprogramming.ts create mode 100644 spec/common/options.ts create mode 100644 spec/common/params.spec.ts create mode 100644 spec/common/trace.spec.ts create mode 100644 spec/common/utilities/path-pattern.spec.ts create mode 100644 spec/common/utilities/path.spec.ts create mode 100644 spec/fixtures.ts create mode 100644 spec/params/params.spec.ts delete mode 100644 spec/utilities/path-pattern.spec.ts delete mode 100644 spec/utilities/path.spec.ts delete mode 100644 spec/v1/apps.spec.ts create mode 100644 spec/v1/providers/fixtures.ts create mode 100644 spec/v2/params.spec.ts create mode 100644 spec/v2/providers/remoteConfig.spec.ts create mode 100644 spec/v2/providers/testLab.spec.ts delete mode 100644 src/apps.ts create mode 100644 src/common/app.ts create mode 100644 src/common/config.ts create mode 100644 src/common/options.ts create mode 100644 src/common/params.ts create mode 100644 src/common/trace.ts rename src/{ => common}/utilities/assertions.ts (79%) rename src/{ => common/utilities}/encoder.ts (97%) rename src/{ => common}/utilities/path-pattern.ts (80%) rename src/{ => common}/utilities/path.ts (74%) rename spec/v1/setup.spec.ts => src/common/utilities/utils.ts (58%) delete mode 100644 src/config.ts delete mode 100644 src/handler-builder.ts rename src/{v2 => }/params/index.ts (69%) create mode 100644 src/params/types.ts delete mode 100644 src/setup.ts rename src/{ => v1}/cloud-functions.ts (50%) create mode 100644 src/v1/config.ts rename src/{ => v1}/function-builder.ts (74%) create mode 100644 src/v1/function-configuration.ts create mode 100644 src/v1/handler-builder.ts rename src/{ => v1}/index.ts (61%) rename src/{ => v1}/providers/analytics.ts (76%) rename src/{ => v1}/providers/auth.ts (69%) rename src/{ => v1}/providers/database.ts (73%) rename src/{ => v1}/providers/firestore.ts (60%) rename src/{ => v1}/providers/https.ts (74%) rename src/{ => v1}/providers/pubsub.ts (75%) rename src/{ => v1}/providers/remoteConfig.ts (81%) rename src/{ => v1}/providers/storage.ts (77%) rename src/{ => v1}/providers/tasks.ts (75%) rename src/{ => v1}/providers/testLab.ts (55%) delete mode 100644 src/v2/params/types.ts create mode 100644 src/v2/providers/remoteConfig.ts create mode 100644 src/v2/providers/testLab.ts create mode 100644 src/v2/trace.ts rename src/utils.ts => v2/remoteConfig.js (68%) create mode 100644 v2/testLab.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..72d1288b0 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,11 @@ +lib +dev +node_modules +/coverage/ +/docgen/ +/v1/ +/v2/ +/logger/ +/dist/ +/spec/fixtures +/scripts/**/*.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 000000000..f225e5960 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,70 @@ +module.exports = { + env: { + es6: true, + node: true, + }, + extends: [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@typescript-eslint/recommended-requiring-type-checking", + "plugin:jsdoc/recommended", + "google", + "prettier", + ], + rules: { + "jsdoc/newline-after-description": "off", + "jsdoc/require-jsdoc": ["warn", { publicOnly: true }], + "no-restricted-globals": ["error", "name", "length"], + "prefer-arrow-callback": "error", + "prettier/prettier": "error", + "require-atomic-updates": "off", // This rule is so noisy and isn't useful: https://github.com/eslint/eslint/issues/11899 + "require-jsdoc": "off", // This rule is deprecated and superseded by jsdoc/require-jsdoc. + "valid-jsdoc": "off", // This is deprecated but included in recommended configs. + + "no-prototype-builtins": "warn", + "no-useless-escape": "warn", + "prefer-promise-reject-errors": "warn", + }, + overrides: [ + { + files: ["*.ts"], + rules: { + "jsdoc/require-param-type": "off", + "jsdoc/require-returns-type": "off", + + // Google style guide allows us to omit trivial parameters and returns + "jsdoc/require-param": "off", + "jsdoc/require-returns": "off", + + "@typescript-eslint/no-invalid-this": "error", + "@typescript-eslint/no-unused-vars": "error", // Unused vars should not exist. + "@typescript-eslint/no-misused-promises": "warn", // rule does not work with async handlers for express. + "no-invalid-this": "off", // Turned off in favor of @typescript-eslint/no-invalid-this. + "no-unused-vars": "off", // Off in favor of @typescript-eslint/no-unused-vars. + eqeqeq: ["error", "always", { null: "ignore" }], + camelcase: ["error", { properties: "never" }], // snake_case allowed in properties iif to satisfy an external contract / style + + // Ideally, all these warning should be error - let's fix them in the future. + "@typescript-eslint/no-unsafe-argument": "warn", + "@typescript-eslint/no-unsafe-assignment": "warn", + "@typescript-eslint/no-unsafe-call": "warn", + "@typescript-eslint/no-unsafe-member-access": "warn", + "@typescript-eslint/no-unsafe-return": "warn", + "@typescript-eslint/restrict-template-expressions": "warn", + }, + }, + { + files: ["*.spec.*"], + env: { + mocha: true, + }, + rules: {}, + }, + ], + globals: {}, + parserOptions: { + project: "tsconfig.json", + }, + plugins: ["prettier", "@typescript-eslint", "jsdoc"], + parser: "@typescript-eslint/parser", +}; diff --git a/.github/ISSUE_TEMPLATE/---report-a-bug.md b/.github/ISSUE_TEMPLATE/---report-a-bug.md index 3ad82bf60..abffad1b7 100644 --- a/.github/ISSUE_TEMPLATE/---report-a-bug.md +++ b/.github/ISSUE_TEMPLATE/---report-a-bug.md @@ -1,9 +1,9 @@ --- -name: '⚠️ Report a Bug' +name: "⚠️ Report a Bug" about: Think you found a bug in the firebase-functions SDK? Report it here. Please do not use this form if your function is deployed successfully but not working as you expected. -title: '' -labels: '' -assignees: '' +title: "" +labels: "" +assignees: "" ---