@react-native-firebase/database 25.1.0 → 26.1.0

package/ios/RNFBDatabase/{RNFBDatabaseOnDisconnectModule.m → RNFBDatabaseOnDisconnectHelper.m}

@@ -15,31 +15,25 @@
  *
  */
 
+#if __has_include(<Firebase/Firebase.h>)
 #import <Firebase/Firebase.h>
-#import <React/RCTUtils.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
 
+#import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBDatabaseCommon.h"
-#import "RNFBDatabaseOnDisconnectModule.h"
+#import "RNFBDatabaseOnDisconnectHelper.h"
 
-@implementation RNFBDatabaseOnDisconnectModule
-#pragma mark -
-#pragma mark Module Setup
+@implementation RNFBDatabaseOnDisconnectHelper
 
-RCT_EXPORT_MODULE();
-
-- (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
-}
-
-#pragma mark -
-#pragma mark Firebase Database
-
-RCT_EXPORT_METHOD(onDisconnectCancel
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)onDisconnectCancel:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -54,12 +48,12 @@ RCT_EXPORT_METHOD(onDisconnectCancel
       }];
 }
 
-RCT_EXPORT_METHOD(onDisconnectRemove
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)onDisconnectRemove:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -74,13 +68,13 @@ RCT_EXPORT_METHOD(onDisconnectRemove
       }];
 }
 
-RCT_EXPORT_METHOD(onDisconnectSet
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (NSDictionary *)props
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)onDisconnectSet:(NSString *)app
+                  dbURL:(NSString *)dbURL
+                   path:(NSString *)path
+                  props:(NSDictionary *)props
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -95,13 +89,13 @@ RCT_EXPORT_METHOD(onDisconnectSet
                          }];
 }
 
-RCT_EXPORT_METHOD(onDisconnectSetWithPriority
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (NSDictionary *)props
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)onDisconnectSetWithPriority:(NSString *)app
+                              dbURL:(NSString *)dbURL
+                               path:(NSString *)path
+                              props:(NSDictionary *)props
+                            resolve:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -117,13 +111,13 @@ RCT_EXPORT_METHOD(onDisconnectSetWithPriority
                          }];
 }
 
-RCT_EXPORT_METHOD(onDisconnectUpdate
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (NSDictionary *)props
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)onDisconnectUpdate:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                     props:(NSDictionary *)props
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];

package/ios/RNFBDatabase/RNFBDatabaseOnDisconnectModule.mm

@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <React/RCTUtils.h>
+
+#import "RNFBDatabaseOnDisconnectHelper.h"
+#import "RNFBDatabaseOnDisconnectModule.h"
+#import "RNFBDatabaseQueue.h"
+#import "RNFBDatabaseTurboModules.h"
+
+// NOTE: This module deliberately never imports Firebase Database headers.
+// See RNFBDatabaseModule.mm for rationale. All Firebase Database calls are
+// delegated to the plain Objective-C `RNFBDatabaseOnDisconnectHelper`.
+
+@interface RNFBDatabaseOnDisconnectModule () <NativeRNFBTurboDatabaseOnDisconnectSpec,
+                                              RCTBridgeModule>
+@end
+
+@implementation RNFBDatabaseOnDisconnectModule
+#pragma mark -
+#pragma mark Module Setup
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeRNFBTurboDatabaseOnDisconnectSpecJSI>(params);
+}
+
+RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseOnDisconnect);
+
++ (BOOL)requiresMainQueueSetup {
+  return NO;
+}
+
+- (dispatch_queue_t)methodQueue {
+  return [RNFBDatabaseQueue getDispatchQueue];
+}
+
+#pragma mark -
+#pragma mark Firebase Database
+
+- (void)onDisconnectCancel:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseOnDisconnectHelper onDisconnectCancel:app
+                                               dbURL:dbURL
+                                                path:path
+                                             resolve:resolve
+                                              reject:reject];
+}
+
+- (void)onDisconnectRemove:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseOnDisconnectHelper onDisconnectRemove:app
+                                               dbURL:dbURL
+                                                path:path
+                                             resolve:resolve
+                                              reject:reject];
+}
+
+- (void)onDisconnectSet:(NSString *)app
+                  dbURL:(NSString *)dbURL
+                   path:(NSString *)path
+                  props:(NSDictionary *)props
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseOnDisconnectHelper onDisconnectSet:app
+                                            dbURL:dbURL
+                                             path:path
+                                            props:props
+                                          resolve:resolve
+                                           reject:reject];
+}
+
+- (void)onDisconnectSetWithPriority:(NSString *)app
+                              dbURL:(NSString *)dbURL
+                               path:(NSString *)path
+                              props:(NSDictionary *)props
+                            resolve:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseOnDisconnectHelper onDisconnectSetWithPriority:app
+                                                        dbURL:dbURL
+                                                         path:path
+                                                        props:props
+                                                      resolve:resolve
+                                                       reject:reject];
+}
+
+- (void)onDisconnectUpdate:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                     props:(NSDictionary *)props
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseOnDisconnectHelper onDisconnectUpdate:app
+                                               dbURL:dbURL
+                                                path:path
+                                               props:props
+                                             resolve:resolve
+                                              reject:reject];
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseQuery.h

@@ -15,7 +15,18 @@
  *
  */
 
+#if __has_include(<Firebase/Firebase.h>)
 #import <Firebase/Firebase.h>
+#elif __has_include(<FirebaseDatabase/FirebaseDatabase-Swift.h>)
+// SPM: the declared product is the thin Swift wrapper `FirebaseDatabase`
+// (which depends on `FirebaseDatabaseInternal`, not exposed to us directly).
+// Its generated ObjC interface header is what's importable here.
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseDatabase/FirebaseDatabase-Swift.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
 #import <React/RCTBridgeModule.h>
 
 @interface RNFBDatabaseQuery : NSObject

package/ios/RNFBDatabase/RNFBDatabaseQueryHelper.h

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+// See RNFBDatabaseModuleHelper.h for rationale: plain Objective-C helper
+// that owns all `FIRDatabaseQuery`/`FIRDataSnapshot` calls and the query
+// listener bookkeeping for RNFBDatabaseQueryModule.
+@interface RNFBDatabaseQueryHelper : NSObject
+
++ (void)once:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+    eventType:(NSString *)eventType
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject;
+
++ (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props;
+
++ (void)off:(NSString *)queryKey eventRegistrationKey:(NSString *)eventRegistrationKey;
+
++ (void)keepSynced:(NSString *)app
+             dbURL:(NSString *)dbURL
+               key:(NSString *)key
+              path:(NSString *)path
+         modifiers:(NSArray *)modifiers
+           enabled:(BOOL)value
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject;
+
++ (void)invalidate;
+
+@end

package/ios/RNFBDatabase/{RNFBDatabaseQueryModule.m → RNFBDatabaseQueryHelper.m}

@@ -15,57 +15,52 @@
  *
  */
 
-#import <React/RCTUtils.h>
-
+#if __has_include(<Firebase/Firebase.h>)
+#import <Firebase/Firebase.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
+
+#import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBDatabaseCommon.h"
 #import "RNFBDatabaseQuery.h"
-#import "RNFBDatabaseQueryModule.h"
+#import "RNFBDatabaseQueryHelper.h"
 #import "RNFBRCTEventEmitter.h"
 
 static __strong NSMutableDictionary *queryDictionary;
 static NSString *const RNFB_DATABASE_SYNC = @"database_sync_event";
 
-@implementation RNFBDatabaseQueryModule
-#pragma mark -
-#pragma mark Module Setup
-
-RCT_EXPORT_MODULE();
-
-- (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
-}
+@implementation RNFBDatabaseQueryHelper
 
-- (id)init {
-  self = [super init];
++ (NSMutableDictionary *)queryDictionary {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     queryDictionary = [[NSMutableDictionary alloc] init];
   });
-  return self;
+  return queryDictionary;
 }
 
-- (void)dealloc {
-  [self invalidate];
-}
-
-- (void)invalidate {
-  NSArray *queryKeys = [queryDictionary allKeys];
++ (void)invalidate {
+  NSMutableDictionary *queries = [self queryDictionary];
+  NSArray *queryKeys = [queries allKeys];
   for (NSString *key in queryKeys) {
-    RNFBDatabaseQuery *query = queryDictionary[key];
+    RNFBDatabaseQuery *query = queries[key];
     [query removeAllEventListeners];
-    [queryDictionary removeObjectForKey:key];
+    [queries removeObjectForKey:key];
   }
 }
 
-- (RNFBDatabaseQuery *)getDatabaseQueryInstance:(FIRDatabaseReference *)reference
++ (RNFBDatabaseQuery *)getDatabaseQueryInstance:(FIRDatabaseReference *)reference
                                       modifiers:(NSArray *)modifiers {
   return [[RNFBDatabaseQuery alloc] initWithReferenceAndModifiers:reference modifiers:modifiers];
 }
 
-- (RNFBDatabaseQuery *)getDatabaseQueryInstance:(NSString *)key
++ (RNFBDatabaseQuery *)getDatabaseQueryInstance:(NSString *)key
                                       reference:(FIRDatabaseReference *)reference
                                       modifiers:(NSArray *)modifiers {
-  RNFBDatabaseQuery *cachedQuery = queryDictionary[key];
+  NSMutableDictionary *queries = [self queryDictionary];
+  RNFBDatabaseQuery *cachedQuery = queries[key];
 
   if (cachedQuery != nil) {
     return cachedQuery;
@@ -74,18 +69,17 @@ RCT_EXPORT_MODULE();
   RNFBDatabaseQuery *query = [[RNFBDatabaseQuery alloc] initWithReferenceAndModifiers:reference
                                                                             modifiers:modifiers];
 
-  queryDictionary[key] = query;
+  queries[key] = query;
   return query;
 }
 
-- (void)addOnceEventListener:(RNFBDatabaseQuery *)databaseQuery
++ (void)addOnceEventListener:(RNFBDatabaseQuery *)databaseQuery
                    eventType:(NSString *)eventType
                      resolve:(RCTPromiseResolveBlock)resolve
                       reject:(RCTPromiseRejectBlock)reject {
   FIRDataEventType firDataEventType =
       (FIRDataEventType)[RNFBDatabaseCommon getEventTypeFromName:eventType];
 
-  // On success
   id andPreviousSiblingKeyWithBlock =
       ^(FIRDataSnapshot *_Nonnull dataSnapshot, NSString *_Nullable previousChildName) {
         NSDictionary *data;
@@ -98,7 +92,6 @@ RCT_EXPORT_MODULE();
         resolve(data);
       };
 
-  // On error
   id errorBlock = ^(NSError *_Nonnull error) {
     [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
   };
@@ -108,36 +101,7 @@ RCT_EXPORT_MODULE();
                                 withCancelBlock:errorBlock];
 }
 
-- (void)addEventListener:(RNFBDatabaseQuery *)databaseQuery
-               eventType:(NSString *)eventType
-            registration:(NSDictionary *)registration {
-  NSString *eventRegistrationKey = registration[@"eventRegistrationKey"];
-
-  if (![databaseQuery hasEventListener:eventRegistrationKey]) {
-    id andPreviousSiblingKeyWithBlock =
-        ^(FIRDataSnapshot *_Nonnull dataSnapshot, NSString *_Nullable previousChildName) {
-          [self handleDatabaseEvent:eventRegistrationKey
-                          eventType:eventType
-                       registration:registration
-                           snapshot:dataSnapshot
-                  previousChildName:previousChildName];
-        };
-
-    id errorBlock = ^(NSError *_Nonnull error) {
-      [databaseQuery removeEventListener:eventRegistrationKey];
-      [self handleDatabaseEventError:eventRegistrationKey registration:registration error:error];
-    };
-
-    FIRDataEventType firDataEventType =
-        (FIRDataEventType)[RNFBDatabaseCommon getEventTypeFromName:eventType];
-    FIRDatabaseHandle handle = [databaseQuery.query observeEventType:firDataEventType
-                                      andPreviousSiblingKeyWithBlock:andPreviousSiblingKeyWithBlock
-                                                     withCancelBlock:errorBlock];
-    [databaseQuery addEventListener:eventRegistrationKey handle:handle];
-  }
-}
-
-- (void)handleDatabaseEvent:(NSString *)key
++ (void)handleDatabaseEvent:(NSString *)key
                   eventType:(NSString *)eventType
                registration:(NSDictionary *)registration
                    snapshot:(FIRDataSnapshot *)dataSnapshot
@@ -161,7 +125,7 @@ RCT_EXPORT_MODULE();
                                              }];
 }
 
-- (void)handleDatabaseEventError:(NSString *)key
++ (void)handleDatabaseEventError:(NSString *)key
                     registration:(NSDictionary *)registration
                            error:(NSError *)error {
   NSArray *codeAndMessage = [RNFBDatabaseCommon getCodeAndMessage:error];
@@ -178,17 +142,43 @@ RCT_EXPORT_MODULE();
                                              }];
 }
 
-#pragma mark -
-#pragma mark Firebase Database
-
-RCT_EXPORT_METHOD(once
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)path
-                  : (NSArray *)modifiers
-                  : (NSString *)eventType
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)addEventListener:(RNFBDatabaseQuery *)databaseQuery
+               eventType:(NSString *)eventType
+            registration:(NSDictionary *)registration {
+  NSString *eventRegistrationKey = registration[@"eventRegistrationKey"];
+
+  if (![databaseQuery hasEventListener:eventRegistrationKey]) {
+    id andPreviousSiblingKeyWithBlock =
+        ^(FIRDataSnapshot *_Nonnull dataSnapshot, NSString *_Nullable previousChildName) {
+          [self handleDatabaseEvent:eventRegistrationKey
+                          eventType:eventType
+                       registration:registration
+                           snapshot:dataSnapshot
+                  previousChildName:previousChildName];
+        };
+
+    id errorBlock = ^(NSError *_Nonnull error) {
+      [databaseQuery removeEventListener:eventRegistrationKey];
+      [self handleDatabaseEventError:eventRegistrationKey registration:registration error:error];
+    };
+
+    FIRDataEventType firDataEventType =
+        (FIRDataEventType)[RNFBDatabaseCommon getEventTypeFromName:eventType];
+    FIRDatabaseHandle handle = [databaseQuery.query observeEventType:firDataEventType
+                                      andPreviousSiblingKeyWithBlock:andPreviousSiblingKeyWithBlock
+                                                     withCancelBlock:errorBlock];
+    [databaseQuery addEventListener:eventRegistrationKey handle:handle];
+  }
+}
+
++ (void)once:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+    eventType:(NSString *)eventType
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -198,13 +188,14 @@ RCT_EXPORT_METHOD(once
   [self addOnceEventListener:databaseQuery eventType:eventType resolve:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(on : (FIRApp *)firebaseApp : (NSString *)dbURL : (NSDictionary *)props) {
++ (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props {
   NSString *key = [props valueForKey:@"key"];
   NSString *path = [props valueForKey:@"path"];
   NSString *eventType = [props valueForKey:@"eventType"];
   NSArray *modifiers = [props valueForKey:@"modifiers"];
   NSDictionary *registration = [props valueForKey:@"registration"];
 
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:key firebaseDatabase:firDatabase path:path];
@@ -214,30 +205,29 @@ RCT_EXPORT_METHOD(on : (FIRApp *)firebaseApp : (NSString *)dbURL : (NSDictionary
   [self addEventListener:databaseQuery eventType:eventType registration:registration];
 }
 
-RCT_EXPORT_METHOD(off
-                  : (NSString *)queryKey eventRegistrationKey
-                  : (NSString *)eventRegistrationKey) {
-  RNFBDatabaseQuery *databaseQuery = queryDictionary[queryKey];
++ (void)off:(NSString *)queryKey eventRegistrationKey:(NSString *)eventRegistrationKey {
+  NSMutableDictionary *queries = [self queryDictionary];
+  RNFBDatabaseQuery *databaseQuery = queries[queryKey];
 
   if (databaseQuery != nil) {
     [databaseQuery removeEventListener:eventRegistrationKey];
 
     if (![databaseQuery hasListeners]) {
-      [queryDictionary removeObjectForKey:queryKey];
+      [queries removeObjectForKey:queryKey];
       [RNFBDatabaseCommon removeReferenceByKey:queryKey];
     }
   }
 }
 
-RCT_EXPORT_METHOD(keepSynced
-                  : (FIRApp *)firebaseApp
-                  : (NSString *)dbURL
-                  : (NSString *)key
-                  : (NSString *)path
-                  : (NSArray *)modifiers
-                  : (BOOL)value
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
++ (void)keepSynced:(NSString *)app
+             dbURL:(NSString *)dbURL
+               key:(NSString *)key
+              path:(NSString *)path
+         modifiers:(NSArray *)modifiers
+           enabled:(BOOL)value
+           resolve:(RCTPromiseResolveBlock)resolve
+            reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
   FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
@@ -247,8 +237,4 @@ RCT_EXPORT_METHOD(keepSynced
   resolve([NSNull null]);
 }
 
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
 @end

package/ios/RNFBDatabase/RNFBDatabaseQueryModule.h

@@ -15,9 +15,13 @@
  *
  */
 
-#import <Firebase/Firebase.h>
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 
+// NOTE: This header must stay Firebase-free. It is imported by
+// RNFBDatabaseQueryModule.mm, and `FirebaseDatabase` is a Swift-only SPM
+// product whose `@import` cannot be used from Objective-C++ (.mm) files
+// when C++ modules are disabled. See RNFBDatabaseModule.mm for details.
+
 @interface RNFBDatabaseQueryModule : NSObject <RCTBridgeModule>
 @end