Skip to content

Commit d76d2af

Browse files
committed
fix lint errors
1 parent afd769b commit d76d2af

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

packages/firestore/src/core/firestore_client.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,21 @@ export async function setOfflineComponentProvider(
231231
});
232232

233233
offlineComponentProvider.persistence.setDatabaseDeletedListener(() => {
234-
client.terminate();
234+
logWarn('Terminating Firestore due to IndexedDb database deletion');
235+
client
236+
.terminate()
237+
.then(() => {
238+
logDebug(
239+
'Terminating Firestore due to IndexedDb database deletion ' +
240+
'completed successfully'
241+
);
242+
})
243+
.catch(error => {
244+
logWarn(
245+
'Terminating Firestore due to IndexedDb database deletion failed',
246+
error
247+
);
248+
});
235249
});
236250

237251
client._offlineComponents = offlineComponentProvider;

packages/firestore/src/local/indexeddb_persistence.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import { BundleCache } from './bundle_cache';
3131
import { DocumentOverlayCache } from './document_overlay_cache';
3232
import { GlobalsCache } from './globals_cache';
3333
import { IndexManager } from './index_manager';
34-
import { DatabaseDeletedListener } from './persistence';
3534
import { IndexedDbBundleCache } from './indexeddb_bundle_cache';
3635
import { IndexedDbDocumentOverlayCache } from './indexeddb_document_overlay_cache';
3736
import { IndexedDbGlobalsCache } from './indexeddb_globals_cache';
@@ -59,7 +58,11 @@ import { IndexedDbTargetCache } from './indexeddb_target_cache';
5958
import { getStore, IndexedDbTransaction } from './indexeddb_transaction';
6059
import { LocalSerializer } from './local_serializer';
6160
import { LruParams } from './lru_garbage_collector';
62-
import { Persistence, PrimaryStateListener } from './persistence';
61+
import {
62+
DatabaseDeletedListener,
63+
Persistence,
64+
PrimaryStateListener
65+
} from './persistence';
6366
import { PersistencePromise } from './persistence_promise';
6467
import {
6568
PersistenceTransaction,

packages/firestore/src/local/simple_db.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import { getGlobal, getUA, isIndexedDBAvailable } from '@firebase/util';
1919

2020
import { debugAssert } from '../util/assert';
2121
import { Code, FirestoreError } from '../util/error';
22-
import { logDebug, logError } from '../util/log';
22+
import { logDebug, logError, logWarn } from '../util/log';
2323
import { Deferred } from '../util/promise';
2424

25-
import { PersistencePromise } from './persistence_promise';
2625
import { DatabaseDeletedListener } from './persistence';
26+
import { PersistencePromise } from './persistence_promise';
2727

2828
// References to `indexedDB` are guarded by SimpleDb.isAvailable() and getGlobal()
2929
/* eslint-disable no-restricted-globals */
@@ -399,6 +399,10 @@ export class SimpleDb {
399399
// Notify the listener if another tab attempted to delete the IndexedDb
400400
// database, such as by calling clearIndexedDbPersistence().
401401
if (event.newVersion === null) {
402+
logWarn(
403+
`Received "versionchange" event with newVersion===null; ` +
404+
'notifying the registered DatabaseDeletedListener, if any'
405+
);
402406
this.databaseDeletedListener?.();
403407
}
404408
},

packages/firestore/test/unit/specs/spec_test_runner.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,13 @@ abstract class TestRunner {
366366
triggerRemoteStoreUnlisten.bind(null, this.syncEngine);
367367

368368
this.persistence.setDatabaseDeletedListener(() => {
369-
this.shutdown();
369+
this.shutdown().catch(error => {
370+
console.warn(
371+
'WARNING: this.shutdown() failed in callback ' +
372+
'specified to persistence.setDatabaseDeletedListener',
373+
error
374+
);
375+
});
370376
});
371377

372378
this.started = true;

0 commit comments

Comments
 (0)