@react-native-firebase/database 26.0.0 → 26.2.0

package/ios/RNFBDatabase/RNFBDatabaseQueryModule.mm

@@ -17,15 +17,15 @@
 
 #import <React/RCTUtils.h>
 
-#import "RNFBApp/RCTConvert+FIRApp.h"
-#import "RNFBDatabaseCommon.h"
-#import "RNFBDatabaseQuery.h"
+#import "RNFBDatabaseQueryHelper.h"
 #import "RNFBDatabaseQueryModule.h"
+#import "RNFBDatabaseQueue.h"
 #import "RNFBDatabaseTurboModules.h"
-#import "RNFBRCTEventEmitter.h"
 
-static __strong NSMutableDictionary *queryDictionary;
-static NSString *const RNFB_DATABASE_SYNC = @"database_sync_event";
+// NOTE: This module deliberately never imports Firebase Database headers.
+// See RNFBDatabaseModule.mm for rationale. All Firebase Database calls and
+// query/listener bookkeeping live in the plain Objective-C
+// `RNFBDatabaseQueryHelper`.
 
 @interface RNFBDatabaseQueryModule () <NativeRNFBTurboDatabaseQuerySpec, RCTBridgeModule>
 @end
@@ -46,16 +46,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
 }
 
 - (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
-}
-
-- (id)init {
-  self = [super init];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    queryDictionary = [[NSMutableDictionary alloc] init];
-  });
-  return self;
+  return [RNFBDatabaseQueue getDispatchQueue];
 }
 
 - (void)dealloc {
@@ -63,131 +54,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
 }
 
 - (void)invalidate {
-  NSArray *queryKeys = [queryDictionary allKeys];
-  for (NSString *key in queryKeys) {
-    RNFBDatabaseQuery *query = queryDictionary[key];
-    [query removeAllEventListeners];
-    [queryDictionary removeObjectForKey:key];
-  }
-}
-
-- (RNFBDatabaseQuery *)getDatabaseQueryInstance:(FIRDatabaseReference *)reference
-                                      modifiers:(NSArray *)modifiers {
-  return [[RNFBDatabaseQuery alloc] initWithReferenceAndModifiers:reference modifiers:modifiers];
-}
-
-- (RNFBDatabaseQuery *)getDatabaseQueryInstance:(NSString *)key
-                                      reference:(FIRDatabaseReference *)reference
-                                      modifiers:(NSArray *)modifiers {
-  RNFBDatabaseQuery *cachedQuery = queryDictionary[key];
-
-  if (cachedQuery != nil) {
-    return cachedQuery;
-  }
-
-  RNFBDatabaseQuery *query = [[RNFBDatabaseQuery alloc] initWithReferenceAndModifiers:reference
-                                                                            modifiers:modifiers];
-
-  queryDictionary[key] = query;
-  return query;
-}
-
-- (void)addOnceEventListener:(RNFBDatabaseQuery *)databaseQuery
-                   eventType:(NSString *)eventType
-                     resolve:(RCTPromiseResolveBlock)resolve
-                      reject:(RCTPromiseRejectBlock)reject {
-  FIRDataEventType firDataEventType =
-      (FIRDataEventType)[RNFBDatabaseCommon getEventTypeFromName:eventType];
-
-  id andPreviousSiblingKeyWithBlock =
-      ^(FIRDataSnapshot *_Nonnull dataSnapshot, NSString *_Nullable previousChildName) {
-        NSDictionary *data;
-        if ([eventType isEqualToString:@"value"]) {
-          data = [RNFBDatabaseCommon snapshotToDictionary:dataSnapshot];
-        } else {
-          data = [RNFBDatabaseCommon snapshotWithPreviousChildToDictionary:dataSnapshot
-                                                         previousChildName:previousChildName];
-        }
-        resolve(data);
-      };
-
-  id errorBlock = ^(NSError *_Nonnull error) {
-    [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-  };
-
-  [databaseQuery.query observeSingleEventOfType:firDataEventType
-                 andPreviousSiblingKeyWithBlock:andPreviousSiblingKeyWithBlock
-                                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
-                  eventType:(NSString *)eventType
-               registration:(NSDictionary *)registration
-                   snapshot:(FIRDataSnapshot *)dataSnapshot
-          previousChildName:(NSString *)previousChildName {
-  NSDictionary *data;
-  if ([eventType isEqualToString:@"value"]) {
-    data = [RNFBDatabaseCommon snapshotToDictionary:dataSnapshot];
-  } else {
-    data = [RNFBDatabaseCommon snapshotWithPreviousChildToDictionary:dataSnapshot
-                                                   previousChildName:previousChildName];
-  }
-
-  [[RNFBRCTEventEmitter shared] sendEventWithName:RNFB_DATABASE_SYNC
-                                             body:@{
-                                               @"body" : @{
-                                                 @"data" : data,
-                                                 @"key" : key,
-                                                 @"eventType" : eventType,
-                                                 @"registration" : registration,
-                                               }
-                                             }];
-}
-
-- (void)handleDatabaseEventError:(NSString *)key
-                    registration:(NSDictionary *)registration
-                           error:(NSError *)error {
-  NSArray *codeAndMessage = [RNFBDatabaseCommon getCodeAndMessage:error];
-  [[RNFBRCTEventEmitter shared] sendEventWithName:RNFB_DATABASE_SYNC
-                                             body:@{
-                                               @"body" : @{
-                                                 @"key" : key,
-                                                 @"error" : @{
-                                                   @"code" : codeAndMessage[0],
-                                                   @"message" : codeAndMessage[1],
-                                                 },
-                                                 @"registration" : registration,
-                                               }
-                                             }];
+  [RNFBDatabaseQueryHelper invalidate];
 }
 
 #pragma mark -
@@ -200,44 +67,21 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
     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];
-  RNFBDatabaseQuery *databaseQuery = [self getDatabaseQueryInstance:firDatabaseReference
-                                                          modifiers:modifiers];
-
-  [self addOnceEventListener:databaseQuery eventType:eventType resolve:resolve reject:reject];
+  [RNFBDatabaseQueryHelper once:app
+                          dbURL:dbURL
+                           path:path
+                      modifiers:modifiers
+                      eventType:eventType
+                        resolve:resolve
+                         reject:reject];
 }
 
 - (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];
-  RNFBDatabaseQuery *databaseQuery = [self getDatabaseQueryInstance:key
-                                                          reference:firDatabaseReference
-                                                          modifiers:modifiers];
-  [self addEventListener:databaseQuery eventType:eventType registration:registration];
+  [RNFBDatabaseQueryHelper on:app dbURL:dbURL props:props];
 }
 
 - (void)off:(NSString *)queryKey eventRegistrationKey:(NSString *)eventRegistrationKey {
-  RNFBDatabaseQuery *databaseQuery = queryDictionary[queryKey];
-
-  if (databaseQuery != nil) {
-    [databaseQuery removeEventListener:eventRegistrationKey];
-
-    if (![databaseQuery hasListeners]) {
-      [queryDictionary removeObjectForKey:queryKey];
-      [RNFBDatabaseCommon removeReferenceByKey:queryKey];
-    }
-  }
+  [RNFBDatabaseQueryHelper off:queryKey eventRegistrationKey:eventRegistrationKey];
 }
 
 - (void)keepSynced:(NSString *)app
@@ -248,14 +92,14 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
            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];
-  RNFBDatabaseQuery *databaseQuery = [self getDatabaseQueryInstance:firDatabaseReference
-                                                          modifiers:modifiers];
-  [databaseQuery.query keepSynced:value];
-  resolve([NSNull null]);
+  [RNFBDatabaseQueryHelper keepSynced:app
+                                dbURL:dbURL
+                                  key:key
+                                 path:path
+                            modifiers:modifiers
+                              enabled:value
+                              resolve:resolve
+                               reject:reject];
 }
 
 @end

package/ios/RNFBDatabase/RNFBDatabaseQueue.h

@@ -0,0 +1,29 @@
+/**
+ * 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>
+
+// Deliberately Firebase-free: this header is imported by Objective-C++ (.mm)
+// modules that must not pull in any Firebase Database headers directly (see
+// RNFBDatabaseCommon.h for why). Keeping it isolated means the shared serial
+// queue used as `methodQueue` can be obtained without ever importing
+// Firebase from a .mm translation unit.
+@interface RNFBDatabaseQueue : NSObject
+
++ (dispatch_queue_t)getDispatchQueue;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseQueue.m

@@ -0,0 +1,31 @@
+/**
+ * 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 "RNFBDatabaseQueue.h"
+
+@implementation RNFBDatabaseQueue
+
++ (dispatch_queue_t)getDispatchQueue {
+  static dispatch_once_t once;
+  static dispatch_queue_t sharedInstance;
+  dispatch_once(&once, ^{
+    sharedInstance = dispatch_queue_create("io.invertase.firebase.database", DISPATCH_QUEUE_SERIAL);
+  });
+  return sharedInstance;
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseReferenceHelper.h

@@ -0,0 +1,59 @@
+/**
+ * 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 `FIRDatabaseReference` calls for RNFBDatabaseReferenceModule.
+@interface RNFBDatabaseReferenceHelper : NSObject
+
++ (void)set:(NSString *)app
+      dbURL:(NSString *)dbURL
+       path:(NSString *)path
+      props:(NSDictionary *)props
+    resolve:(RCTPromiseResolveBlock)resolve
+     reject:(RCTPromiseRejectBlock)reject;
+
++ (void)update:(NSString *)app
+         dbURL:(NSString *)dbURL
+          path:(NSString *)path
+         props:(NSDictionary *)props
+       resolve:(RCTPromiseResolveBlock)resolve
+        reject:(RCTPromiseRejectBlock)reject;
+
++ (void)setWithPriority:(NSString *)app
+                  dbURL:(NSString *)dbURL
+                   path:(NSString *)path
+                  props:(NSDictionary *)props
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject;
+
++ (void)remove:(NSString *)app
+         dbURL:(NSString *)dbURL
+          path:(NSString *)path
+       resolve:(RCTPromiseResolveBlock)resolve
+        reject:(RCTPromiseRejectBlock)reject;
+
++ (void)setPriority:(NSString *)app
+              dbURL:(NSString *)dbURL
+               path:(NSString *)path
+              props:(NSDictionary *)props
+            resolve:(RCTPromiseResolveBlock)resolve
+             reject:(RCTPromiseRejectBlock)reject;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseReferenceHelper.m

@@ -0,0 +1,136 @@
+/**
+ * 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.
+ *
+ */
+
+#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 "RNFBDatabaseReferenceHelper.h"
+
+@implementation RNFBDatabaseReferenceHelper
+
++ (void)set:(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];
+
+  [firDatabaseReference setValue:[props valueForKey:@"value"]
+             withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+               if (error != nil) {
+                 [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+               } else {
+                 resolve([NSNull null]);
+               }
+             }];
+}
+
++ (void)update:(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];
+
+  [firDatabaseReference updateChildValues:[props valueForKey:@"values"]
+                      withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                        if (error != nil) {
+                          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+                        } else {
+                          resolve([NSNull null]);
+                        }
+                      }];
+}
+
++ (void)setWithPriority:(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];
+
+  [firDatabaseReference setValue:[props valueForKey:@"value"]
+                     andPriority:[props valueForKey:@"priority"]
+             withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+               if (error != nil) {
+                 [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+               } else {
+                 resolve([NSNull null]);
+               }
+             }];
+}
+
++ (void)remove:(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];
+
+  [firDatabaseReference
+      removeValueWithCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+        if (error != nil) {
+          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+        } else {
+          resolve([NSNull null]);
+        }
+      }];
+}
+
++ (void)setPriority:(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];
+
+  [firDatabaseReference setPriority:[props valueForKey:@"priority"]
+                withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                  if (error != nil) {
+                    [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+                  } else {
+                    resolve([NSNull null]);
+                  }
+                }];
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseReferenceModule.mm

@@ -15,14 +15,17 @@
  *
  */
 
-#import <Firebase/Firebase.h>
 #import <React/RCTUtils.h>
 
-#import "RNFBApp/RCTConvert+FIRApp.h"
-#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseQueue.h"
+#import "RNFBDatabaseReferenceHelper.h"
 #import "RNFBDatabaseReferenceModule.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 `RNFBDatabaseReferenceHelper`.
+
 @interface RNFBDatabaseReferenceModule () <NativeRNFBTurboDatabaseReferenceSpec, RCTBridgeModule>
 @end
 
@@ -42,7 +45,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
 }
 
 - (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
+  return [RNFBDatabaseQueue getDispatchQueue];
 }
 
 - (void)dealloc {
@@ -61,19 +64,12 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
       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];
-
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
-             withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-               if (error != nil) {
-                 [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-               } else {
-                 resolve([NSNull null]);
-               }
-             }];
+  [RNFBDatabaseReferenceHelper set:app
+                             dbURL:dbURL
+                              path:path
+                             props:props
+                           resolve:resolve
+                            reject:reject];
 }
 
 - (void)update:(NSString *)app
@@ -82,19 +78,12 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
          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];
-
-  [firDatabaseReference updateChildValues:[props valueForKey:@"values"]
-                      withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-                        if (error != nil) {
-                          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-                        } else {
-                          resolve([NSNull null]);
-                        }
-                      }];
+  [RNFBDatabaseReferenceHelper update:app
+                                dbURL:dbURL
+                                 path:path
+                                props:props
+                              resolve:resolve
+                               reject:reject];
 }
 
 - (void)setWithPriority:(NSString *)app
@@ -103,20 +92,12 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
                   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];
-
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
-                     andPriority:[props valueForKey:@"priority"]
-             withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-               if (error != nil) {
-                 [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-               } else {
-                 resolve([NSNull null]);
-               }
-             }];
+  [RNFBDatabaseReferenceHelper setWithPriority:app
+                                         dbURL:dbURL
+                                          path:path
+                                         props:props
+                                       resolve:resolve
+                                        reject:reject];
 }
 
 - (void)remove:(NSString *)app
@@ -124,19 +105,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
           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];
-
-  [firDatabaseReference
-      removeValueWithCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-        if (error != nil) {
-          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-        } else {
-          resolve([NSNull null]);
-        }
-      }];
+  [RNFBDatabaseReferenceHelper remove:app dbURL:dbURL path:path resolve:resolve reject:reject];
 }
 
 - (void)setPriority:(NSString *)app
@@ -145,19 +114,12 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseReference);
               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];
-
-  [firDatabaseReference setPriority:[props valueForKey:@"priority"]
-                withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-                  if (error != nil) {
-                    [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-                  } else {
-                    resolve([NSNull null]);
-                  }
-                }];
+  [RNFBDatabaseReferenceHelper setPriority:app
+                                     dbURL:dbURL
+                                      path:path
+                                     props:props
+                                   resolve:resolve
+                                    reject:reject];
 }
 
 @end