fix(firestore,windows): fix a crash happening when terminating the firestore instance (#18069)

Lyokone · web-flow · commit adef1872b523 · 2026-03-05T11:08:18.000+01:00
* fix(firestore,windows): fix a crash happening when terminating the firestore instance

* fix test

* fix cached instance in Dart

* fix
diff --git a/packages/cloud_firestore/cloud_firestore/example/integration_test/instance_e2e.dart b/packages/cloud_firestore/cloud_firestore/example/integration_test/instance_e2e.dart
@@ -148,7 +148,43 @@ void runInstanceTests() {
           await firestore.terminate();
           await firestore.clearPersistence();
         },
-        skip: kIsWeb || defaultTargetPlatform == TargetPlatform.windows,
+        skip: kIsWeb,
+      );
+
+      test(
+        'terminate() then use Firestore again',
+        () async {
+          // Regression test for https://github.com/firebase/flutterfire/issues/17781
+          // On Windows, terminate() did not remove the instance from the native
+          // cache, so subsequent usage would crash with "The client has already
+          // been terminated".
+          final instance = FirebaseFirestore.instanceFor(
+            app: Firebase.app(),
+            databaseId: 'flutterfire-2',
+          );
+
+          instance.useFirestoreEmulator('localhost', 8080);
+
+          // Use Firestore so it is fully initialized
+          await instance.collection('flutterfire-2').doc('terminate-test').set(
+            {'foo': 'bar'},
+          );
+
+          await instance.terminate();
+          await instance.clearPersistence();
+
+          // After terminate + clearPersistence, we should be able to use
+          // Firestore again without crashing.
+          await instance
+              .collection('flutterfire-2')
+              .doc('terminate-test')
+              .get();
+
+          // Clean up: terminate so the native instance cache is cleared
+          // for subsequent tests that may use the same databaseId.
+          await instance.terminate();
+        },
+        skip: kIsWeb,
       );
 
       test(
diff --git a/packages/cloud_firestore/cloud_firestore/windows/cloud_firestore_plugin.cpp b/packages/cloud_firestore/cloud_firestore/windows/cloud_firestore_plugin.cpp
@@ -706,10 +706,12 @@ void CloudFirestorePlugin::EnableNetwork(
 void CloudFirestorePlugin::Terminate(
     const FirestorePigeonFirebaseApp& app,
     std::function<void(std::optional<FlutterError> reply)> result) {
+  std::string cacheKey = app.app_name() + "-" + app.database_u_r_l();
   Firestore* firestore = GetFirestoreFromPigeon(app);
   firestore->Terminate().OnCompletion(
-      [result](const Future<void>& completed_future) {
+      [result, cacheKey](const Future<void>& completed_future) {
         if (completed_future.error() == firebase::firestore::kErrorOk) {
+          CloudFirestorePlugin::firestoreInstances_.erase(cacheKey);
           result(std::nullopt);
         } else {
           result(CloudFirestorePlugin::ParseError(completed_future));
