rns-nativecall 0.8.0 → 0.8.1

package/index.d.ts

@@ -80,6 +80,8 @@ export interface CallHandlerType {
 
     requestOverlayPermission(): Promise<boolean>;
 
+    reportRemoteEnded(uuid: string, reason: number): void;
+
     checkOverlayPermission(): Promise<boolean>;
 
     /**

package/index.js

@@ -47,6 +47,11 @@ export const CallHandler = {
     },
     // ------------------------------------
 
+    reportRemoteEnded: async (uuid, endReason) => {
+        if (!CallModule?.reportRemoteEnded) return;
+        await CallModule.reportRemoteEnded(uuid.toLowerCase().trim(), endReason);
+    },
+
     requestOverlayPermission: async () => {
         if (!CallModule?.requestOverlayPermission) return false;
         return await CallModule.requestOverlayPermission();

package/ios/CallModule.m

@@ -3,6 +3,7 @@
 
 @interface CallModule ()
 @property (nonatomic, strong) NSString *pendingCallUuid;
+@property (nonatomic, strong) NSMutableDictionary *pendingEvents;
 @end
 
 @implementation CallModule
@@ -20,6 +21,7 @@ RCT_EXPORT_MODULE();
 - (instancetype)init {
     self = [super init];
     if (self) {
+        self.pendingEvents = [NSMutableDictionary new];
         NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
 
         CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:appName];
@@ -35,6 +37,34 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
+// MARK: - New Parity Methods (Synced with Android)
+
+RCT_EXPORT_METHOD(checkCallValidity:(NSString *)uuidString resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    BOOL isCurrent = [uuidString isEqualToString:self.currentCallUUID.UUIDString];
+    resolve(@{
+        @"isValid": @(isCurrent),
+        @"isCanceled": @(!isCurrent)
+    });
+}
+
+RCT_EXPORT_METHOD(getInitialCallData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    
+    if (self.pendingCallUuid) {
+        result[@"default"] = @{@"callUuid": self.pendingCallUuid};
+        self.pendingCallUuid = nil;
+    }
+    
+    if (self.pendingEvents.count > 0) {
+        [result addEntriesFromDictionary:self.pendingEvents];
+        [self.pendingEvents removeAllObjects];
+    }
+    
+    resolve(result.count > 0 ? result : [NSNull null]);
+}
+
+// MARK: - Core Logic
+
 RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
                   name:(NSString *)name
                   callType:(NSString *)callType
@@ -50,9 +80,9 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     self.currentCallUUID = uuid;
 
     AVAudioSession *session = [AVAudioSession sharedInstance];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord 
-                    mode:AVAudioSessionModeVoiceChat 
-                 options:AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker
+    [session setCategory:AVAudioSessionCategoryPlayAndRecord
+                    mode:AVAudioSessionModeVoiceChat
+                 options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker
                    error:nil];
 
     CXCallUpdate *update = [[CXCallUpdate alloc] init];
@@ -68,38 +98,35 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }];
 }
 
-RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
-{
+// Handles programmatic ending (e.g., via FCM "CANCEL")
+RCT_EXPORT_METHOD(reportRemoteEnded:(NSString *)uuidString reason:(NSInteger)reason) {
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     if (!uuid) return;
 
-    [self.provider reportCallWithUUID:uuid 
-                          endedAtDate:[NSDate date] 
-                               reason:CXCallEndedReasonRemoteEnded];
-    self.currentCallUUID = nil;
-    self.pendingCallUuid = nil;
-}
-
-RCT_EXPORT_METHOD(getInitialCallData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    if (self.pendingCallUuid) {
-        resolve(@{@"callUuid": self.pendingCallUuid});
-        self.pendingCallUuid = nil; 
-    } else {
-        resolve([NSNull null]);
+    // Report to CallKit that the remote user ended the call
+    [self.provider reportCallWithUUID:uuid
+                          endedAtDate:[NSDate date]
+                               reason:(CXCallEndedReason)reason];
+    
+    // Clear local tracking
+    if ([uuid isEqual:self.currentCallUUID]) {
+        self.currentCallUUID = nil;
+        self.pendingCallUuid = nil;
     }
 }
 
-RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    resolve(@YES);
+RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
+{
+    [self reportRemoteEnded:uuidString reason:CXCallEndedReasonRemoteEnded];
 }
 
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
     AVAudioSession *session = [AVAudioSession sharedInstance];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord 
-                    mode:AVAudioSessionModeVoiceChat 
-                 options:AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker 
+    [session setCategory:AVAudioSessionCategoryPlayAndRecord
+                    mode:AVAudioSessionModeVoiceChat
+                 options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker
                    error:nil];
     [session setActive:YES error:nil];
 
@@ -108,9 +135,12 @@ RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve reject
     NSString *uuidStr = [action.callUUID.UUIDString lowercaseString];
     self.pendingCallUuid = uuidStr;
 
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        // NUDGE: Force the window to become visible. 
-        // This helps transition from "Ghost Mode" to "Active UI" once the user unlocks.
+    // Switch from system UI to App UI
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self.provider reportCallWithUUID:action.callUUID
+                          endedAtDate:[NSDate date]
+                                reason:CXCallEndedReasonAnsweredElsewhere];
+        
         dispatch_async(dispatch_get_main_queue(), ^{
             [[[UIApplication sharedApplication] keyWindow] makeKeyAndVisible];
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",