@stream-io/react-native-callingx 0.1.0-beta.7 → 0.1.1-beta.1

package/ios/UUIDStorage.swift

@@ -18,7 +18,7 @@ import Foundation
         return queue.sync {
             if let existing = callsByCid[cid] {
                 #if DEBUG
-                print("[UUIDStorage] getOrCreateCall: found existing \(existing)")
+                NSLog("%@","[UUIDStorage] getOrCreateCall: found existing \(existing)")
                 #endif
                 return existing
             }
@@ -29,7 +29,7 @@ import Foundation
             callsByCid[cid] = call
             callsByUUID[uuidString] = call
             #if DEBUG
-            print("[UUIDStorage] getOrCreateCall: created \(call)")
+            NSLog("%@","[UUIDStorage] getOrCreateCall: created \(call)")
             #endif
             return call
         }
@@ -63,7 +63,7 @@ import Foundation
         return queue.sync {
             if let existing = callsByCid[cid] {
                 #if DEBUG
-                print("[UUIDStorage] getUUIDForCid: found existing UUID \(existing.uuid.uuidString.lowercased()) for cid \(cid)")
+                NSLog("%@","[UUIDStorage] getUUIDForCid: found existing UUID \(existing.uuid.uuidString.lowercased()) for cid \(cid)")
                 #endif
                 return existing.uuid
             }
@@ -74,7 +74,7 @@ import Foundation
             callsByCid[cid] = call
             callsByUUID[uuidString] = call
             #if DEBUG
-            print("[UUIDStorage] getUUIDForCid: created new UUID \(uuidString) for cid \(cid)")
+            NSLog("%@","[UUIDStorage] getUUIDForCid: created new UUID \(uuidString) for cid \(cid)")
             #endif
             return uuid
         }
@@ -91,7 +91,7 @@ import Foundation
             let uuidString = uuid.uuidString.lowercased()
             let cid = callsByUUID[uuidString]?.cid
             #if DEBUG
-            print("[UUIDStorage] getCidForUUID: UUID \(uuidString) -> cid \(cid ?? "(not found)")")
+            NSLog("%@","[UUIDStorage] getCidForUUID: UUID \(uuidString) -> cid \(cid ?? "(not found)")")
             #endif
             return cid
         }
@@ -104,11 +104,11 @@ import Foundation
                 callsByCid.removeValue(forKey: call.cid)
                 callsByUUID.removeValue(forKey: uuidString)
                 #if DEBUG
-                print("[UUIDStorage] removeCidForUUID: removed cid \(call.cid) for UUID \(uuidString)")
+                NSLog("%@","[UUIDStorage] removeCidForUUID: removed cid \(call.cid) for UUID \(uuidString)")
                 #endif
             } else {
                 #if DEBUG
-                print("[UUIDStorage] removeCidForUUID: no cid found for UUID \(uuidString)")
+                NSLog("%@","[UUIDStorage] removeCidForUUID: no cid found for UUID \(uuidString)")
                 #endif
             }
         }
@@ -121,11 +121,11 @@ import Foundation
                 callsByUUID.removeValue(forKey: uuidString)
                 callsByCid.removeValue(forKey: cid)
                 #if DEBUG
-                print("[UUIDStorage] removeCid: removed cid \(cid) with UUID \(uuidString)")
+                NSLog("%@","[UUIDStorage] removeCid: removed cid \(cid) with UUID \(uuidString)")
                 #endif
             } else {
                 #if DEBUG
-                print("[UUIDStorage] removeCid: no UUID found for cid \(cid)")
+                NSLog("%@","[UUIDStorage] removeCid: no UUID found for cid \(cid)")
                 #endif
             }
         }
@@ -137,7 +137,7 @@ import Foundation
             callsByCid.removeAll()
             callsByUUID.removeAll()
             #if DEBUG
-            print("[UUIDStorage] removeAllObjects: cleared \(count) entries")
+            NSLog("%@","[UUIDStorage] removeAllObjects: cleared \(count) entries")
             #endif
         }
     }

package/ios/VoipNotificationsManager.swift

@@ -56,13 +56,13 @@ typealias RNVoipPushNotificationCompletion = () -> Void
     @objc public static func voipRegistration() {
         if isVoipRegistered {
             #if DEBUG
-            print("[VoipNotificationsManager] voipRegistration is already registered. return _lastVoipToken = \(lastVoipToken)")
+            NSLog("%@","[VoipNotificationsManager] voipRegistration is already registered. return _lastVoipToken = \(lastVoipToken)")
             #endif
             let voipPushManager = VoipNotificationsManager.shared()
             voipPushManager.sendEventWithNameWrapper(name: VoipNotificationsEvents.registered, body: ["token": lastVoipToken])
         } else {
             #if DEBUG
-            print("[VoipNotificationsManager] voipRegistration enter")
+            NSLog("%@","[VoipNotificationsManager] voipRegistration enter")
             #endif
             DispatchQueue.main.async {
                 let voipRegistry = PKPushRegistry(queue: DispatchQueue.main)
@@ -78,7 +78,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
                     isVoipRegistered = true
                 } else {
                     #if DEBUG
-                    print("[VoipNotificationsManager] voipRegistration appDelegate not found. return")
+                    NSLog("%@","[VoipNotificationsManager] voipRegistration appDelegate not found. return")
                     #endif
                 }
             }
@@ -87,7 +87,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
     
     @objc public static func didUpdatePushCredentials(_ credentials: PKPushCredentials, forType type: String) {
         #if DEBUG
-        print("[VoipNotificationsManager] didUpdatePushCredentials credentials.token = \(credentials.token), type = \(type)")
+        NSLog("%@","[VoipNotificationsManager] didUpdatePushCredentials credentials.token = \(credentials.token), type = \(type)")
         #endif
         
         let voipTokenLength = credentials.token.count
@@ -103,7 +103,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
     
     @objc public static func didReceiveIncomingPushWithPayload(_ payload: PKPushPayload, forType type: String) {
         #if DEBUG
-        print("[VoipNotificationsManager] didReceiveIncomingPushWithPayload payload.dictionaryPayload = \(payload.dictionaryPayload), type = \(type)")
+        NSLog("%@","[VoipNotificationsManager] didReceiveIncomingPushWithPayload payload.dictionaryPayload = \(payload.dictionaryPayload), type = \(type)")
         #endif
         
         let dictionaryPayload: [String: Any] = Dictionary(uniqueKeysWithValues: payload.dictionaryPayload.map { (key, value) in
@@ -119,7 +119,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
         var events: [[String: Any]] = []
         let action = {
             #if DEBUG
-            print("[VoipNotificationsManager][getInitialEvents] delayedEvents = \(self.delayedEvents)")
+            NSLog("%@","[VoipNotificationsManager][getInitialEvents] delayedEvents = \(self.delayedEvents)")
             #endif
             
             events = self.delayedEvents
@@ -148,7 +148,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
 
     private func sendEventWithNameWrapper(name: String, body: [String: Any]?) {
         #if DEBUG
-        print("[VoipNotificationsManager] sendEventWithNameWrapper: \(name)")
+        NSLog("%@","[VoipNotificationsManager] sendEventWithNameWrapper: \(name)")
         #endif
         
         let sendEventAction = {
@@ -162,7 +162,7 @@ typealias RNVoipPushNotificationCompletion = () -> Void
             } else {
                 self.delayedEvents.append(dictionary)
                 #if DEBUG
-                print("[VoipNotificationsManager] delayedEvents: \(self.delayedEvents)")
+                NSLog("%@","[VoipNotificationsManager] delayedEvents: \(self.delayedEvents)")
                 #endif
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/react-native-callingx",
-  "version": "0.1.0-beta.7",
+  "version": "0.1.1-beta.1",
   "description": "CallKit and Telecom API capabilities for React Native",
   "main": "./dist/module/index.js",
   "module": "./dist/module/index.js",
@@ -70,6 +70,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
+    "@react-native-firebase/app": ">=23.0.0",
+    "@react-native-firebase/messaging": ">=23.0.0",
     "@stream-io/react-native-webrtc": ">=137.1.2",
     "react": "*",
     "react-native": "*"
@@ -109,4 +111,4 @@
     "tools": [],
     "version": "0.55.0"
   }
-}
+}

package/src/CallingxModule.ts

@@ -11,7 +11,6 @@ import type { EventListener } from './EventManager';
 import {
   type ICallingxModule,
   type InfoDisplayOptions,
-  type TextTransformer,
   type EndCallReason,
   type EventData,
   type EventName,
@@ -25,7 +24,6 @@ import {
   androidEndCallReasonMap,
   defaultAndroidOptions,
   defaultiOSOptions,
-  defaultTextTransformer,
   iosEndCallReasonMap,
 } from './utils/constants';
 import { isVoipEvent } from './utils/utils';
@@ -35,8 +33,8 @@ class CallingxModule implements ICallingxModule {
   private _isOngoingCallsEnabled = false;
   private _isHeadlessTaskRegistered = false;
 
-  private titleTransformer: TextTransformer = (text: string) => text;
-  private subtitleTransformer: TextTransformer | undefined = undefined;
+  private titleTransformer: (memberName: string, incoming: boolean) => string =
+    (memberName: string) => memberName;
 
   private eventManager: EventManager<EventName, EventParams> =
     new EventManager();
@@ -74,13 +72,13 @@ class CallingxModule implements ICallingxModule {
     if (Platform.OS === 'android') {
       const {
         titleTransformer,
-        subtitleTransformer,
         incomingChannel,
         ongoingChannel,
+        notificationTexts,
       } = options.android ?? {};
 
-      this.titleTransformer = titleTransformer ?? defaultTextTransformer;
-      this.subtitleTransformer = subtitleTransformer;
+      this.titleTransformer =
+        titleTransformer ?? ((memberName: string) => memberName);
 
       const notificationsConfig = {
         incomingChannel: {
@@ -91,6 +89,7 @@ class CallingxModule implements ICallingxModule {
           ...defaultAndroidOptions.ongoingChannel,
           ...(ongoingChannel ?? {}),
         },
+        notificationTexts,
       };
 
       if (
@@ -133,7 +132,6 @@ class CallingxModule implements ICallingxModule {
   ): Promise<void> {
     const displayOptions: InfoDisplayOptions = {
       displayTitle: this.titleTransformer(callerName, true),
-      displaySubtitle: this.subtitleTransformer?.(phoneNumber, true),
     };
     return NativeCallingModule.displayIncomingCall(
       callId,
@@ -157,7 +155,6 @@ class CallingxModule implements ICallingxModule {
   ): Promise<void> {
     const displayOptions: InfoDisplayOptions = {
       displayTitle: this.titleTransformer(callerName, false),
-      displaySubtitle: this.subtitleTransformer?.(phoneNumber, false),
     };
     return NativeCallingModule.startCall(
       callId,
@@ -172,10 +169,10 @@ class CallingxModule implements ICallingxModule {
     callId: string,
     phoneNumber: string,
     callerName: string,
+    incoming: boolean,
   ): Promise<void> {
     const displayOptions: InfoDisplayOptions = {
-      displayTitle: this.titleTransformer(callerName, false), //adjust incoming or outgoing call
-      displaySubtitle: this.subtitleTransformer?.(phoneNumber, false), //adjust incoming or outgoing call
+      displayTitle: this.titleTransformer(callerName, incoming),
     };
     return NativeCallingModule.updateDisplay(
       callId,
@@ -237,16 +234,6 @@ class CallingxModule implements ICallingxModule {
       );
     }
 
-    // Check if service is started (Android only)
-    if (Platform.OS === 'android') {
-      const isServiceStarted = await NativeCallingModule.isServiceStarted();
-      if (!isServiceStarted) {
-        throw new Error(
-          'Service is not started. Call displayIncomingCall or startCall first.',
-        );
-      }
-    }
-
     return NativeCallingModule.startBackgroundTask(HEADLESS_TASK_NAME, 0);
   }
 
@@ -255,10 +242,22 @@ class CallingxModule implements ICallingxModule {
     return NativeCallingModule.stopBackgroundTask(HEADLESS_TASK_NAME);
   }
 
+  fulfillAnswerCallAction(callId: string, didFail: boolean): void {
+    NativeCallingModule.fulfillAnswerCallAction(callId, didFail);
+  }
+
+  fulfillEndCallAction(callId: string, didFail: boolean): void {
+    NativeCallingModule.fulfillEndCallAction(callId, didFail);
+  }
+
   registerVoipToken(): void {
     NativeCallingModule.registerVoipToken();
   }
 
+  stopService(): Promise<void> {
+    return NativeCallingModule.stopService();
+  }
+
   addEventListener<T extends EventName | VoipEventName>(
     eventName: T,
     callback: EventListener<

package/src/spec/NativeCallingx.ts

@@ -31,6 +31,10 @@ export interface Spec extends TurboModule {
       id: string;
       name: string;
     };
+    notificationTexts?: {
+      accepting?: string;
+      rejecting?: string;
+    };
   }): void;
 
   setShouldRejectCallWhenBusy(shouldReject: boolean): void;
@@ -86,7 +90,6 @@ export interface Spec extends TurboModule {
     hasVideo: boolean,
     displayOptions?: {
       displayTitle?: string;
-      displaySubtitle?: string;
     },
   ): Promise<void>;
 
@@ -100,7 +103,6 @@ export interface Spec extends TurboModule {
     hasVideo: boolean,
     displayOptions?: {
       displayTitle?: string;
-      displaySubtitle?: string;
     },
   ): Promise<void>;
 
@@ -110,7 +112,6 @@ export interface Spec extends TurboModule {
     callerName: string,
     displayOptions?: {
       displayTitle?: string;
-      displaySubtitle?: string;
     },
   ): Promise<void>;
 
@@ -127,15 +128,18 @@ export interface Spec extends TurboModule {
   setOnHoldCall(callId: string, isOnHold: boolean): Promise<void>;
 
   registerBackgroundTaskAvailable(): void;
-
-  isServiceStarted(): Promise<boolean>;
-
   startBackgroundTask(taskName: string, timeout: number): Promise<void>;
 
   stopBackgroundTask(taskName: string): Promise<void>;
 
+  fulfillAnswerCallAction(callId: string, didFail: boolean): void;
+
+  fulfillEndCallAction(callId: string, didFail: boolean): void;
+
   registerVoipToken(): void;
 
+  stopService(): Promise<void>;
+
   readonly onNewEvent: EventEmitter<{
     eventName: string;
     params: {

package/src/types.ts

@@ -73,6 +73,7 @@ export interface ICallingxModule {
     callId: string,
     phoneNumber: string,
     callerName: string,
+    incoming: boolean,
   ): Promise<void>;
 
   /**
@@ -121,8 +122,26 @@ export interface ICallingxModule {
 
   stopBackgroundTask(taskName: string): Promise<void>;
 
+  /**
+   * Fulfill or fail a pending CXAnswerCallAction on iOS.
+   * Must be called after starting the JS-side joining process (e.g: without awaiting for call.join() to complete)
+   * @param callId - The call id.
+   * @param didFail - If true, calls action.fail(); otherwise calls action.fulfill().
+   */
+  fulfillAnswerCallAction(callId: string, didFail: boolean): void;
+
+  /**
+   * Fulfill or fail a pending CXEndCallAction on iOS.
+   * Must be called after completetion of the JS-side processing (e.g: after call.leave() is done).
+   * @param callId - The call id.
+   * @param didFail - If true, calls action.fail(); otherwise calls action.fulfill().
+   */
+  fulfillEndCallAction(callId: string, didFail: boolean): void;
+
   registerVoipToken(): void;
 
+  stopService(): Promise<void>;
+
   /**
    * Single entry point for adding event listeners.
    * Automatically routes to the appropriate manager based on event type.
@@ -195,13 +214,27 @@ export type InternalAndroidOptions = {
     id?: string;
     name?: string;
   };
+  /**
+   * Texts used for call state notifications while the system is connecting or declining the call.
+   * If not provided, platform defaults will be used.
+   */
+  notificationTexts?: {
+    /**
+     * Text shown while optimistically accepting a call.
+     * @default "Connecting..."
+     */
+    accepting?: string;
+    /**
+     * Text shown while optimistically rejecting a call.
+     * @default "Declining..."
+     */
+    rejecting?: string;
+  };
 };
 type AndroidOptions = InternalAndroidOptions & NotificationTransformers;
 
-export type TextTransformer = (text: string, incoming: boolean) => string;
 export type NotificationTransformers = {
-  titleTransformer?: TextTransformer;
-  subtitleTransformer?: TextTransformer;
+  titleTransformer?: (memberName: string, incoming: boolean) => string;
 };
 
 export type CallingExpOptions = {
@@ -221,7 +254,6 @@ export type CallingExpOptions = {
 
 export type InfoDisplayOptions = {
   displayTitle?: string;
-  displaySubtitle?: string;
 };
 
 export type EventData = {

package/src/utils/constants.ts

@@ -2,12 +2,9 @@ import type {
   InternalAndroidOptions,
   InternalIOSOptions,
   EndCallReason,
-  TextTransformer,
 } from '../types';
 import type { DeepRequired } from './types';
 
-export const defaultTextTransformer: TextTransformer = (text: string) => text;
-
 export const defaultiOSOptions: Required<InternalIOSOptions> = {
   supportsVideo: true,
   maximumCallsPerCallGroup: 1,
@@ -19,7 +16,10 @@ export const defaultiOSOptions: Required<InternalIOSOptions> = {
   displayCallTimeout: 60000, // 1 minute
 };
 
-export const defaultAndroidOptions: DeepRequired<InternalAndroidOptions> = {
+export const defaultAndroidOptions: Omit<
+  DeepRequired<InternalAndroidOptions>,
+  'notificationTexts'
+> = {
   incomingChannel: {
     id: 'stream_incoming_calls_channel',
     name: 'Incoming calls',
@@ -48,17 +48,28 @@ export const iosEndCallReasonMap: Record<EndCallReason, number> = {
   unknown: 1, // .failed (no iOS equivalent)
 };
 
-// Android: maps to android.telecom.DisconnectCause constants.
-// See https://developer.android.com/reference/android/telecom/DisconnectCause
+// Android: maps to a limited subset of android.telecom.DisconnectCause constants
+// that are allowed when using the CallControl / core-telecom APIs.
+//
+// Per platform docs, only the following codes are valid when disconnecting a call:
+// - DisconnectCause.LOCAL
+// - DisconnectCause.REMOTE
+// - DisconnectCause.REJECTED
+// - DisconnectCause.MISSED
+//
+// Numeric values (from android.telecom.DisconnectCause):
+// LOCAL = 2, REMOTE = 3, REJECTED = 6, MISSED = 5
+//
+// We therefore collapse all high-level EndCallReason variants to this allowed set.
 export const androidEndCallReasonMap: Record<EndCallReason, number> = {
   local: 2, // LOCAL
   remote: 3, // REMOTE
   rejected: 6, // REJECTED
-  busy: 7, // BUSY
-  answeredElsewhere: 11, // ANSWERED_ELSEWHERE
+  busy: 6, // map busy -> REJECTED
+  answeredElsewhere: 3, // map answeredElsewhere -> REMOTE
   missed: 5, // MISSED
-  error: 1, // ERROR
-  canceled: 4, // CANCELED
-  restricted: 8, // RESTRICTED
-  unknown: 0, // UNKNOWN
+  error: 2, // map error -> LOCAL
+  canceled: 2, // map canceled -> LOCAL
+  restricted: 6, // map restricted -> REJECTED
+  unknown: 2, // map unknown -> LOCAL
 };