Merge branch 'main' into yp-add-fid-arg

Author: yvonnep165

etc/firebase-admin.api.md

@@ -132,6 +132,4 @@ export interface ServiceAccount {
     projectId?: string;
 }
 
-// (No @packageDocumentation comment for this package)
-
 ```

gulpfile.js

@@ -56,7 +56,7 @@ var buildProject = ts.createProject('tsconfig.json', { rootDir: 'src', declarati
 
 // Include dom libraries during test compilation since we use some web SDK
 // libraries in our tests.
-var buildTest = ts.createProject('tsconfig.json', { lib: ['es2018', 'dom'] });
+var buildTest = ts.createProject('tsconfig.json', { lib: ['es2021', 'dom'] });
 
 var banner = `/*! firebase-admin v${pkg.version} */\n`;
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-admin",
-  "version": "13.10.0",
+  "version": "14.0.0",
   "description": "Firebase admin SDK for Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",

package.json

@@ -253,7 +253,7 @@ export function initializeApp(options?: AppOptions, appName: string = DEFAULT_AP
 
 /**
  * Returns an existing {@link App} instance for the provided name. If no name
- * is provided the the default app name is used.
+ * is provided the default app name is used.
  *
  * @param appName - Optional name of the `App` instance.
  *

src/app/lifecycle.ts

@@ -35,6 +35,12 @@ https://firebase.google.com/docs/web/setup
   console.error(message);
 }
 
+/**
+ * Firebase App and SDK initialization.
+ *
+ * @packageDocumentation
+ */
+
 export { App, AppOptions, FirebaseArrayIndexError } from './app/core';
 export { initializeApp, getApp, getApps, deleteApp } from './app/lifecycle';
 

src/index.ts

@@ -252,11 +252,9 @@ export class Messaging {
         if (sessionErrors.length > 0) {
           // Combine the original stream error and all session errors
           const allErrors = [result.reason, ...sessionErrors];
-          // TODO: AggregateError is supported in Node 18+ but only included in the ES2021+ 
-          // We use (global as any).AggregateError as a workaround to access it in ES2020.
-          const cause = new (global as any).AggregateError(allErrors, 'Stream failure and session failures occurred');
+          const cause = new AggregateError(allErrors, 'Stream failure and session failures occurred');
 
-          const streamMessage = result.reason.message || 'Unknown stream error';
+          const streamMessage = result.reason?.message || 'Unknown stream error';
           const sessionMessage = `. Session failures: ${sessionErrors.map(e => e.message).join(', ')}`;
 
           error = new FirebaseMessagingError({

src/messaging/messaging.ts

@@ -1375,7 +1375,7 @@ export class Http2SessionHandler {
       this.http2Session.on('error', (error: any) => {
         const codePart = error?.code ? `${error.code} - ` : '';
         let errorMessage: string;
-        if (error?.name === 'AggregateError' && Array.isArray(error.errors)) {
+        if ((error instanceof AggregateError || error?.name === 'AggregateError') && Array.isArray(error.errors)) {
           errorMessage = `Session error while making requests: ${codePart}${error.name}: ` +
             `[${error.errors.map((e: any) => e.message).join(', ')}]`;
         } else {

src/utils/api-request.ts

@@ -2,9 +2,9 @@
   "compilerOptions": {
     "module": "commonjs",
     "moduleResolution": "node",
-    "target": "es2020",
+    "target": "es2021",
     "noImplicitAny": false,
-    "lib": ["es2020"],
+    "lib": ["es2021"],
     "outDir": "lib",
     "typeRoots": [
       "node_modules/@types"

test/integration/postcheck/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2020",
+    "target": "es2021",
     "declaration": true,
     "sourceMap": true,
     "noImplicitAny": true,
@@ -13,7 +13,7 @@
     "strictNullChecks": true,
     "strictFunctionTypes": true,
     //"strictPropertyInitialization": true,
-    "lib": ["es2020"],
+    "lib": ["es2021"],
     "outDir": "lib",
     "stripInternal": true,
     "rootDir": "."