rns-nativecall 0.6.2 → 0.6.4

package/android/src/main/java/com/rnsnativecall/UnlockPromptActivity.kt

@@ -0,0 +1,55 @@
+package com.rnsnativecall
+
+import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.view.WindowManager
+
+class UnlockPromptActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Ensure this activity shows over the lockscreen to trigger the prompt
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+        } else {
+            window.addFlags(
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+            )
+        }
+
+        val km = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+        
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            km.requestDismissKeyguard(this, object : KeyguardManager.KeyguardDismissCallback() {
+                override fun onDismissSucceeded() {
+                    super.onDismissSucceeded()
+                    // Unlock successful, launch the main app
+                    val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+                    startActivity(launchIntent)
+                    finish()
+                }
+
+                override fun onDismissCancelled() {
+                    super.onDismissCancelled()
+                    finish()
+                }
+
+                override fun onDismissError() {
+                    super.onDismissError()
+                    finish()
+                }
+            })
+        } else {
+            // Fallback for older Android versions
+            val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+            startActivity(launchIntent)
+            finish()
+        }
+    }
+}

package/app.plugin.js

@@ -1,4 +1,4 @@
-///app.plugin.js
+////Users/bush/Desktop/Apps/Raiidr/package/app.plugin.js
 const withNativeCallVoip = require('./withNativeCallVoip');
 
 module.exports = function (config) {

package/index.d.ts

@@ -2,50 +2,37 @@ export interface CallData {
     callUuid: string;
     name?: string;
     callType?: 'audio' | 'video';
-    [key: string]: any; // To allow for custom FCM payload data
+    isBusySignal?: boolean;
+    [key: string]: any;
 }
 
-export type CallAcceptedCallback = (data: CallData) => void;
-export type CallRejectedCallback = (data: CallData) => void;
-export type CallFailedCallback = (data: any) => void;
-
-/**
- * Manually request/check Android permissions for Telecom.
- */
-export function ensureAndroidPermissions(): Promise<boolean>;
+export type CallEventType = 'INCOMING_CALL' | 'BUSY';
 
 export interface CallHandlerType {
     /**
-     * Display the Sticky Pill notification UI.
-     * @param uuid Unique call identifier
-     * @param name Caller display name
-     * @param callType 'audio' or 'video'
+     * Registers the Headless JS task. 
+     * Handles Busy signals and Call Validity automatically.
      */
+    registerHeadlessTask(
+        callback: (data: CallData, eventType: CallEventType) => Promise<void>
+    ): void;
+
     displayCall(
         uuid: string,
         name: string,
         callType: 'audio' | 'video',
     ): Promise<boolean>;
 
-    /**
-     * Dismiss the native call UI (Sticky Pill).
-     */
     destroyNativeCallUI(uuid: string): void;
 
+    getInitialCallData(): Promise<any | null>;
 
-    getInitialCallData(): Promise<CallData | null>;
-    /**
-     * Subscribe to call events. Automatically checks for cold-start data 
-     * if the app was opened via the Answer button.
-     * @returns Function to unsubscribe
-     */
     subscribe(
-        onAccept: CallAcceptedCallback,
-        onReject: CallRejectedCallback,
-        onFailed?: CallFailedCallback
+        onAccept: (data: CallData) => void,
+        onReject: (data: CallData) => void,
+        onFailed?: (data: any) => void
     ): () => void;
 }
 
 declare const CallHandler: CallHandlerType;
-
 export default CallHandler;

package/index.js

@@ -1,13 +1,48 @@
 import {
     NativeModules,
     NativeEventEmitter,
+    AppRegistry,
 } from 'react-native';
 
 const { CallModule } = NativeModules;
-
 const callEventEmitter = CallModule ? new NativeEventEmitter(CallModule) : null;
 
 export const CallHandler = {
+    /**
+     * INTERNAL GATEKEEPER: Moves headless logic into the package.
+     * The dev just passes their "NativeCall" function.
+     */
+    registerHeadlessTask: (onAction) => {
+        AppRegistry.registerHeadlessTask('ColdStartCallTask', () => async (data) => {
+            const { callUuid, isBusySignal } = data;
+            const uuid = callUuid?.toLowerCase().trim();
+
+            try {
+                // 1. Handle Busy Signal (Second Caller)
+                if (isBusySignal) {
+                    console.log(`[RNSNativeCall] System busy. Informing app to send busy signal for: ${uuid}`);
+                    if (onAction) await onAction(data, 'BUSY');
+                    return;
+                }
+
+                // 2. Gatekeeping: Check Validity with Native logic
+                const status = await CallModule.checkCallValidity(uuid);
+                if (!status.isValid) {
+                    console.log(`[RNSNativeCall] Aborting task: ${uuid} no longer valid or canceled.`);
+                    if (onAction) await onAction(data, 'ABORTED_CALL');
+                    return;
+                }
+
+                // 3. Valid Incoming Call: Pass to Developer's UI logic
+                if (onAction) {
+                    await onAction(data, 'INCOMING_CALL');
+                }
+            } catch (error) {
+                console.error('[RNSNativeCall] Headless Task Error:', error);
+            }
+        });
+    },
+
     displayCall: async (uuid, name, callType = "audio") => {
         if (!CallModule) return false;
         return await CallModule.displayIncomingCall(uuid.toLowerCase().trim(), name, callType);
@@ -19,10 +54,6 @@ export const CallHandler = {
         }
     },
 
-    /**
-     * Manually check for cold-start data (App killed -> Answered).
-     * Call this in your App.js useEffect.
-     */
     getInitialCallData: async () => {
         if (!CallModule?.getInitialCallData) return null;
         return await CallModule.getInitialCallData();
@@ -40,11 +71,6 @@ export const CallHandler = {
             subs.push(callEventEmitter.addListener('onCallFailed', onFailed));
         }
 
-        // Auto-check on subscribe for convenience
-        CallHandler.getInitialCallData().then((data) => {
-            if (data) onAccept(data);
-        });
-
         return () => subs.forEach(s => s.remove());
     }
 };

package/package.json

@@ -1,37 +1,28 @@
 {
     "name": "rns-nativecall",
-    "version": "0.6.2",
-    "description": "RNS nativecall component with native Android/iOS for handling native call ui, when app is not open or open.",
+    "version": "0.6.4",
+    "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",
     "homepage": "https://github.com/raiidr/rns-nativecall",
     "license": "MIT",
-    "author": {
-        "name": "Your Name",
-        "email": "your.email@example.com"
-    },
+    "author": "Your Name <your.email@example.com>",
     "repository": {
         "type": "git",
-        "url": "https://github.com/raiidr/rns-nativecall.git"
+        "url": "git+https://github.com/raiidr/rns-nativecall.git"
     },
-    "react-native": "index.js",
     "scripts": {
         "p": "npm publish --access public"
     },
-    "expo": {
-        "autolink": true,
-        "plugins": [
-            "./app.plugin.js"
-        ]
-    },
     "keywords": [
         "react-native",
         "nativecall",
-        "call",
-        "native",
-        "call keep",
+        "voip",
+        "callkit",
         "android",
-        "expo"
+        "ios",
+        "expo",
+        "config-plugin"
     ],
     "files": [
         "android",
@@ -39,18 +30,15 @@
         "app.plugin.js",
         "index.d.ts",
         "index.js",
-        "package.json",
         "react-native.config.js",
-        "README.md",
         "rns-nativecall.podspec",
         "withNativeCallVoip.js"
     ],
     "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+        "react-native": ">=0.60.0",
+        "expo": ">=45.0.0"
     },
     "dependencies": {
-        "@expo/config-plugins": "~10.1.1",
-        "rns-nativecall": "^0.5.9"
+        "@expo/config-plugins": "^9.0.0"
     }
 }

package/rns-nativecall.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/your-repo.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/raiidr.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}"
 

package/withNativeCallVoip.js

@@ -5,133 +5,147 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        const imports = [
-            'import android.view.WindowManager',
-            'import android.os.Build',
-            'import android.os.Bundle',
-            'import android.content.Intent',
-            'import android.content.Context' // Added: Required for KEYGUARD_SERVICE
-        ];
-
-        imports.forEach(imp => {
-            if (!contents.includes(imp)) {
-                contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
-            }
-        });
-
-        const wakeLogic = `super.onCreate(savedInstanceState)
-    if (intent?.getBooleanExtra("navigatingToCall", false) == true) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(true)
-            setTurnScreenOn(true)
-        } else {
-            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
+        // Ensure imports exist
+        if (!contents.includes('import android.content.Intent')) {
+            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
         }
-        
-        val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as? android.app.KeyguardManager
-        keyguardManager?.requestDismissKeyguard(this, null)
-    }`;
-
-        if (!contents.includes('setShowWhenLocked')) {
-            contents = contents.replace(/super\.onCreate\(.*\)/, wakeLogic);
+        if (!contents.includes('import android.os.Bundle')) {
+            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.os.Bundle`);
         }
 
-        if (!contents.includes('override fun onNewIntent')) {
-            const onNewIntentCode = `
+        const onNewIntentCode = `
   override fun onNewIntent(intent: Intent) {
     super.onNewIntent(intent)
     setIntent(intent)
-  }\n`;
+    
+    // Only fire JS event if the user actually pressed "Answer"
+    val isAnswerAction = intent.action == "com.rnsnativecall.ACTION_ANSWER"
+    
+    val dataMap = mutableMapOf<String, String>()
+    intent.extras?.keySet()?.forEach { key ->
+        dataMap[key] = intent.extras?.get(key)?.toString() ?: ""
+    }
+
+    if (dataMap.isNotEmpty() && isAnswerAction) {
+        com.rnsnativecall.CallModule.setPendingCallData(dataMap)
+        com.rnsnativecall.CallModule.sendEventToJS("onCallAccepted", dataMap)
+    }
+  }
+`;
+
+        const onCreateCode = `
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    
+    val isAnswerAction = intent.action == "com.rnsnativecall.ACTION_ANSWER"
+    
+    // Logic for Cold Start (App was dead, user answered)
+    if (isAnswerAction) {
+        val dataMap = mutableMapOf<String, String>()
+        intent.extras?.keySet()?.forEach { key ->
+            dataMap[key] = intent.extras?.get(key)?.toString() ?: ""
+        }
+        com.rnsnativecall.CallModule.setPendingCallData(dataMap)
+    }
+
+    // Move to back if it's a background wake (FCM) and NOT an answer click
+    if (intent.getBooleanExtra("background_wake", false) && !isAnswerAction) {
+        moveTaskToBack(true)
+    }
+  }
+`;
+
+        // Inject codes
+        if (!contents.includes('override fun onNewIntent')) {
             const lastBraceIndex = contents.lastIndexOf('}');
             contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
         }
+        if (!contents.includes('override fun onCreate')) {
+            const lastBraceIndex = contents.lastIndexOf('}');
+            contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
+        }
 
         config.modResults.contents = contents;
         return config;
     });
 }
-
 /** 2. ANDROID MANIFEST CONFIG **/
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
-        const androidManifest = config.modResults.manifest;
-        const mainApplication = androidManifest.application[0];
-
-        // Permissions
+        const manifest = config.modResults;
+        const application = manifest.manifest.application[0];
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
             'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
             'android.permission.POST_NOTIFICATIONS',
+            'android.permission.SYSTEM_ALERT_WINDOW',
             'android.permission.WAKE_LOCK',
-            'android.permission.MANAGE_OWN_CALLS',
-            'android.permission.DISABLE_KEYGUARD',
-            'android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS',
-            'android.permission.RECEIVE_BOOT_COMPLETED'
+            'android.permission.DISABLE_KEYGUARD'
         ];
-
-        androidManifest['uses-permission'] = androidManifest['uses-permission'] || [];
+        manifest.manifest['uses-permission'] = manifest.manifest['uses-permission'] || [];
         permissions.forEach((perm) => {
-            if (!androidManifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
-                androidManifest['uses-permission'].push({ $: { 'android:name': perm } });
+            if (!manifest.manifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
+                manifest.manifest['uses-permission'].push({ $: { 'android:name': perm } });
             }
         });
-
-        // Activity Registration: AcceptCallActivity
-        mainApplication.activity = mainApplication.activity || [];
-        if (!mainApplication.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
-            mainApplication.activity.push({
+        application.activity = application.activity || [];
+        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
+            application.activity.push({
                 $: {
                     'android:name': 'com.rnsnativecall.AcceptCallActivity',
                     'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
-                    'android:exported': 'true', // CHANGE TO TRUE
+                    'android:excludeFromRecents': 'true',
+                    'android:noHistory': 'true',
+                    'android:exported': 'false',
+                    'android:launchMode': 'singleInstance',
                     'android:showWhenLocked': 'true',
-                    'android:turnScreenOn': 'true',
-                    'android:launchMode': 'singleInstance' // Add this to prevent multiple instances
+                    'android:turnScreenOn': 'true'
                 }
             });
         }
-
-        // Receiver Registration: CallActionReceiver
-        mainApplication.receiver = mainApplication.receiver || [];
-        if (!mainApplication.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
-            mainApplication.receiver.push({
+        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.UnlockPromptActivity')) {
+            application.activity.push({
                 $: {
-                    'android:name': 'com.rnsnativecall.CallActionReceiver',
-                    'android:exported': 'false'
+                    'android:name': 'com.rnsnativecall.UnlockPromptActivity',
+                    'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
+                    'android:excludeFromRecents': 'true',
+                    'android:noHistory': 'true',
+                    'android:exported': 'false',
+                    'android:launchMode': 'singleInstance',
+                    'android:showWhenLocked': 'true',
+                    'android:turnScreenOn': 'true'
                 }
             });
         }
-
-        mainApplication.service = mainApplication.service || [];
-
-        // Messaging Service
-        if (!mainApplication.service.some(s => s.$['android:name'] === 'com.rnsnativecall.CallMessagingService')) {
-            mainApplication.service.push({
-                $: { 'android:name': 'com.rnsnativecall.CallMessagingService', 'android:exported': 'false' },
+        application.service = application.service || [];
+        const firebaseServiceName = 'com.rnsnativecall.CallMessagingService';
+        if (!application.service.some(s => s.$['android:name'] === firebaseServiceName)) {
+            application.service.push({
+                $: { 'android:name': firebaseServiceName, 'android:exported': 'false' },
                 'intent-filter': [{ action: [{ $: { 'android:name': 'com.google.firebase.MESSAGING_EVENT' } }] }]
             });
         }
-
-        // Headless Task Service (Android 14)
-        const headlessName = 'com.rnsnativecall.CallHeadlessTask';
-        const headlessIndex = mainApplication.service.findIndex(s => s.$['android:name'] === headlessName);
-        const headlessEntry = {
-            $: {
-                'android:name': headlessName,
-                'android:exported': 'false',
-                'android:foregroundServiceType': 'phoneCall'
-            }
-        };
-
-        if (headlessIndex > -1) mainApplication.service[headlessIndex] = headlessEntry;
-        else mainApplication.service.push(headlessEntry);
+        const headlessServiceName = 'com.rnsnativecall.CallHeadlessTask';
+        if (!application.service.some(s => s.$['android:name'] === headlessServiceName)) {
+            application.service.push({
+                $: { 'android:name': headlessServiceName, 'android:exported': 'false' }
+            });
+        }
+        application.receiver = application.receiver || [];
+        const receiverName = 'com.rnsnativecall.CallActionReceiver';
+        if (!application.receiver.some(r => r.$['android:name'] === receiverName)) {
+            application.receiver.push({
+                $: { 'android:name': receiverName, 'android:exported': 'false' }
+            });
+        }
 
         return config;
     });
 }
 
+/** 3. IOS CONFIG **/
 function withIosConfig(config) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;