Tested deleteOnDeref, added more comments

Author: DellaBitta

packages/app/src/api.ts

@@ -248,14 +248,14 @@ export function initializeServerApp(
 
   // Build an app name based on a hash of the configuration options.
   const nameObj = {
-    _serverAppConfig,
+    ..._serverAppConfig,
     ...appOptions
   };
 
   // However, Do not mangle the name based on releaseOnDeref, since it will vary between the
   // construction of FirebaseServerApp instances. For example, if the object is the request headers.
-  if (nameObj._serverAppConfig.releaseOnDeref !== undefined) {
-    delete nameObj._serverAppConfig.releaseOnDeref;
+  if (nameObj.releaseOnDeref !== undefined) {
+    delete nameObj.releaseOnDeref;
   }
 
   const hashCode = (s: string): number => {

packages/app/src/firebaseServerApp.ts

@@ -66,22 +66,25 @@ export class FirebaseServerAppImpl
       ...serverConfig
     };
 
-    this._finalizationRegistry = new FinalizationRegistry(
-      this.automaticCleanup
-    );
+    this._finalizationRegistry = new FinalizationRegistry(() => {
+      this.automaticCleanup();
+    });
 
     this._refCount = 0;
     this.incRefCount(this._serverConfig.releaseOnDeref);
 
     // Do not retain a hard reference to the dref object, otherwise the FinalizationRegisry
     // will never trigger.
     this._serverConfig.releaseOnDeref = undefined;
+    serverConfig.releaseOnDeref = undefined;
   }
 
   get refCount(): number {
     return this._refCount;
   }
 
+  // Increment the reference count of this server app. If an object is provided, register it
+  // with the finalization registry.
   incRefCount(obj: object | undefined): void {
     if (this.isDeleted) {
       return;
@@ -92,15 +95,19 @@ export class FirebaseServerAppImpl
     }
   }
 
+  // Decrement the reference count.
   decRefCount(): number {
     if (this.isDeleted) {
       return 0;
     }
     return --this._refCount;
   }
 
-  private automaticCleanup(serverApp: FirebaseServerAppImpl): void {
-    void deleteApp(serverApp);
+  // Invoked by the FinalizationRegistry callback to note that this app should go through its
+  // reference counts and delete itself if no reference count remain. The coordinating logic that
+  // handles this is in deleteApp(...).
+  private automaticCleanup(): void {
+    void deleteApp(this);
   }
 
   get settings(): FirebaseServerAppSettings {