@telnyx/react-voice-commons-sdk 1.0.0 → 1.1.1

package/lib/telnyx-voip-client.js

@@ -1,9 +1,62 @@
 'use strict';
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (!desc || ('get' in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, 'default', { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o['default'] = v;
+      });
+var __importStar =
+  (this && this.__importStar) ||
+  (function () {
+    var ownKeys = function (o) {
+      ownKeys =
+        Object.getOwnPropertyNames ||
+        function (o) {
+          var ar = [];
+          for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+          return ar;
+        };
+      return ownKeys(o);
+    };
+    return function (mod) {
+      if (mod && mod.__esModule) return mod;
+      var result = {};
+      if (mod != null)
+        for (var k = ownKeys(mod), i = 0; i < k.length; i++)
+          if (k[i] !== 'default') __createBinding(result, mod, k[i]);
+      __setModuleDefault(result, mod);
+      return result;
+    };
+  })();
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.TelnyxVoipClient = void 0;
 exports.createTelnyxVoipClient = createTelnyxVoipClient;
 exports.destroyTelnyxVoipClient = destroyTelnyxVoipClient;
 exports.createBackgroundTelnyxVoipClient = createBackgroundTelnyxVoipClient;
+const react_native_1 = require('react-native');
 const connection_state_1 = require('./models/connection-state');
 const call_state_1 = require('./models/call-state');
 const config_1 = require('./models/config');
@@ -11,7 +64,9 @@ const session_manager_1 = require('./internal/session/session-manager');
 const call_state_controller_1 = require('./internal/calls/call-state-controller');
 const voice_pn_bridge_1 = require('./internal/voice-pn-bridge');
 const USE_TRICKLE_ICE_STORAGE_KEY = '@use_trickle_ice';
+const PUSH_WHEN_ACTIVE_STORAGE_KEY = '@push_when_active';
 const MISSED_CALL_NOTIFICATIONS_STORAGE_KEY = '@enable_missed_call_notifications';
+const LEGACY_CALLKIT_ANSWER_KEY = '__legacy_callkit_answer__';
 /**
  * The main public interface for the react-voice-commons module.
  *
@@ -50,6 +105,7 @@ class TelnyxVoipClient {
    * @param options Configuration options for the client
    */
   constructor(options = {}) {
+    this._pendingCallKitAnswers = new Map();
     this._disposed = false;
     this._options = {
       enableAppStateManagement: true,
@@ -67,6 +123,7 @@ class TelnyxVoipClient {
       console.log(
         '🔧 TelnyxVoipClient: Client ready, initializing call state controller listeners'
       );
+      this._flushPendingCallKitAnswers();
       this._callStateController.initializeClientListeners();
     });
     // Clear any tracked calls when the session disconnects, so ghosts
@@ -157,6 +214,66 @@ class TelnyxVoipClient {
   getCall(callId) {
     return this._callStateController.getCall(callId);
   }
+  /**
+   * Explicitly set the active call for multi-call scenarios.
+   * @param callId The ID of the call to mark as active
+   */
+  setActiveCall(callId) {
+    this._throwIfDisposed();
+    this._callStateController.setActiveCall(callId);
+  }
+  /**
+   * Clear the explicitly selected active call and return to default selection.
+   */
+  clearActiveCall() {
+    this._throwIfDisposed();
+    this._callStateController.clearActiveCall();
+  }
+  /**
+   * Swap the current active call with a held call.
+   * On iOS this is coordinated through CallKit so native and SDK state stay aligned.
+   *
+   * @param targetCallId ID of the held call to make active
+   */
+  async swapCalls(targetCallId) {
+    this._throwIfDisposed();
+    const activeCall = this.currentActiveCall;
+    const heldCall = this.getCall(targetCallId);
+    if (!activeCall || !heldCall || activeCall.callId === heldCall.callId) {
+      throw new Error('An active call and a different held call are required to swap calls');
+    }
+    if (activeCall.currentState !== call_state_1.TelnyxCallState.ACTIVE) {
+      throw new Error(`Cannot swap active call in state: ${activeCall.currentState}`);
+    }
+    if (heldCall.currentState !== call_state_1.TelnyxCallState.HELD) {
+      throw new Error(`Cannot swap target call in state: ${heldCall.currentState}`);
+    }
+    if (react_native_1.Platform.OS === 'ios') {
+      const { callKitCoordinator } = await Promise.resolve().then(() =>
+        __importStar(require('./callkit/callkit-coordinator'))
+      );
+      if (callKitCoordinator.isAvailable()) {
+        const success = await callKitCoordinator.swapCallsFromUI(
+          activeCall.telnyxCall,
+          heldCall.telnyxCall
+        );
+        if (!success) {
+          throw new Error('CallKit failed to swap calls');
+        }
+        return;
+      }
+    }
+    await activeCall.hold();
+    try {
+      await heldCall.resume();
+      this.setActiveCall(heldCall.callId);
+    } catch (error) {
+      await activeCall.resume().catch((resumeError) => {
+        console.error('Failed to restore active call after swap failure', resumeError);
+      });
+      throw error;
+    }
+  }
   /**
    * Current session ID (UUID) for this connection.
    */
@@ -188,10 +305,11 @@ class TelnyxVoipClient {
     if (this._options.debug) {
       console.log('TelnyxVoipClient: Logging in with credentials for user:', config.sipUser);
     }
-    const loginConfig = {
+    const loginConfig = await this._withNativeVoipPushToken({
       ...config,
       useTrickleIce: config.useTrickleIce ?? this._options.useTrickleIce,
-    };
+    });
+    await voice_pn_bridge_1.VoicePnBridge.setIncomingCallRingtone(loginConfig.incomingCallRingtone);
     // Store credentials for future reconnection
     await this._storeCredentials(loginConfig);
     await this._sessionManager.connectWithCredential(loginConfig);
@@ -214,10 +332,11 @@ class TelnyxVoipClient {
     if (this._options.debug) {
       console.log('TelnyxVoipClient: Logging in with token');
     }
-    const loginConfig = {
+    const loginConfig = await this._withNativeVoipPushToken({
       ...config,
       useTrickleIce: config.useTrickleIce ?? this._options.useTrickleIce,
-    };
+    });
+    await voice_pn_bridge_1.VoicePnBridge.setIncomingCallRingtone(loginConfig.incomingCallRingtone);
     // Store token for future reconnection
     await this._storeToken(loginConfig);
     await this._sessionManager.connectWithToken(loginConfig);
@@ -258,19 +377,30 @@ class TelnyxVoipClient {
       const storedCredentialToken = await AsyncStorage.getItem('@credential_token');
       const storedPushToken = await AsyncStorage.getItem('@push_token');
       const storedUseTrickleIce = await AsyncStorage.getItem(USE_TRICKLE_ICE_STORAGE_KEY);
+      const storedPushWhenActive = await AsyncStorage.getItem(PUSH_WHEN_ACTIVE_STORAGE_KEY);
       const storedMissedCallNotifications = await AsyncStorage.getItem(
         MISSED_CALL_NOTIFICATIONS_STORAGE_KEY
       );
       const useTrickleIce =
         storedUseTrickleIce === null ? this._options.useTrickleIce : storedUseTrickleIce === 'true';
+      const pushWhenActive = storedPushWhenActive === 'true';
       const enableMissedCallNotifications = storedMissedCallNotifications === 'true';
+      const nativePushToken =
+        react_native_1.Platform.OS === 'ios'
+          ? (await voice_pn_bridge_1.VoicePnBridge.getVoipToken())?.trim()
+          : null;
+      const pushNotificationDeviceToken = nativePushToken || storedPushToken;
+      if (nativePushToken && nativePushToken !== storedPushToken) {
+        await AsyncStorage.setItem('@push_token', nativePushToken);
+      }
       // Check if we have credential-based authentication data
       if (storedUsername && storedPassword) {
         // Create credential config from stored data
         const { createCredentialConfig } = require('./models/config');
         const config = createCredentialConfig(storedUsername, storedPassword, {
-          pushNotificationDeviceToken: storedPushToken,
+          pushNotificationDeviceToken,
           useTrickleIce,
+          pushWhenActive,
           enableMissedCallNotifications,
         });
         if (this._options.debug) {
@@ -287,8 +417,9 @@ class TelnyxVoipClient {
         // Create token config from stored data
         const { createTokenConfig } = require('./models/config');
         const config = createTokenConfig(storedCredentialToken, {
-          pushNotificationDeviceToken: storedPushToken,
+          pushNotificationDeviceToken,
           useTrickleIce,
+          pushWhenActive,
           enableMissedCallNotifications,
         });
         if (this._options.debug) {
@@ -403,38 +534,60 @@ class TelnyxVoipClient {
    * This should be called when the user answers from CallKit before the socket connection is established
    * @param customHeaders Optional custom headers to include with the answer
    */
-  queueAnswerFromCallKit(customHeaders = {}) {
+  queueAnswerFromCallKit(callKitUUIDOrHeaders, customHeaders = {}) {
     this._throwIfDisposed();
     if (this._options.debug) {
-      console.log('TelnyxVoipClient: Queuing answer action from CallKit', customHeaders);
+      console.log('TelnyxVoipClient: Queuing answer action from CallKit', {
+        callKitUUIDOrHeaders,
+        customHeaders,
+      });
     }
     const telnyxClient = this._sessionManager.telnyxClient;
     if (telnyxClient && typeof telnyxClient.queueAnswerFromCallKit === 'function') {
-      telnyxClient.queueAnswerFromCallKit(customHeaders);
+      telnyxClient.queueAnswerFromCallKit(callKitUUIDOrHeaders, customHeaders);
     } else {
-      console.warn(
-        'TelnyxVoipClient: TelnyxRTC client not available or method not found for queueAnswerFromCallKit'
-      );
+      const normalizedUUID =
+        typeof callKitUUIDOrHeaders === 'string' ? callKitUUIDOrHeaders.toLowerCase() : undefined;
+      const actionKey = normalizedUUID ?? LEGACY_CALLKIT_ANSWER_KEY;
+      let retainedUUIDOrHeaders = normalizedUUID;
+      if (callKitUUIDOrHeaders && typeof callKitUUIDOrHeaders !== 'string') {
+        retainedUUIDOrHeaders = { ...callKitUUIDOrHeaders };
+      }
+      this._pendingCallKitAnswers.set(actionKey, {
+        callKitUUIDOrHeaders: retainedUUIDOrHeaders,
+        customHeaders: { ...customHeaders },
+      });
     }
   }
   /**
    * Queue an end action for when the call invite arrives (for CallKit integration)
    * This should be called when the user ends from CallKit before the socket connection is established
    */
-  queueEndFromCallKit() {
+  queueEndFromCallKit(callKitUUID) {
     this._throwIfDisposed();
     if (this._options.debug) {
       console.log('TelnyxVoipClient: Queuing end action from CallKit');
     }
     const telnyxClient = this._sessionManager.telnyxClient;
     if (telnyxClient && typeof telnyxClient.queueEndFromCallKit === 'function') {
-      telnyxClient.queueEndFromCallKit();
+      telnyxClient.queueEndFromCallKit(callKitUUID);
     } else {
       console.warn(
         'TelnyxVoipClient: TelnyxRTC client not available or method not found for queueEndFromCallKit'
       );
     }
   }
+  /**
+   * Associate the next push-delivered INVITE with its app-facing CallKit UUID.
+   * The underlying signaling call ID remains unchanged.
+   * @internal
+   */
+  setPushNotificationCallKitUUID(callKitUUID) {
+    const telnyxClient = this._sessionManager.telnyxClient;
+    if (telnyxClient && typeof telnyxClient.setPushNotificationCallKitUUID === 'function') {
+      telnyxClient.setPushNotificationCallKitUUID(callKitUUID);
+    }
+  }
   // ========== Lifecycle Methods ==========
   /**
    * Dispose of the client and clean up all resources.
@@ -443,18 +596,72 @@ class TelnyxVoipClient {
    * This is particularly important for background clients that should be
    * disposed after handling push notifications.
    */
-  dispose() {
-    if (this._disposed) {
-      return;
+  async dispose() {
+    if (this._disposePromise) {
+      return this._disposePromise;
     }
     if (this._options.debug) {
       console.log('TelnyxVoipClient: Disposing client');
     }
     this._disposed = true;
-    this._callStateController.dispose();
-    this._sessionManager.dispose();
+    this._disposePromise = (async () => {
+      try {
+        await this._sessionManager.dispose();
+      } finally {
+        this._pendingCallKitAnswers.clear();
+        this._callStateController.dispose();
+      }
+    })();
+    return this._disposePromise;
   }
   // ========== Private Methods ==========
+  /**
+   * Forward answers captured during cold start as soon as SessionManager has
+   * created the TelnyxRTC instance. SessionManager invokes its ready callback
+   * before connect(), so the UUID-keyed action is present when the INVITE
+   * arrives.
+   */
+  _flushPendingCallKitAnswers() {
+    const telnyxClient = this._sessionManager.telnyxClient;
+    if (!telnyxClient || typeof telnyxClient.queueAnswerFromCallKit !== 'function') {
+      return;
+    }
+    for (const [actionKey, pendingAnswer] of this._pendingCallKitAnswers) {
+      try {
+        telnyxClient.queueAnswerFromCallKit(
+          pendingAnswer.callKitUUIDOrHeaders,
+          pendingAnswer.customHeaders
+        );
+        this._pendingCallKitAnswers.delete(actionKey);
+      } catch (error) {
+        console.error('TelnyxVoipClient: Failed to restore pending CallKit answer', {
+          actionKey,
+          error,
+        });
+      }
+    }
+  }
+  /**
+   * Prefer an explicitly supplied token, otherwise hydrate it from PushKit's
+   * native storage. PushKit registration starts in AppDelegate before React
+   * mounts, so this removes the race between the JS token event and login.
+   */
+  async _withNativeVoipPushToken(config) {
+    if (react_native_1.Platform.OS !== 'ios' || config.pushNotificationDeviceToken?.trim()) {
+      return config;
+    }
+    const nativePushToken = (await voice_pn_bridge_1.VoicePnBridge.getVoipToken())?.trim();
+    if (!nativePushToken) {
+      return config;
+    }
+    if (this._options.debug) {
+      console.log('TelnyxVoipClient: Using PushKit token from native storage');
+    }
+    return {
+      ...config,
+      pushNotificationDeviceToken: nativePushToken,
+    };
+  }
   /**
    * Store credential configuration for automatic reconnection
    */
@@ -467,6 +674,10 @@ class TelnyxVoipClient {
         USE_TRICKLE_ICE_STORAGE_KEY,
         String(config.useTrickleIce ?? false)
       );
+      await AsyncStorage.setItem(
+        PUSH_WHEN_ACTIVE_STORAGE_KEY,
+        String(config.pushWhenActive ?? false)
+      );
       await AsyncStorage.setItem(
         MISSED_CALL_NOTIFICATIONS_STORAGE_KEY,
         String(config.enableMissedCallNotifications ?? false)
@@ -497,6 +708,10 @@ class TelnyxVoipClient {
         USE_TRICKLE_ICE_STORAGE_KEY,
         String(config.useTrickleIce ?? false)
       );
+      await AsyncStorage.setItem(
+        PUSH_WHEN_ACTIVE_STORAGE_KEY,
+        String(config.pushWhenActive ?? false)
+      );
       await AsyncStorage.setItem(
         MISSED_CALL_NOTIFICATIONS_STORAGE_KEY,
         String(config.enableMissedCallNotifications ?? false)
@@ -549,10 +764,11 @@ function createTelnyxVoipClient(options) {
  * Disposes the current singleton so that a subsequent call to
  * `createTelnyxVoipClient()` will create a fresh instance.
  */
-function destroyTelnyxVoipClient() {
-  if (_sharedInstance) {
-    _sharedInstance.dispose();
+async function destroyTelnyxVoipClient() {
+  const sharedInstance = _sharedInstance;
+  if (sharedInstance) {
     _sharedInstance = null;
+    await sharedInstance.dispose();
   }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telnyx/react-voice-commons-sdk",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "A high-level, state-agnostic, drop-in module for the Telnyx React Native SDK that simplifies WebRTC voice calling integration",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -30,7 +30,7 @@
     "dev": "tsc --watch",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "eslint src --ext .ts,.tsx",
+    "lint": "ESLINT_USE_FLAT_CONFIG=false eslint src --ext .ts,.tsx",
     "clean": "rm -rf lib",
     "docs": "typedoc",
     "docs:watch": "typedoc --watch",
@@ -86,7 +86,7 @@
   },
   "dependencies": {
     "@react-native-community/eslint-config": "^3.2.0",
-    "@telnyx/react-native-voice-sdk": ">=1.0.0",
+    "@telnyx/react-native-voice-sdk": ">=1.1.0",
     "eventemitter3": "^5.0.1",
     "expo": "~53.0.22",
     "react-native-url-polyfill": "^3.0.0",
@@ -98,11 +98,13 @@
     "@types/jest": "^29.5.0",
     "@types/react": "~19.0.14",
     "@types/react-native": "^0.72.8",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "eslint": "^8.0.0",
+    "expo-router": "^5.1.0",
     "jest": "^29.5.0",
     "prettier": "^3.0.0",
+    "react": "^19.0.0",
     "ts-jest": "^29.1.0",
     "typedoc": "^0.28.14",
     "typedoc-plugin-markdown": "^4.9.0",