@react-native-firebase/database 26.0.0 → 26.1.0

package/ios/RNFBDatabase/RNFBDatabaseTransactionHelper.h

@@ -0,0 +1,38 @@
+/**
+ * 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>
+
+// See RNFBDatabaseModuleHelper.h for rationale: plain Objective-C helper
+// that owns all `FIRDatabaseReference`/`FIRTransactionResult` calls and the
+// pending-transaction bookkeeping for RNFBDatabaseTransactionModule.
+@interface RNFBDatabaseTransactionHelper : NSObject
+
++ (void)transactionStart:(NSString *)app
+                   dbURL:(NSString *)dbURL
+                    path:(NSString *)path
+           transactionId:(double)transactionId
+            applyLocally:(BOOL)applyLocally;
+
++ (void)transactionTryCommit:(NSString *)app
+                       dbURL:(NSString *)dbURL
+               transactionId:(double)transactionId
+                     updates:(NSDictionary *)updates;
+
++ (void)invalidate;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseTransactionHelper.m

@@ -0,0 +1,173 @@
+/**
+ * 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 "RNFBApp/RNFBSharedUtils.h"
+#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseTransactionHelper.h"
+#import "RNFBRCTEventEmitter.h"
+
+static __strong NSMutableDictionary *transactions;
+static NSString *const RNFB_DATABASE_TRANSACTION_EVENT = @"database_transaction_event";
+
+@implementation RNFBDatabaseTransactionHelper
+
++ (dispatch_queue_t)transactionQueue {
+  static dispatch_once_t once;
+  static dispatch_queue_t sharedInstance;
+  dispatch_once(&once, ^{
+    transactions = [[NSMutableDictionary alloc] init];
+    sharedInstance = dispatch_queue_create(
+        "io.invertase.react-native-firebase.database.transactions", DISPATCH_QUEUE_CONCURRENT);
+  });
+  return sharedInstance;
+}
+
++ (void)invalidate {
+  dispatch_queue_t queue = [self transactionQueue];
+  dispatch_sync(queue, ^{
+    for (NSString *key in [transactions allKeys]) {
+      NSMutableDictionary *transactionState = transactions[key];
+      [transactionState setValue:@true forKey:@"abort"];
+      dispatch_semaphore_t sema = [transactionState valueForKey:@"semaphore"];
+      if (sema) {
+        dispatch_semaphore_signal(sema);
+      }
+      [transactions removeObjectForKey:key];
+    }
+  });
+}
+
++ (void)transactionStart:(NSString *)app
+                   dbURL:(NSString *)dbURL
+                    path:(NSString *)path
+           transactionId:(double)transactionId
+            applyLocally:(BOOL)applyLocally {
+  dispatch_queue_t queue = [self transactionQueue];
+  dispatch_async(queue, ^{
+    NSMutableDictionary *transactionState = [NSMutableDictionary new];
+    dispatch_semaphore_t sema = dispatch_semaphore_create(0);
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "err_typecheck_convert_incompatible"
+    transactionState[@"semaphore"] = sema;
+#pragma clang diagnostic pop
+    FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+    FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+    FIRDatabaseReference *firDatabaseReference =
+        [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+    id runTransactionBlock = ^FIRTransactionResult *(FIRMutableData *currentData) {
+      dispatch_barrier_async(queue, ^{
+        [transactions setValue:transactionState forKey:[@(transactionId) stringValue]];
+
+        [[RNFBRCTEventEmitter shared]
+            sendEventWithName:RNFB_DATABASE_TRANSACTION_EVENT
+                         body:@{
+                           @"appName" : [RNFBSharedUtils getAppJavaScriptName:firDatabase.app.name],
+                           @"id" : @(transactionId),
+                           @"body" : @{
+                             @"type" : @"update",
+                             @"value" : currentData.value,
+                           }
+                         }];
+      });
+
+      dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC);
+      BOOL timedout = dispatch_semaphore_wait(sema, delayTime) != 0;
+
+      BOOL abort = [transactionState valueForKey:@"abort"] || timedout;
+      id value = [transactionState valueForKey:@"value"];
+
+      dispatch_barrier_async(queue, ^{
+        [transactions removeObjectForKey:[@(transactionId) stringValue]];
+      });
+
+      if (abort) {
+        return [FIRTransactionResult abort];
+      }
+
+      currentData.value = value;
+      return [FIRTransactionResult successWithValue:currentData];
+    };
+
+    id andCompletionBlock = ^(NSError *error, BOOL committed, FIRDataSnapshot *dataSnapshot) {
+      NSMutableDictionary *resultMap = [NSMutableDictionary dictionary];
+      resultMap[@"committed"] = @(committed);
+
+      if (error != nil) {
+        NSArray *codeAndMessage = [RNFBDatabaseCommon getCodeAndMessage:error];
+        resultMap[@"type"] = @"error";
+        resultMap[@"error"] = @{
+          @"code" : codeAndMessage[0],
+          @"message" : codeAndMessage[1],
+        };
+      } else {
+        resultMap[@"type"] = @"complete";
+        resultMap[@"snapshot"] = [RNFBDatabaseCommon snapshotToDictionary:dataSnapshot];
+      }
+
+      [[RNFBRCTEventEmitter shared]
+          sendEventWithName:RNFB_DATABASE_TRANSACTION_EVENT
+                       body:@{
+                         @"id" : @(transactionId),
+                         @"appName" : [RNFBSharedUtils getAppJavaScriptName:firDatabase.app.name],
+                         @"body" : resultMap,
+                       }];
+    };
+
+    [firDatabaseReference runTransactionBlock:runTransactionBlock
+                           andCompletionBlock:andCompletionBlock
+                              withLocalEvents:applyLocally];
+  });
+}
+
++ (void)transactionTryCommit:(NSString *)app
+                       dbURL:(NSString *)dbURL
+               transactionId:(double)transactionId
+                     updates:(NSDictionary *)updates {
+  dispatch_queue_t queue = [self transactionQueue];
+  __block NSMutableDictionary *transactionState;
+
+  dispatch_sync(queue, ^{
+    transactionState = transactions[[@(transactionId) stringValue]];
+  });
+
+  if (!transactionState) {
+    NSLog(@"tryCommitTransaction for unknown ID %@", @(transactionId));
+    return;
+  }
+
+  BOOL abort = [[updates valueForKey:@"abort"] boolValue];
+
+  if (abort) {
+    [transactionState setValue:@true forKey:@"abort"];
+  } else {
+    id newValue = [updates valueForKey:@"value"];
+    [transactionState setValue:newValue forKey:@"value"];
+  }
+
+  dispatch_semaphore_signal([transactionState valueForKey:@"semaphore"]);
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseTransactionModule.h

@@ -20,5 +20,4 @@
 #import <React/RCTBridgeModule.h>
 
 @interface RNFBDatabaseTransactionModule : NSObject <RCTBridgeModule>
-@property dispatch_queue_t transactionQueue;
 @end

package/ios/RNFBDatabase/RNFBDatabaseTransactionModule.mm

@@ -15,18 +15,17 @@
  *
  */
 
-#import <Firebase/Firebase.h>
 #import <React/RCTUtils.h>
 
-#import "RNFBApp/RCTConvert+FIRApp.h"
-#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseQueue.h"
+#import "RNFBDatabaseTransactionHelper.h"
 #import "RNFBDatabaseTransactionModule.h"
 #import "RNFBDatabaseTurboModules.h"
-#import "RNFBRCTEventEmitter.h"
-#import "RNFBSharedUtils.h"
 
-static __strong NSMutableDictionary *transactions;
-static NSString *const RNFB_DATABASE_TRANSACTION_EVENT = @"database_transaction_event";
+// NOTE: This module deliberately never imports Firebase Database headers.
+// See RNFBDatabaseModule.mm for rationale. All Firebase Database calls, and
+// the pending-transaction dispatch queue/bookkeeping, live in the plain
+// Objective-C `RNFBDatabaseTransactionHelper`.
 
 @interface RNFBDatabaseTransactionModule () <NativeRNFBTurboDatabaseTransactionSpec,
                                              RCTBridgeModule>
@@ -48,19 +47,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseTransaction);
 }
 
 - (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
-}
-
-- (id)init {
-  if (self = [super init]) {
-    transactions = [[NSMutableDictionary alloc] init];
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "BridgeCastIssues"
-    _transactionQueue = dispatch_queue_create(
-        "io.invertase.react-native-firebase.database.transactions", DISPATCH_QUEUE_CONCURRENT);
-#pragma clang diagnostic pop
-  }
-  return self;
+  return [RNFBDatabaseQueue getDispatchQueue];
 }
 
 - (void)dealloc {
@@ -68,17 +55,7 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseTransaction);
 }
 
 - (void)invalidate {
-  dispatch_sync(_transactionQueue, ^{
-    for (NSString *key in [transactions allKeys]) {
-      NSMutableDictionary *transactionState = transactions[key];
-      [transactionState setValue:@true forKey:@"abort"];
-      dispatch_semaphore_t sema = [transactionState valueForKey:@"semaphore"];
-      if (sema) {
-        dispatch_semaphore_signal(sema);
-      }
-      [transactions removeObjectForKey:key];
-    }
-  });
+  [RNFBDatabaseTransactionHelper invalidate];
 }
 
 #pragma mark -
@@ -89,108 +66,21 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseTransaction);
                     path:(NSString *)path
            transactionId:(double)transactionId
             applyLocally:(BOOL)applyLocally {
-  dispatch_async(_transactionQueue, ^{
-    NSMutableDictionary *transactionState = [NSMutableDictionary new];
-    dispatch_semaphore_t sema = dispatch_semaphore_create(0);
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "err_typecheck_convert_incompatible"
-    transactionState[@"semaphore"] = sema;
-#pragma clang diagnostic pop
-    FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
-    FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
-    FIRDatabaseReference *firDatabaseReference =
-        [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
-
-    id runTransactionBlock = ^FIRTransactionResult *(FIRMutableData *currentData) {
-      dispatch_barrier_async(self->_transactionQueue, ^{
-        [transactions setValue:transactionState forKey:[@(transactionId) stringValue]];
-
-        [[RNFBRCTEventEmitter shared]
-            sendEventWithName:RNFB_DATABASE_TRANSACTION_EVENT
-                         body:@{
-                           @"appName" : [RNFBSharedUtils getAppJavaScriptName:firDatabase.app.name],
-                           @"id" : @(transactionId),
-                           @"body" : @{
-                             @"type" : @"update",
-                             @"value" : currentData.value,
-                           }
-                         }];
-      });
-
-      dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, 30 * NSEC_PER_SEC);
-      BOOL timedout = dispatch_semaphore_wait(sema, delayTime) != 0;
-
-      BOOL abort = [transactionState valueForKey:@"abort"] || timedout;
-      id value = [transactionState valueForKey:@"value"];
-
-      dispatch_barrier_async(self->_transactionQueue, ^{
-        [transactions removeObjectForKey:[@(transactionId) stringValue]];
-      });
-
-      if (abort) {
-        return [FIRTransactionResult abort];
-      }
-
-      currentData.value = value;
-      return [FIRTransactionResult successWithValue:currentData];
-    };
-
-    id andCompletionBlock = ^(NSError *error, BOOL committed, FIRDataSnapshot *dataSnapshot) {
-      NSMutableDictionary *resultMap = [NSMutableDictionary dictionary];
-      resultMap[@"committed"] = @(committed);
-
-      if (error != nil) {
-        NSArray *codeAndMessage = [RNFBDatabaseCommon getCodeAndMessage:error];
-        resultMap[@"type"] = @"error";
-        resultMap[@"error"] = @{
-          @"code" : codeAndMessage[0],
-          @"message" : codeAndMessage[1],
-        };
-      } else {
-        resultMap[@"type"] = @"complete";
-        resultMap[@"snapshot"] = [RNFBDatabaseCommon snapshotToDictionary:dataSnapshot];
-      }
-
-      [[RNFBRCTEventEmitter shared]
-          sendEventWithName:RNFB_DATABASE_TRANSACTION_EVENT
-                       body:@{
-                         @"id" : @(transactionId),
-                         @"appName" : [RNFBSharedUtils getAppJavaScriptName:firDatabase.app.name],
-                         @"body" : resultMap,
-                       }];
-    };
-
-    [firDatabaseReference runTransactionBlock:runTransactionBlock
-                           andCompletionBlock:andCompletionBlock
-                              withLocalEvents:applyLocally];
-  });
+  [RNFBDatabaseTransactionHelper transactionStart:app
+                                            dbURL:dbURL
+                                             path:path
+                                    transactionId:transactionId
+                                     applyLocally:applyLocally];
 }
 
 - (void)transactionTryCommit:(NSString *)app
                        dbURL:(NSString *)dbURL
                transactionId:(double)transactionId
                      updates:(NSDictionary *)updates {
-  __block NSMutableDictionary *transactionState;
-
-  dispatch_sync(_transactionQueue, ^{
-    transactionState = transactions[[@(transactionId) stringValue]];
-  });
-
-  if (!transactionState) {
-    NSLog(@"tryCommitTransaction for unknown ID %@", @(transactionId));
-    return;
-  }
-
-  BOOL abort = [[updates valueForKey:@"abort"] boolValue];
-
-  if (abort) {
-    [transactionState setValue:@true forKey:@"abort"];
-  } else {
-    id newValue = [updates valueForKey:@"value"];
-    [transactionState setValue:newValue forKey:@"value"];
-  }
-
-  dispatch_semaphore_signal([transactionState valueForKey:@"semaphore"]);
+  [RNFBDatabaseTransactionHelper transactionTryCommit:app
+                                                dbURL:dbURL
+                                        transactionId:transactionId
+                                              updates:updates];
 }
 
 @end

package/lib/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '26.0.0';
+export const version = '26.1.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/database",
-  "version": "26.0.0",
+  "version": "26.1.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The Firebase Realtime Database is a cloud-hosted database. Data is stored as JSON and synchronized in realtime to every connected client. React Native Firebase provides native integration with the Android & iOS Firebase SDKs, supporting both realtime data sync and offline capabilities.",
   "main": "./dist/module/index.js",
@@ -47,10 +47,10 @@
     "realtome database"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "26.0.0"
+    "@react-native-firebase/app": "26.1.0"
   },
   "devDependencies": {
-    "@react-native-firebase/app": "26.0.0",
+    "@react-native-firebase/app": "26.1.0",
     "react-native-builder-bob": "^0.41.0"
   },
   "publishConfig": {
@@ -88,5 +88,5 @@
     "node_modules/",
     "dist/"
   ],
-  "gitHead": "2a360acb2aebdd39dd40e31be386b30697270626"
+  "gitHead": "59d053eca14ab8aa80e5ac76887014925c67e52b"
 }