expo-callkit-telecom 0.3.8 → 0.3.9

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.3.8"
+  ".": "0.3.9"
 }

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to `expo-callkit-telecom` are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.9](https://github.com/mfairley/expo-callkit-telecom/compare/v0.3.8...v0.3.9) (2026-06-04)
+
+
+### Bug Fixes
+
+* make incomingCall the canonical VoIP push key, accept incoming_call ([637fb83](https://github.com/mfairley/expo-callkit-telecom/commit/637fb835ba7675d17f2ed31e1842e9655c89d428)), closes [#15](https://github.com/mfairley/expo-callkit-telecom/issues/15)
+
 ## [0.3.8](https://github.com/mfairley/expo-callkit-telecom/compare/v0.3.7...v0.3.8) (2026-05-21)
 
 

package/README.md

@@ -97,6 +97,7 @@ With custom ringtone and dialtone:
           "defaultDialtone": "dialtone.wav",
           "incomingCallTimeout": 45,
           "outgoingCallTimeout": 60,
+          "fulfillAnswerCallTimeout": 30,
           "microphonePermission": "$(PRODUCT_NAME) needs the microphone to make calls."
         }
       ]
@@ -158,7 +159,7 @@ Calls.addCallAnsweredListener(({ id }) => {
 });
 ```
 
-Both transports wrap the event under an `incomingCall` key, just at different layers — APNs in the push payload dictionary, FCM in the data block:
+Both transports wrap the event under an `incomingCall` key, just at different layers — APNs in the push payload dictionary, FCM in the data block. (The snake_case `incoming_call` is also accepted for backwards compatibility.)
 
 ### 🍎 iOS — APNs VoIP push
 

package/android/src/main/java/expo/modules/callkittelecom/models/CallModels.kt

@@ -62,7 +62,7 @@ data class CallParticipant(
  *
  * Two construction paths:
  * - [fromMap]: parses JS camelCase dictionaries (used by `reportIncomingCall`).
- * - [fromPayload]: parses a push payload that wraps the event under the top-level `incoming_call`
+ * - [fromPayload]: parses a push payload that wraps the event under the top-level `incomingCall`
  *   key (used by VoIP push handling).
  */
 data class IncomingCallEvent(
@@ -164,15 +164,17 @@ data class IncomingCallEvent(
         /**
          * Parses an `IncomingCallEvent` from a push payload.
          *
-         * The payload MUST wrap the event under the top-level key `incoming_call`. There is no
-         * fallback to a flat top-level shape. Inner keys are camelCase, matching the TS contract
-         * and the example server.
+         * The payload MUST wrap the event under the top-level key `incomingCall`; the snake_case
+         * `incoming_call` is also accepted for backwards compatibility. There is no fallback to a
+         * flat top-level shape. Inner keys are camelCase, matching the TS contract.
          *
          * Returns `null` if the envelope is missing or required fields are absent.
          */
         @Suppress("UNCHECKED_CAST")
         fun fromPayload(payload: Map<String, Any?>): IncomingCallEvent? {
-            val event = payload["incoming_call"] as? Map<String, Any?> ?: return null
+            val event =
+                (payload["incomingCall"] ?: payload["incoming_call"]) as? Map<String, Any?>
+                    ?: return null
 
             val eventId = event["eventId"] as? String ?: ""
             val serverCallId = event["serverCallId"] as? String ?: ""

package/android/src/main/java/expo/modules/callkittelecom/services/ExpoCallKitTelecomMessagingService.kt

@@ -19,15 +19,18 @@ import org.json.JSONObject
  * by the existing notification delegate via [super], and call payloads are routed directly to
  * Telecom.
  *
- * Wire format (matches example/server/lib/fcm.ts): data["messageType"] = "incoming_call"
- * data["incoming_call"] = JSON string of the IncomingCallEvent (camelCase)
+ * Wire format (matches example/server/lib/fcm.ts): data["messageType"] = "incomingCall"
+ * data["incomingCall"] = JSON string of the IncomingCallEvent (camelCase). The snake_case envelope
+ * (messageType/key "incoming_call") is also accepted for backwards compatibility.
  */
 class ExpoCallKitTelecomMessagingService : ExpoFirebaseMessagingService() {
     companion object {
         private const val TAG = "ExpoCallKitTelecom.FCM"
         private const val KEY_MESSAGE_TYPE = "messageType"
-        private const val MESSAGE_TYPE_INCOMING_CALL = "incoming_call"
-        private const val KEY_INCOMING_CALL = "incoming_call"
+        // Canonical camelCase envelope plus the snake_case form accepted for backwards
+        // compatibility.
+        private val MESSAGE_TYPE_INCOMING_CALL = setOf("incomingCall", "incoming_call")
+        private val KEYS_INCOMING_CALL = listOf("incomingCall", "incoming_call")
         private const val DEDUP_WINDOW_MS = 120_000L
 
         private val dedupeLock = Any()
@@ -65,8 +68,8 @@ class ExpoCallKitTelecomMessagingService : ExpoFirebaseMessagingService() {
         try {
             CallManager.shared.initialize(applicationContext)
 
-            // Wrap under the envelope so we go through the same parser path as iOS.
-            val event = IncomingCallEvent.fromPayload(mapOf(KEY_INCOMING_CALL to eventMap))
+            // Wrap under the canonical envelope so we go through the same parser path as iOS.
+            val event = IncomingCallEvent.fromPayload(mapOf("incomingCall" to eventMap))
             if (event == null) {
                 Log.w(TAG, "Failed to validate incoming call event from FCM payload")
                 return
@@ -82,11 +85,11 @@ class ExpoCallKitTelecomMessagingService : ExpoFirebaseMessagingService() {
     }
 
     private fun parseIncomingCallEvent(data: Map<String, String>): Map<String, Any?>? {
-        if (data[KEY_MESSAGE_TYPE] != MESSAGE_TYPE_INCOMING_CALL) {
+        if (data[KEY_MESSAGE_TYPE] !in MESSAGE_TYPE_INCOMING_CALL) {
             return null
         }
 
-        val nestedPayload = data[KEY_INCOMING_CALL] ?: return null
+        val nestedPayload = KEYS_INCOMING_CALL.firstNotNullOfOrNull { data[it] } ?: return null
         return try {
             jsonObjectToMap(JSONObject(nestedPayload))
         } catch (error: Throwable) {

package/ios/Managers/VoIPPushManager+PKPushRegistryDelegate.swift

@@ -40,7 +40,7 @@ extension VoIPPushManager: PKPushRegistryDelegate {
   ///
   /// This method MUST report a call to CallKit before returning, per Apple's requirements.
   /// The payload is expected to wrap an `IncomingCallEvent` under the top-level
-  /// key `"incoming_call"`, matching `IncomingCallEventParser`.
+  /// key `"incomingCall"`, matching `IncomingCallEventParser`.
   ///
   /// - Parameters:
   ///   - registry: The push registry.

package/ios/Models/IncomingCallEvent.swift

@@ -132,12 +132,15 @@ struct IncomingCallEventRecord: Record {
 
 /// Parses an `IncomingCallEvent` from a VoIP push payload.
 ///
-/// The payload must wrap the event under the top-level key `"incoming_call"`.
-/// There is no fallback to a flat top-level shape. Inner keys are camelCase
-/// to match the TS contract and the example server's wire format.
+/// The payload must wrap the event under the top-level key `"incomingCall"`.
+/// The snake_case `"incoming_call"` is also accepted for backwards compatibility.
+/// There is no fallback to a flat top-level shape. Inner keys are camelCase to
+/// match the TS contract.
 enum IncomingCallEventParser {
   static func parse(from payload: [AnyHashable: Any]) -> IncomingCallEvent? {
-    guard let event = payload["incoming_call"] as? [AnyHashable: Any] else {
+    guard
+      let event = (payload["incomingCall"] ?? payload["incoming_call"]) as? [AnyHashable: Any]
+    else {
       return nil
     }
 

package/lefthook.yml

@@ -0,0 +1,16 @@
+# Git hooks managed by lefthook (https://lefthook.dev).
+# Run `lefthook install` once after cloning to wire up the hooks.
+# Formatters live in the flox env — commit from a `flox activate` shell so
+# `swift-format` and `ktfmt` are on PATH.
+pre-commit:
+  parallel: true
+  commands:
+    swift-format:
+      glob: "ios/*.swift"
+      run: swift-format format --in-place {staged_files}
+      stage_fixed: true
+    ktfmt:
+      # Kotlin official style guide = 4-space indent (matches the rest of the module).
+      glob: "android/src/*.kt"
+      run: ktfmt --kotlinlang-style {staged_files}
+      stage_fixed: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-callkit-telecom",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "CallKit + Jetpack Core-Telecom for Expo / React Native — native call UI, VoIP push, LiveKit-friendly audio. A modern react-native-callkeep alternative.",
   "main": "build/index.js",
   "types": "build/index.d.ts",