more cleanup, and add eventId to each event

Author: dconeybe

packages/firestore/src/core/firestore_client.ts

@@ -232,7 +232,7 @@ export async function setOfflineComponentProvider(
   });
 
   offlineComponentProvider.persistence.setDatabaseDeletedListener(event => {
-    let error: FirestoreError | null;
+    let error: FirestoreError | undefined;
 
     if (event.type === 'ClearSiteDataDatabaseDeletedEvent') {
       // Throw FirestoreError rather than just Error so that the error will
@@ -248,7 +248,6 @@ export async function setOfflineComponentProvider(
       );
       logWarn(error.message, event.data);
     } else {
-      error = null;
       logWarn(
         `Terminating Firestore in response to "${event.type}" event`,
         event.data
@@ -260,13 +259,15 @@ export async function setOfflineComponentProvider(
       .then(() => {
         logDebug(
           `Terminating Firestore in response to "${event.type}" event ` +
-            'completed successfully'
+            'completed successfully',
+          event.data
         );
       })
       .catch(error => {
         logWarn(
           `Terminating Firestore in response to "${event.type}" event failed:`,
-          error
+          error,
+          event.data
         );
       });
 

packages/firestore/src/local/persistence.ts

@@ -111,6 +111,8 @@ export class VersionChangeDatabaseDeletedEvent {
 
   constructor(
     readonly data: {
+      /** A unique ID for this event. */
+      eventId: string;
       /**
        * The value of the "newVersion" property of the "versionchange" event
        * that triggered this event. Its value is _always_ `null`, but is kept
@@ -132,6 +134,8 @@ export class ClearSiteDataDatabaseDeletedEvent {
 
   constructor(
     readonly data: {
+      /** A unique ID for this event. */
+      eventId: string;
       /** The IndexedDB version that was last reported by the database. */
       lastClosedVersion: number;
       /**

packages/firestore/src/local/simple_db.ts

@@ -18,6 +18,7 @@
 import { getGlobal, getUA, isIndexedDBAvailable } from '@firebase/util';
 
 import { debugAssert } from '../util/assert';
+import { generateUniqueDebugId } from '../util/debug_uid';
 import { Code, FirestoreError } from '../util/error';
 import { logDebug, logError } from '../util/log';
 import { Deferred } from '../util/promise';
@@ -383,6 +384,7 @@ export class SimpleDb {
           ) {
             clearSiteDataEvent.push(
               new ClearSiteDataDatabaseDeletedEvent({
+                eventId: generateUniqueDebugId(),
                 lastClosedVersion: this.lastClosedDbVersion,
                 eventOldVersion: event.oldVersion,
                 eventNewVersion: event.newVersion,
@@ -424,6 +426,7 @@ export class SimpleDb {
         if (event.newVersion === null) {
           this.databaseDeletedListener?.(
             new VersionChangeDatabaseDeletedEvent({
+              eventId: generateUniqueDebugId(),
               eventNewVersion: event.newVersion
             })
           );