@react-native-firebase/database 26.3.3 → 27.0.0

package/ios/RNFBDatabase/RNFBDatabaseQueryModule.mm

@@ -76,6 +76,20 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
                          reject:reject];
 }
 
+- (void)get:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseQueryHelper get:app
+                         dbURL:dbURL
+                          path:path
+                     modifiers:modifiers
+                       resolve:resolve
+                        reject:reject];
+}
+
 - (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props {
   [RNFBDatabaseQueryHelper on:app dbURL:dbURL props:props];
 }

package/ios/RNFBDatabase/RNFBDatabaseQueryRegistry.h

@@ -0,0 +1,37 @@
+/**
+ * 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>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Cached query map. Unique `put`; callers `take`, `takeIfIdle`, or `removeAll` then
+ * `removeAllEventListeners` outside the HandleMap lock. Stored values are expected to respond to
+ * `removeAllEventListeners` and `hasListeners`.
+ */
+@interface RNFBDatabaseQueryRegistry : NSObject
+
+- (BOOL)put:(id)key value:(id)value error:(NSError *_Nullable *_Nullable)error;
+- (nullable id)get:(id)key;
+- (nullable id)take:(id)key;
+- (nullable id)takeIfIdle:(id)key;
+- (void)removeAll;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNFBDatabase/RNFBDatabaseQueryRegistry.m

@@ -0,0 +1,79 @@
+/**
+ * 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 "RNFBDatabaseQueryRegistry.h"
+
+#if __has_include("RNFBHandleMap.h")
+#import "RNFBHandleMap.h"
+#else
+#import "RNFBApp/RNFBHandleMap.h"
+#endif
+
+#if __has_include(<RNFBDatabase/RNFBDatabase-Swift.h>)
+#import <RNFBDatabase/RNFBDatabase-Swift.h>
+#elif __has_include("RNFBDatabase-Swift.h")
+#import "RNFBDatabase-Swift.h"
+#elif __has_include("RNFBHandleMapStorage-Swift.inc")
+#import "RNFBHandleMapStorage-Swift.inc"
+#else
+#error "RNFBDatabaseQueryRegistryStorage Swift interface not found"
+#endif
+
+@interface RNFBDatabaseQueryRegistry ()
+@property(nonatomic, strong) RNFBDatabaseQueryRegistryStorage *storage;
+@end
+
+@implementation RNFBDatabaseQueryRegistry
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    _storage = [[RNFBDatabaseQueryRegistryStorage alloc] init];
+  }
+  return self;
+}
+
+- (BOOL)put:(id)key value:(id)value error:(NSError **)error {
+  if ([self.storage putIfAbsent:key value:value]) {
+    return YES;
+  }
+  if (error != nil) {
+    NSString *message = [NSString stringWithFormat:@"Handle id already registered: %@", key];
+    *error = [NSError errorWithDomain:RNFBHandleMapErrorDomain
+                                 code:RNFBHandleMapErrorCollision
+                             userInfo:@{NSLocalizedDescriptionKey : message}];
+  }
+  return NO;
+}
+
+- (id)get:(id)key {
+  return [self.storage get:key];
+}
+
+- (id)take:(id)key {
+  return [self.storage take:key];
+}
+
+- (id)takeIfIdle:(id)key {
+  return [self.storage takeIfIdle:key];
+}
+
+- (void)removeAll {
+  [self.storage removeAll];
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseQueryRegistryStorage.swift

@@ -0,0 +1,104 @@
+/**
+ * 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
+
+#if canImport(RNFBApp)
+import RNFBApp
+#endif
+
+/// Cached query map storage. Composes `RNFBHandleMapStorage`.
+/// Unique `put` collision errors stay on the ObjC façade.
+/// `takeIfIdle` reads `hasListeners` outside the HandleMap lock (avoids nesting).
+@objc(RNFBDatabaseQueryRegistryStorage)
+public final class RNFBDatabaseQueryRegistryStorage: NSObject {
+  private static let hasListenersSelector = Selector(("hasListeners"))
+  private static let removeAllEventListenersSelector = Selector(("removeAllEventListeners"))
+
+  private let storage = RNFBHandleMapStorage()
+
+  private func removeAllEventListeners(_ query: AnyObject?) {
+    guard let query = query, query.responds(to: Self.removeAllEventListenersSelector) else {
+      return
+    }
+    _ = query.perform(Self.removeAllEventListenersSelector)
+  }
+
+  /// Calls `-hasListeners` via IMP (avoids Swift protocol cast requiring formal conformance).
+  /// Returns `nil` when the selector is absent.
+  private func queryHasListeners(_ query: AnyObject) -> Bool? {
+    typealias HasListenersIMP = @convention(c) (AnyObject, Selector) -> Bool
+    let sel = Self.hasListenersSelector
+    guard query.responds(to: sel), let method = class_getInstanceMethod(type(of: query), sel)
+    else {
+      return nil
+    }
+    let fn = unsafeBitCast(method_getImplementation(method), to: HasListenersIMP.self)
+    return fn(query, sel)
+  }
+
+  /// First-wins store. Used by façade `put`.
+  @objc(putIfAbsent:value:)
+  public func putIfAbsent(_ key: AnyObject, value: AnyObject) -> Bool {
+    storage.putIfAbsent(key, value: value)
+  }
+
+  @objc(get:)
+  public func get(_ key: AnyObject) -> AnyObject? {
+    storage.get(key)
+  }
+
+  @objc(take:)
+  public func take(_ key: AnyObject) -> AnyObject? {
+    storage.take(key)
+  }
+
+  /// Idle-only take. `hasListeners` is read outside the HandleMap lock; identity-take then
+  /// put-back (or orphan cleanup) if listeners appear after the outside check.
+  @objc(takeIfIdle:)
+  public func takeIfIdle(_ key: AnyObject) -> AnyObject? {
+    guard let query = storage.get(key) else {
+      return nil
+    }
+    guard let hasListeners = queryHasListeners(query) else {
+      return nil
+    }
+    if hasListeners {
+      return nil
+    }
+    guard let taken = storage.takeIf(key, when: { $0 === query }) else {
+      return nil
+    }
+    if queryHasListeners(taken) == true {
+      // Prefer put-back so an active query stays registered. If a concurrent put claimed the
+      // slot, putIfAbsent fails and this taken query would be an orphan with listeners — clear
+      // them so SDK callbacks are not left attached outside the registry.
+      if !storage.putIfAbsent(key, value: taken) {
+        removeAllEventListeners(taken)
+      }
+      return nil
+    }
+    return taken
+  }
+
+  /// Snapshot then clear; `removeAllEventListeners` on each value that responds.
+  @objc
+  public func removeAll() {
+    for query in storage.takeAll() {
+      removeAllEventListeners(query)
+    }
+  }
+}

package/ios/RNFBDatabase/RNFBDatabaseReferenceHelper.m

@@ -24,6 +24,7 @@
 
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseNullSentinelDecoder.h"
 #import "RNFBDatabaseReferenceHelper.h"
 
 @implementation RNFBDatabaseReferenceHelper
@@ -39,7 +40,7 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
+  [firDatabaseReference setValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
              withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                if (error != nil) {
                  [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
@@ -60,14 +61,15 @@
   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]);
-                        }
-                      }];
+  [firDatabaseReference
+        updateChildValues:[RNFBDatabaseNullSentinelDecoder decodedValuesFromProps:props]
+      withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+        if (error != nil) {
+          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+        } else {
+          resolve([NSNull null]);
+        }
+      }];
 }
 
 + (void)setWithPriority:(NSString *)app
@@ -81,8 +83,8 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
-                     andPriority:[props valueForKey:@"priority"]
+  [firDatabaseReference setValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
+                     andPriority:[RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props]
              withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                if (error != nil) {
                  [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
@@ -123,7 +125,7 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setPriority:[props valueForKey:@"priority"]
+  [firDatabaseReference setPriority:[RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props]
                 withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                   if (error != nil) {
                     [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];

package/ios/RNFBDatabase/RNFBDatabaseTransactionHelper.m

@@ -25,6 +25,7 @@
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBApp/RNFBSharedUtils.h"
 #import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseNullSentinelDecoder.h"
 #import "RNFBDatabaseTransactionHelper.h"
 #import "RNFBRCTEventEmitter.h"
 
@@ -163,7 +164,8 @@ static NSString *const RNFB_DATABASE_TRANSACTION_EVENT = @"database_transaction_
   if (abort) {
     [transactionState setValue:@true forKey:@"abort"];
   } else {
-    id newValue = [updates valueForKey:@"value"];
+    id newValue =
+        [RNFBDatabaseNullSentinelDecoder decodedTransactionValue:[updates valueForKey:@"value"]];
     [transactionState setValue:newValue forKey:@"value"];
   }
 

package/ios/RNFBDatabase.xcodeproj/project.pbxproj

@@ -14,6 +14,8 @@
 		8B9DD3C622A11F4F00A16945 /* RNFBDatabaseReferenceModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3C522A11F4F00A16945 /* RNFBDatabaseReferenceModule.mm */; };
 		8B9DD3C922A1258B00A16945 /* RNFBDatabaseQueryModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3C822A1258B00A16945 /* RNFBDatabaseQueryModule.mm */; };
 		8B9DD3CE22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3CD22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm */; };
+		RNFBDB000000000000000001 /* RNFBDatabaseListenerRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */; };
+		RNFBDB000000000000000003 /* RNFBDatabaseQueryRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -44,6 +46,8 @@
 		8B9DD3CA22A1259F00A16945 /* RNFBDatabaseQueryModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBDatabaseQueryModule.h; sourceTree = "<group>"; };
 		8B9DD3CC22A43D0300A16945 /* RNFBDatabaseTransactionModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBDatabaseTransactionModule.h; sourceTree = "<group>"; };
 		8B9DD3CD22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBDatabaseTransactionModule.mm; sourceTree = "<group>"; };
+		RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBDatabaseListenerRegistryStorage.swift; path = RNFBDatabase/RNFBDatabaseListenerRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
+		RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBDatabaseQueryRegistryStorage.swift; path = RNFBDatabase/RNFBDatabaseQueryRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -70,6 +74,8 @@
 			children = (
 				2744B98421F45429004F8E3F /* RNFBDatabaseModule.h */,
 				2744B98521F45429004F8E3F /* RNFBDatabaseModule.mm */,
+				RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */,
+				RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */,
 				8B9DD3B822A03C6700A16945 /* RNFBDatabaseQuery.h */,
 				8B9DD3B922A03C7900A16945 /* RNFBDatabaseQuery.m */,
 				8B9DD3BC22A05CEB00A16945 /* RNFBDatabaseOnDisconnectModule.mm */,
@@ -153,6 +159,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				RNFBDB000000000000000001 /* RNFBDatabaseListenerRegistryStorage.swift in Sources */,
+				RNFBDB000000000000000003 /* RNFBDatabaseQueryRegistryStorage.swift in Sources */,
 				8B9DD3BD22A05CEB00A16945 /* RNFBDatabaseOnDisconnectModule.mm in Sources */,
 				8B9DD3C922A1258B00A16945 /* RNFBDatabaseQueryModule.mm in Sources */,
 				8B9DD3CE22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm in Sources */,
@@ -185,6 +193,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -201,6 +210,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -224,6 +234,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -235,6 +246,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};

package/ios/RNFBDatabaseUnitTests/RNFBDatabaseListenerRegistryStorageTests.swift

@@ -0,0 +1,86 @@
+/**
+ * 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 XCTest
+
+final class RNFBDatabaseListenerRegistryStorageTests: XCTestCase {
+  private var storage: RNFBDatabaseListenerRegistryStorage!
+
+  override func setUp() {
+    super.setUp()
+    storage = RNFBDatabaseListenerRegistryStorage()
+  }
+
+  func testPutIfAbsent_storesWhenFree_andIncrementsOccupancy() {
+    let handle = 7 as NSNumber
+    XCTAssertTrue(storage.putIfAbsent("k" as NSString, value: handle))
+    XCTAssertTrue(storage.get("k" as NSString) === handle)
+    XCTAssertTrue(storage.hasListeners)
+    XCTAssertTrue(storage.hasEventListener("k" as NSString))
+  }
+
+  func testPutIfAbsent_collision_keepsExistingWithoutOccupancyBump() {
+    let first = 1 as NSNumber
+    let second = 2 as NSNumber
+    XCTAssertTrue(storage.putIfAbsent("k" as NSString, value: first))
+    XCTAssertFalse(storage.putIfAbsent("k" as NSString, value: second))
+    XCTAssertTrue(storage.get("k" as NSString) === first)
+    XCTAssertTrue(storage.hasListeners)
+    XCTAssertEqual(storage.takeAll().count, 1)
+    XCTAssertFalse(storage.hasListeners)
+  }
+
+  func testGet_whenFree_isNil() {
+    XCTAssertNil(storage.get("missing" as NSString))
+    XCTAssertFalse(storage.hasEventListener("missing" as NSString))
+    XCTAssertFalse(storage.hasListeners)
+  }
+
+  func testTake_removesAndDecrementsOccupancy() {
+    let handle = 7 as NSNumber
+    XCTAssertTrue(storage.putIfAbsent("k" as NSString, value: handle))
+    XCTAssertTrue(storage.take("k" as NSString) === handle)
+    XCTAssertNil(storage.get("k" as NSString))
+    XCTAssertFalse(storage.hasListeners)
+  }
+
+  func testTake_whenFree_isNoOp() {
+    XCTAssertNil(storage.take("missing" as NSString))
+    XCTAssertFalse(storage.hasListeners)
+  }
+
+  func testTakeAll_snapshotAndLeavesEmpty() {
+    XCTAssertTrue(storage.putIfAbsent("a" as NSString, value: 1 as NSNumber))
+    XCTAssertTrue(storage.putIfAbsent("b" as NSString, value: 2 as NSNumber))
+    let remaining = storage.takeAll()
+    XCTAssertEqual(remaining.count, 2)
+    XCTAssertFalse(storage.hasListeners)
+    XCTAssertNil(storage.get("a" as NSString))
+  }
+
+  func testTakeAll_empty_isNoOp() {
+    XCTAssertEqual(storage.takeAll().count, 0)
+    XCTAssertFalse(storage.hasListeners)
+  }
+
+  func testPut_afterTake_allowsReuse() {
+    XCTAssertTrue(storage.putIfAbsent("k" as NSString, value: 1 as NSNumber))
+    XCTAssertEqual(storage.take("k" as NSString) as? NSNumber, 1)
+    XCTAssertTrue(storage.putIfAbsent("k" as NSString, value: 2 as NSNumber))
+    XCTAssertEqual(storage.get("k" as NSString) as? NSNumber, 2)
+    XCTAssertTrue(storage.hasListeners)
+  }
+}

package/ios/RNFBDatabaseUnitTests/RNFBDatabaseListenerRegistryTests.m

@@ -0,0 +1,90 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "RNFBDatabaseListenerRegistry.h"
+#import "RNFBHandleMap.h"
+
+@interface RNFBDatabaseListenerRegistryTests : XCTestCase
+@property(nonatomic, strong) RNFBDatabaseListenerRegistry *registry;
+@end
+
+@implementation RNFBDatabaseListenerRegistryTests
+
+- (void)setUp {
+  [super setUp];
+  self.registry = [[RNFBDatabaseListenerRegistry alloc] init];
+}
+
+- (void)testPutGetTake_happyPath {
+  NSNumber *handle = @7;
+  NSError *error = nil;
+  XCTAssertTrue([self.registry put:@"k" value:handle error:&error]);
+  XCTAssertNil(error);
+  XCTAssertEqual(handle, [self.registry get:@"k"]);
+  XCTAssertEqual(handle, [self.registry take:@"k"]);
+  XCTAssertNil([self.registry get:@"k"]);
+  XCTAssertFalse([self.registry hasListeners]);
+}
+
+- (void)testPut_occupiedId_returnsCollision {
+  XCTAssertTrue([self.registry put:@"k" value:@1 error:nil]);
+  NSError *error = nil;
+  XCTAssertFalse([self.registry put:@"k" value:@2 error:&error]);
+  XCTAssertEqual(error.code, RNFBHandleMapErrorCollision);
+  XCTAssertEqualObjects([self.registry get:@"k"], @1);
+  XCTAssertTrue([self.registry hasListeners]);
+}
+
+- (void)testPut_occupiedId_nilErrorOut_returnsNo {
+  XCTAssertTrue([self.registry put:@"k" value:@1 error:nil]);
+  XCTAssertFalse([self.registry put:@"k" value:@2 error:nil]);
+}
+
+- (void)testTake_missingKey_isNoOp {
+  XCTAssertNil([self.registry take:@"missing"]);
+  XCTAssertFalse([self.registry hasListeners]);
+}
+
+- (void)testTakeAll_snapshotAndLeavesEmpty {
+  XCTAssertTrue([self.registry put:@"a" value:@1 error:nil]);
+  XCTAssertTrue([self.registry put:@"b" value:@2 error:nil]);
+  NSArray *remaining = [self.registry takeAll];
+  XCTAssertEqual(remaining.count, 2);
+  XCTAssertFalse([self.registry hasListeners]);
+  XCTAssertNil([self.registry get:@"a"]);
+}
+
+- (void)testTakeAll_empty_isNoOp {
+  XCTAssertEqual([self.registry takeAll].count, 0);
+}
+
+- (void)testHasEventListener {
+  XCTAssertFalse([self.registry hasEventListener:@"k"]);
+  XCTAssertTrue([self.registry put:@"k" value:@1 error:nil]);
+  XCTAssertTrue([self.registry hasEventListener:@"k"]);
+}
+
+- (void)testPut_afterTake_allowsReuse {
+  XCTAssertTrue([self.registry put:@"k" value:@1 error:nil]);
+  XCTAssertEqualObjects([self.registry take:@"k"], @1);
+  XCTAssertTrue([self.registry put:@"k" value:@2 error:nil]);
+  XCTAssertEqualObjects([self.registry get:@"k"], @2);
+}
+
+@end

package/ios/RNFBDatabaseUnitTests/RNFBDatabaseNullSentinelDecodeTests.m

@@ -0,0 +1,118 @@
+/**
+ * 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 <XCTest/XCTest.h>
+
+#import "RNFBDatabaseNullSentinelDecoder.h"
+
+@interface RNFBDatabaseNullSentinelDecodeTests : XCTestCase
+@end
+
+@implementation RNFBDatabaseNullSentinelDecodeTests
+
+- (NSDictionary *)nullSentinel {
+  return @{@"__rnfbNull" : @YES};
+}
+
+- (NSDictionary *)serverTimestamp {
+  return @{@".sv" : @"timestamp"};
+}
+
+#pragma mark - Reference helper seams
+
+- (void)testReferenceSet_topLevelNullSentinel_becomesNSNull {
+  NSDictionary *props = @{@"value" : [self nullSentinel]};
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [NSNull null]);
+}
+
+- (void)testReferenceUpdate_childNullSentinel_becomesNSNull {
+  NSDictionary *props = @{@"values" : @{@"a" : [self nullSentinel], @"b" : @1}};
+  NSDictionary *decoded = [RNFBDatabaseNullSentinelDecoder decodedValuesFromProps:props];
+  XCTAssertEqualObjects(decoded[@"a"], [NSNull null]);
+  XCTAssertEqualObjects(decoded[@"b"], @1);
+}
+
+- (void)testReferenceSetWithPriority_valueAndPrioritySentinels_becomeNSNull {
+  NSDictionary *props = @{
+    @"value" : [self nullSentinel],
+    @"priority" : [self nullSentinel],
+  };
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [NSNull null]);
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props],
+                        [NSNull null]);
+}
+
+- (void)testReferenceSetPriority_sentinel_becomesNSNull {
+  NSDictionary *props = @{@"priority" : [self nullSentinel]};
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props],
+                        [NSNull null]);
+}
+
+- (void)testReference_serverTimestampDictionary_unchanged {
+  NSDictionary *props = @{@"value" : [self serverTimestamp]};
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [self serverTimestamp]);
+}
+
+#pragma mark - OnDisconnect helper seams
+
+- (void)testOnDisconnectSet_topLevelNullSentinel_becomesNSNull {
+  NSDictionary *props = @{@"value" : [self nullSentinel]};
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [NSNull null]);
+}
+
+- (void)testOnDisconnectSetWithPriority_valueAndPrioritySentinels_becomeNSNull {
+  NSDictionary *props = @{
+    @"value" : [self nullSentinel],
+    @"priority" : [self nullSentinel],
+  };
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [NSNull null]);
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props],
+                        [NSNull null]);
+}
+
+- (void)testOnDisconnectUpdate_childNullSentinel_becomesNSNull {
+  NSDictionary *props = @{@"values" : @{@"gone" : [self nullSentinel]}};
+  NSDictionary *decoded = [RNFBDatabaseNullSentinelDecoder decodedValuesFromProps:props];
+  XCTAssertEqualObjects(decoded[@"gone"], [NSNull null]);
+}
+
+- (void)testOnDisconnect_serverTimestampDictionary_unchanged {
+  NSDictionary *props = @{@"value" : [self serverTimestamp]};
+  XCTAssertEqualObjects([RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props],
+                        [self serverTimestamp]);
+}
+
+#pragma mark - Transaction helper seam
+
+- (void)testTransactionTryCommit_valueSentinel_becomesNSNull {
+  id decoded = [RNFBDatabaseNullSentinelDecoder decodedTransactionValue:[self nullSentinel]];
+  XCTAssertEqualObjects(decoded, [NSNull null]);
+  XCTAssertFalse([decoded isKindOfClass:[NSDictionary class]]);
+}
+
+- (void)testTransactionTryCommit_serverTimestamp_unchanged {
+  XCTAssertEqualObjects(
+      [RNFBDatabaseNullSentinelDecoder decodedTransactionValue:[self serverTimestamp]],
+      [self serverTimestamp]);
+}
+
+@end