@cometchat/calls-sdk-react-native 5.0.2 → 5.0.3

package/android/src/main/java/com/callingv5/AudioDeviceHandlerGeneric.java

@@ -25,6 +25,7 @@ import android.os.Build;
 import com.cometchat.calls.utils.CometChatLogger;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 
@@ -81,6 +82,8 @@ import java.util.Set;
              for (AudioDeviceInfo info: deviceInfos) {
                  switch (info.getType()) {
                      case AudioDeviceInfo.TYPE_BLUETOOTH_SCO:
+                     case AudioDeviceInfo.TYPE_BLE_HEADSET:
+                     case AudioDeviceInfo.TYPE_BLE_SPEAKER:
                          devices.add(AudioModeModule.DEVICE_BLUETOOTH);
                          break;
                      case AudioDeviceInfo.TYPE_BUILTIN_EARPIECE:
@@ -170,6 +173,58 @@ import java.util.Set;
          });
      }
 
+     /**
+      * Returns the {@link AudioDeviceInfo} types that can satisfy the given
+      * "DEVICE_" constant, in order of preference.
+      */
+     private static int[] communicationDeviceTypes(String device) {
+         switch (device) {
+             case AudioModeModule.DEVICE_SPEAKER:
+                 return new int[] { AudioDeviceInfo.TYPE_BUILTIN_SPEAKER };
+             case AudioModeModule.DEVICE_EARPIECE:
+                 return new int[] { AudioDeviceInfo.TYPE_BUILTIN_EARPIECE };
+             case AudioModeModule.DEVICE_BLUETOOTH:
+                 return new int[] {
+                     AudioDeviceInfo.TYPE_BLUETOOTH_SCO,
+                     AudioDeviceInfo.TYPE_BLE_HEADSET,
+                     AudioDeviceInfo.TYPE_BLE_SPEAKER
+                 };
+             case AudioModeModule.DEVICE_HEADPHONES:
+                 return new int[] {
+                     AudioDeviceInfo.TYPE_WIRED_HEADSET,
+                     AudioDeviceInfo.TYPE_WIRED_HEADPHONES,
+                     TYPE_USB_HEADSET,
+                     TYPE_HEARING_AID
+                 };
+             default:
+                 return new int[0];
+         }
+     }
+
+     /**
+      * Sets the audio route using the modern (API 31+) communication device
+      * API. Unlike the deprecated setSpeakerphoneOn() / startBluetoothSco()
+      * calls, a setCommunicationDevice() request participates in the system's
+      * per-client route arbitration and takes precedence over stale requests
+      * left behind by other libraries in the same app.
+      */
+     private void setCommunicationRoute(String device) {
+         List<AudioDeviceInfo> availableDevices = audioManager.getAvailableCommunicationDevices();
+
+         for (int type : communicationDeviceTypes(device)) {
+             for (AudioDeviceInfo info : availableDevices) {
+                 if (info.getType() == type) {
+                     if (audioManager.setCommunicationDevice(info)) {
+                         return;
+                     }
+                     CometChatLogger.w(TAG, "setCommunicationDevice failed for type: " + type);
+                 }
+             }
+         }
+
+         CometChatLogger.w(TAG, "No available communication device for: " + device);
+     }
+
      /**
       * Helper method to set the output route to a Bluetooth device.
       *
@@ -205,6 +260,11 @@ import java.util.Set;
 
      @Override
      public void setAudioRoute(String device) {
+         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+             setCommunicationRoute(device);
+             return;
+         }
+
          // Turn speaker on / off
          audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
 
@@ -218,8 +278,12 @@ import java.util.Set;
              audioFocusLost = false;
              audioManager.setMode(AudioManager.MODE_NORMAL);
              audioManager.abandonAudioFocus(this);
-             audioManager.setSpeakerphoneOn(false);
-             setBluetoothAudioRoute(false);
+             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                 audioManager.clearCommunicationDevice();
+             } else {
+                 audioManager.setSpeakerphoneOn(false);
+                 setBluetoothAudioRoute(false);
+             }
 
              return true;
          }
@@ -251,4 +315,4 @@ import java.util.Set;
 
          return true;
      }
- }
+ }

package/dist/index.d.mts

@@ -1775,9 +1775,42 @@ declare const CallAppSettingsSchema: v.ObjectSchema<{
   readonly adminHost: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   readonly clientHost: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   readonly host: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+  /**
+   * Caller opt-out for SDK-identification telemetry. When `true`, the Calls SDK never
+   * self-reports to `/user_sessions` (checked at the send chokepoint, so it covers both
+   * the init session-restore path and every login-success path). Defaults to sending.
+   */
+  readonly disableSdkIdentification: v.OptionalSchema<v.BooleanSchema<undefined>, undefined>;
 }, undefined>;
 type CallAppSettings = v.InferOutput<typeof CallAppSettingsSchema>;
 //#endregion
+//#region src/settings.d.ts
+interface CometChatSettings {
+  appId: string;
+  region: string;
+  credentials?: {
+    authKey?: string;
+  };
+  callsSDK?: {
+    adminHost?: string | null;
+    clientHost?: string | null;
+    host?: string | null;
+    disableSdkIdentification?: boolean | null;
+  };
+  chatSDK?: Record<string, unknown>;
+  uiKit?: Record<string, unknown>;
+}
+/**
+ * Maps a `cometchat-settings.json` object onto the Calls SDK's own `CallAppSettings`
+ * shape. Kept parallel to how the Chat SDK's `initFromSettings` maps the same file onto
+ * its internal `AppSettings`: `appId`/`region` at the root, `authKey` under
+ * `credentials`, and host overrides under the SDK-specific (`callsSDK`) section.
+ *
+ * The result is passed to the same valibot schema `init` uses, so validation stays
+ * identical across both entry points.
+ */
+declare function callAppSettingsFromSettings(settings: CometChatSettings): CallAppSettings;
+//#endregion
 //#region src/native-communication/native-to-js.native.d.ts
 declare function setupNativeEventListeners(): void;
 //#endregion
@@ -4386,6 +4419,34 @@ declare class CometChatCalls extends SessionMethodsCore {
     readonly success: true;
     readonly error: null;
   }>;
+  /**
+   * Shared tail of {@link init} / {@link initFromSettings}. Both entry points validate
+   * and map their own inputs, then hand the validated {@link CallAppSettings} here so
+   * the post-validation work — persisting the telemetry integration source (BEFORE any
+   * report) and firing SDK-identification once on a restored session — lives in exactly
+   * one place and cannot drift between the two paths. The ONLY per-entry-point
+   * difference is `integrationSource`.
+   */
+  private static finalizeInit;
+  /**
+   * Initializes the CometChat Calls SDK from a `cometchat-settings.json` object.
+   * Parallels the Chat SDK's `initFromSettings` (file-based init for skills-driven
+   * integrations): it maps the shared settings shape onto the Calls SDK's own
+   * `CallAppSettings` and then performs exactly the same work as {@link init}.
+   * @param settings - Parsed `cometchat-settings.json` object.
+   * @returns An object indicating success or failure with error details.
+   */
+  static initFromSettings(settings: CometChatSettings): Promise<{
+    readonly success: false;
+    readonly error: {
+      readonly name: "VALIDATION_ERROR";
+      readonly message: `Invalid app settings: ${string}`;
+      readonly timestamp: number;
+    };
+  } | {
+    readonly success: true;
+    readonly error: null;
+  }>;
   /**
    * Logs in a user with their UID and an optional auth key.
    * If no auth key is provided, the one from app settings is used.
@@ -4446,11 +4507,17 @@ declare class CometChatCalls extends SessionMethodsCore {
     token: string;
   }>;
   private static getBaseURL;
+  /**
+   * SDK-identification telemetry chokepoint. Fire-and-forget, deduped, non-fatal.
+   * Called from login success AND init()-session-restore. Sends `/user_sessions`
+   * ONLY when the Chat SDK is absent (it otherwise handles this telemetry itself).
+   * Never awaited on the happy path; never throws.
+   */
+  private static reportSdkIdentification;
   private static loginWithUID;
   private static authenticateWithToken;
   private static logoutInternal;
   private static callGenerateTokenAPI;
-  private static callVerifyTokenAPI;
   private static getStorageKey;
   private static saveUser;
   private static getSavedUser;

package/dist/index.d.ts

@@ -1775,9 +1775,42 @@ declare const CallAppSettingsSchema: v.ObjectSchema<{
   readonly adminHost: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   readonly clientHost: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   readonly host: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+  /**
+   * Caller opt-out for SDK-identification telemetry. When `true`, the Calls SDK never
+   * self-reports to `/user_sessions` (checked at the send chokepoint, so it covers both
+   * the init session-restore path and every login-success path). Defaults to sending.
+   */
+  readonly disableSdkIdentification: v.OptionalSchema<v.BooleanSchema<undefined>, undefined>;
 }, undefined>;
 type CallAppSettings = v.InferOutput<typeof CallAppSettingsSchema>;
 //#endregion
+//#region src/settings.d.ts
+interface CometChatSettings {
+  appId: string;
+  region: string;
+  credentials?: {
+    authKey?: string;
+  };
+  callsSDK?: {
+    adminHost?: string | null;
+    clientHost?: string | null;
+    host?: string | null;
+    disableSdkIdentification?: boolean | null;
+  };
+  chatSDK?: Record<string, unknown>;
+  uiKit?: Record<string, unknown>;
+}
+/**
+ * Maps a `cometchat-settings.json` object onto the Calls SDK's own `CallAppSettings`
+ * shape. Kept parallel to how the Chat SDK's `initFromSettings` maps the same file onto
+ * its internal `AppSettings`: `appId`/`region` at the root, `authKey` under
+ * `credentials`, and host overrides under the SDK-specific (`callsSDK`) section.
+ *
+ * The result is passed to the same valibot schema `init` uses, so validation stays
+ * identical across both entry points.
+ */
+declare function callAppSettingsFromSettings(settings: CometChatSettings): CallAppSettings;
+//#endregion
 //#region src/native-communication/native-to-js.native.d.ts
 declare function setupNativeEventListeners(): void;
 //#endregion
@@ -4386,6 +4419,34 @@ declare class CometChatCalls extends SessionMethodsCore {
     readonly success: true;
     readonly error: null;
   }>;
+  /**
+   * Shared tail of {@link init} / {@link initFromSettings}. Both entry points validate
+   * and map their own inputs, then hand the validated {@link CallAppSettings} here so
+   * the post-validation work — persisting the telemetry integration source (BEFORE any
+   * report) and firing SDK-identification once on a restored session — lives in exactly
+   * one place and cannot drift between the two paths. The ONLY per-entry-point
+   * difference is `integrationSource`.
+   */
+  private static finalizeInit;
+  /**
+   * Initializes the CometChat Calls SDK from a `cometchat-settings.json` object.
+   * Parallels the Chat SDK's `initFromSettings` (file-based init for skills-driven
+   * integrations): it maps the shared settings shape onto the Calls SDK's own
+   * `CallAppSettings` and then performs exactly the same work as {@link init}.
+   * @param settings - Parsed `cometchat-settings.json` object.
+   * @returns An object indicating success or failure with error details.
+   */
+  static initFromSettings(settings: CometChatSettings): Promise<{
+    readonly success: false;
+    readonly error: {
+      readonly name: "VALIDATION_ERROR";
+      readonly message: `Invalid app settings: ${string}`;
+      readonly timestamp: number;
+    };
+  } | {
+    readonly success: true;
+    readonly error: null;
+  }>;
   /**
    * Logs in a user with their UID and an optional auth key.
    * If no auth key is provided, the one from app settings is used.
@@ -4446,11 +4507,17 @@ declare class CometChatCalls extends SessionMethodsCore {
     token: string;
   }>;
   private static getBaseURL;
+  /**
+   * SDK-identification telemetry chokepoint. Fire-and-forget, deduped, non-fatal.
+   * Called from login success AND init()-session-restore. Sends `/user_sessions`
+   * ONLY when the Chat SDK is absent (it otherwise handles this telemetry itself).
+   * Never awaited on the happy path; never throws.
+   */
+  private static reportSdkIdentification;
   private static loginWithUID;
   private static authenticateWithToken;
   private static logoutInternal;
   private static callGenerateTokenAPI;
-  private static callVerifyTokenAPI;
   private static getStorageKey;
   private static saveUser;
   private static getSavedUser;