@expofp/react-native-efp-crowdconnected 0.1.5 → 0.1.6

package/ExpofpCrowdconnected.podspec

@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency 'CrowdConnectedShared', '2.3.0'
-  s.dependency 'CrowdConnectedCore', '2.3.0'
-  s.dependency 'CrowdConnectedIPS', '2.3.0'
-  s.dependency 'CrowdConnectedCoreBluetooth', '2.3.0'
-  s.dependency 'CrowdConnectedGeo', '2.3.0'
+  s.vendored_frameworks = 'ios/Frameworks/CrowdConnectedCore.xcframework',
+                          'ios/Frameworks/CrowdConnectedCoreBluetooth.xcframework',
+                          'ios/Frameworks/CrowdConnectedGeo.xcframework',
+                          'ios/Frameworks/CrowdConnectedIPS.xcframework',
+                          'ios/Frameworks/CrowdConnectedShared.xcframework'
 
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -80,8 +80,8 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
   implementation "androidx.fragment:fragment-ktx:1.6.2"
 
-  implementation "net.crowdconnected.android.core:android-core:2.1.3"
-  implementation "net.crowdconnected.android.ips:android-ips:2.1.3"
-  implementation "net.crowdconnected.android.geo:android-geo:2.1.3"
-  implementation "net.crowdconnected.android.background:android-background:2.1.3"
+  implementation "net.crowdconnected.android.core:android-core:3.0.0"
+  implementation "net.crowdconnected.android.ips:android-ips:3.0.0"
+  implementation "net.crowdconnected.android.geo:android-geo:3.0.0"
+  implementation "net.crowdconnected.android.background:android-background:3.0.0"
 }

package/android/src/main/java/com/expofpcrowdconnected/ExpoFpCrowdConnectedLocationProviderSettings.kt

@@ -25,11 +25,18 @@ enum class ExpoFpCrowdConnectedNavigationType {
 
 /**
  * Settings for CrowdConnected location provider
- * Maps to ExpoFpLocationSettings TypeScript interface
+ * Maps to ExpoFpLocationSettings TypeScript interface.
+ *
+ * Note: since CrowdConnected SDK v3.0.0, the authentication scheme changed.
+ * The JS-facing fields `token` and `secret` are kept for API compatibility, but
+ * internally they are passed to the v3 SDK as `clientId` and `clientSecret`
+ * via `Configuration.builder().withCredentials(appKey, token, secret)`.
  */
 data class ExpoFpCrowdConnectedLocationProviderSettings(
     val appKey: String,
+    /** Passed to CrowdConnected v3 SDK as client ID (exposed as `token` in JS for backward compatibility). */
     val token: String,
+    /** Passed to CrowdConnected v3 SDK as client secret (exposed as `secret` in JS for backward compatibility). */
     val secret: String,
     val navigationType: ExpoFpCrowdConnectedNavigationType = ExpoFpCrowdConnectedNavigationType.ALL,
     val isBackgroundUpdateEnabled: Boolean = false,

package/android/src/main/java/com/expofpcrowdconnected/ExpoFpPosition.kt

@@ -2,7 +2,6 @@ package com.expofpcrowdconnected
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import net.crowdconnected.android.core.LocationType
 
 /**
  * Floor type - can be either an index (number) or a name (string)
@@ -58,7 +57,7 @@ data class ExpoFpPosition(
          * Position data mapping: IPS has x/y, GEO has lat/lng, both are mutually exclusive
          */
         fun fromCrowdConnected(
-            locationType: LocationType?,
+            locationType: String?,
             xPixels: Double?,
             yPixels: Double?,
             floor: Int?,
@@ -67,7 +66,7 @@ data class ExpoFpPosition(
             angle: Double? = null
         ): ExpoFpPosition {
             val z: ExpoFpFloorType? = floor?.let { ExpoFpFloorType.Index(it) }
-            val type = locationType?.toString()?.uppercase().orEmpty()
+            val type = locationType?.uppercase().orEmpty()
 
             return when (type) {
                 "IPS" -> ExpoFpPosition(

package/android/src/main/java/com/expofpcrowdconnected/RCTCrowdConnectedLocationProviderModule.kt

@@ -27,10 +27,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import net.crowdconnected.android.core.CrowdConnected
-import net.crowdconnected.android.core.StatusCallback
+import net.crowdconnected.android.core.Callback
 import net.crowdconnected.android.core.Configuration
-import net.crowdconnected.android.core.ConfigurationBuilder
+import net.crowdconnected.android.core.CrowdConnected
+import net.crowdconnected.android.core.ErrorCode
+import net.crowdconnected.android.core.Location
 import net.crowdconnected.android.geo.GeoModule
 import net.crowdconnected.android.ips.IPSModule
 
@@ -403,20 +404,31 @@ class RCTCrowdConnectedLocationProviderModule(
             }
         }
 
-        // Build CrowdConnected configuration
-        val statusCallback = object : StatusCallback {
-            override fun onStartUpSuccess() {
-                Log.d(TAG, "StatusCallback: SDK startup successful")
+        // Build CrowdConnected v3 Callback: combines startup status and location updates
+        val callback = object : Callback {
+            override fun onStartSuccess(deviceId: String) {
+                Log.d(TAG, "Callback.onStartSuccess, deviceId=$deviceId")
                 cancelTimeoutJob()
-                registerPositionCallback()
-                CrowdConnected.getInstance()?.getDeviceId()?.let {
-                    providerInfo = providerInfo.copy(deviceId = it)
+                providerInfo = providerInfo.copy(deviceId = deviceId)
+
+                // setAlias is only reachable after start succeeds — getInstance() is null before this.
+                if (currentSettings.aliases.isNotEmpty()) {
+                    val cc = CrowdConnected.getInstance()
+                    if (cc != null) {
+                        Log.d(TAG, "Applying ${currentSettings.aliases.size} aliases")
+                        currentSettings.aliases.forEach { (key, value) ->
+                            runCatching { cc.setAlias(key, value) }
+                                .onFailure { Log.w(TAG, "setAlias failed for key=$key: ${it.message}") }
+                        }
+                    }
                 }
             }
 
-            override fun onStartUpFailure(reason: String) {
-                Log.e(TAG, "StatusCallback: SDK startup failed: $reason")
-                sendErrorEvent("StartUp Failure: $reason")
+            override fun onStartFailure(errorCode: ErrorCode) {
+                cancelTimeoutJob()
+                val message = runCatching { errorCode.message }.getOrNull() ?: errorCode.name
+                Log.e(TAG, "Callback.onStartFailure: $message")
+                sendErrorEvent("StartUp Failure: $message")
                 moduleScope.launch {
                     mutex.withLock {
                         stopUpdatingLocationInternal()
@@ -424,17 +436,39 @@ class RCTCrowdConnectedLocationProviderModule(
                 }
             }
 
-            override fun onRuntimeError(error: String) {
-                Log.e(TAG, "StatusCallback: Runtime error: $error")
-                sendErrorEvent("Runtime Error: $error")
+            override fun onUpdateLocation(location: Location) {
+                if (!providerInfo.isLocationUpdating) return
+                // SDK may deliver updates from a background thread — hop to main for state writes.
+                moduleScope.launch {
+                    val angle = azimuthProvider?.azimuth
+                    val expoFpPosition = ExpoFpPosition.fromCrowdConnected(
+                        // v3 SDK obfuscates LocationType class — pass its toString() to keep
+                        // our wrapper free of any reference to internal SDK types.
+                        locationType = location.locationType?.toString(),
+                        xPixels = location.xPixels,
+                        yPixels = location.yPixels,
+                        floor = location.floor,
+                        latitude = location.latitude,
+                        longitude = location.longitude,
+                        angle = angle
+                    )
+                    currentPosition = expoFpPosition
+                    sendLocationEvent(expoFpPosition)
+                }
             }
         }
 
-        val builder = ConfigurationBuilder()
-            .withAppKey(currentSettings.appKey)
-            .withToken(currentSettings.token)
-            .withSecret(currentSettings.secret)
-            .withStatusCallback(statusCallback)
+        val app = reactApplicationContext.applicationContext as Application
+        val builder = Configuration.builder()
+            .withContext(app)
+            // v3 SDK credentials — JS-level `token`/`secret` fields are passed through
+            // as the SDK's clientId/clientSecret for backward-compatible API.
+            .withCredentials(
+                currentSettings.appKey,
+                currentSettings.token,
+                currentSettings.secret
+            )
+            .withCallback(callback)
 
         // Add modules based on navigation type
         when (currentSettings.navigationType) {
@@ -452,7 +486,7 @@ class RCTCrowdConnectedLocationProviderModule(
 
         // Set foreground service notification if background updates are enabled
         if (currentSettings.isBackgroundUpdateEnabled) {
-            builder.withServiceNotificationInfo(
+            builder.withForegroundServiceConfig(
                 NOTIFICATION_TITLE,
                 NOTIFICATION_ICON
             )
@@ -463,22 +497,13 @@ class RCTCrowdConnectedLocationProviderModule(
         // Start timeout job before starting SDK
         startTimeoutJob(promise)
 
-        // Start CrowdConnected SDK
+        // Start CrowdConnected SDK (v3: static, context passed via withContext above)
         try {
-            val app = reactApplicationContext.applicationContext as Application
-            CrowdConnected.start(app, config)
+            CrowdConnected.start(config)
 
             Log.i(TAG, "CrowdConnected SDK start initiated")
             isStarted = true
 
-            // Apply aliases
-            if (currentSettings.aliases.isNotEmpty()) {
-                Log.d(TAG, "Applying ${currentSettings.aliases.size} aliases")
-                currentSettings.aliases.forEach { (key, value) ->
-                    CrowdConnected.getInstance()?.setAlias(key, value)
-                }
-            }
-
             promise.resolve(providerInfo.toWritableMap())
         } catch (e: Exception) {
             Log.e(TAG, "CrowdConnected SDK start failed with exception", e)
@@ -505,17 +530,10 @@ class RCTCrowdConnectedLocationProviderModule(
         isStarted = false
         providerInfo = providerInfo.copy(isLocationUpdating = false)
 
-        // Deregister position callback
-        Log.d(TAG, "stopUpdatingLocationInternal: Deregistering position callback")
-        CrowdConnected.getInstance()?.deregisterPositionCallback()
-
-        // Stop CrowdConnected SDK
-        try {
-            Log.d(TAG, "stopUpdatingLocationInternal: Stopping CrowdConnected SDK")
-            CrowdConnected.getInstance()?.stop()
-        } catch (e: Exception) {
-            Log.e(TAG, "stopUpdatingLocationInternal: Error stopping CrowdConnected SDK", e)
-        }
+        // Stop CrowdConnected SDK (v3: static, idempotent — wrap for safety)
+        Log.d(TAG, "stopUpdatingLocationInternal: Stopping CrowdConnected SDK")
+        runCatching { CrowdConnected.stop() }
+            .onFailure { Log.e(TAG, "stopUpdatingLocationInternal: Error stopping SDK", it) }
 
         // Stop azimuth provider
         if (azimuthProvider != null) {
@@ -528,31 +546,6 @@ class RCTCrowdConnectedLocationProviderModule(
         Log.i(TAG, "stopUpdatingLocationInternal: Location updates stopped")
     }
 
-    /**
-     * Register callback for position updates from CrowdConnected SDK
-     */
-    private fun registerPositionCallback() {
-        CrowdConnected.getInstance()?.registerPositionCallback { position ->
-            // Ensure we're on the main thread for React Native event emission
-            moduleScope.launch {
-                val angle = azimuthProvider?.azimuth
-
-                val expoFpPosition = ExpoFpPosition.fromCrowdConnected(
-                    locationType = position.locationType,
-                    xPixels = position.xPixels,
-                    yPixels = position.yPixels,
-                    floor = position.floor,
-                    latitude = position.latitude,
-                    longitude = position.longitude,
-                    angle = angle
-                )
-
-                currentPosition = expoFpPosition
-                sendLocationEvent(expoFpPosition)
-            }
-        }
-    }
-
     /**
      * Send location change event to JavaScript
      */

package/ios/ExpoFpLocationProvider/ExpoFpCrowdConnectedLocationProviderSettings.swift

@@ -11,21 +11,16 @@ import CrowdConnectedCore
 /// Settings for `ExpoFpCrowdConnectedLocationProvider` initialization.
 struct ExpoFpCrowdConnectedLocationProviderSettings {
 
-  /// Authentication credentials: `AppKey`, `Token`, `Secret`.
-  ///
-  /// For `AppKey` [register here](https://app.crowdconnected.com/register).
-  ///
-  /// For more information use [Tokens gude](https://customer.support.crowdconnected.com/servicedesk/customer/article/2888139205).
-  let credentials: SDKCredentials
+  let credentials: Credentials
 
-  /// Navigation type to enable.
-  let navigationType: ExpoFpCrowdConnectedNavigationType
+  /// SDK Configuration containing authentication Credentials and tracking mode.
+  let configuration: Configuration
 
-  /// Tracking mode: `foregroundOnly` or `foregroundAndBackground`.
-  let trackingMode: LocationTrackingMode
+  /// Navigation type to enable.
+  var modules: [Module] { configuration.modules }
 
-  /// Enables CrowdConnected CoreBluetooth positioning.
-  let isBluetoothEnabled: Bool
+  /// Tracking mode: `foreground` or `background`.
+  var trackingMode: LocationTrackingMode { configuration.trackingMode }
 
   /// Enables 'heading' on the map using build-in native CoreLocation tools.
   let isHeadingEnabled: Bool
@@ -39,21 +34,39 @@ struct ExpoFpCrowdConnectedLocationProviderSettings {
     let appKey = settings.appKey.replacingOccurrences(of: " ", with: "")
     if appKey.isEmpty { throw ExpoFpError.locationProviderError(message: Self.message(for: .missingAppKey)) }
 
-    let token = settings.token.replacingOccurrences(of: " ", with: "")
-    if token.isEmpty { throw ExpoFpError.locationProviderError(message: Self.message(for: .missingToken)) }
+    let clientId = settings.token.replacingOccurrences(of: " ", with: "")
+    if clientId.isEmpty { throw ExpoFpError.locationProviderError(message: Self.message(for: .missingToken)) }
+
+    let clientSecret = settings.secret.replacingOccurrences(of: " ", with: "")
+    if clientSecret.isEmpty { throw ExpoFpError.locationProviderError(message: Self.message(for: .missingSecret)) }
+
+    self.credentials = Credentials(appKey: appKey, clientId: clientId, clientSecret: clientSecret)
 
-    let secret = settings.secret.replacingOccurrences(of: " ", with: "")
-    if secret.isEmpty { throw ExpoFpError.locationProviderError(message: Self.message(for: .missingSecret)) }
+    var modules: [Module] = switch settings.navigationType {
+    case .all: [.geo, .ips]
+    case .geo: [.geo]
+    case .ips: [.ips]
+    }
+
+    if settings.isBluetoothEnabled {
+      modules.append(.coreBluetooth)
+    }
+
+    let trackingMode: LocationTrackingMode = settings.isBackgroundUpdateEnabled ? .background : .foreground
+
+    if modules.isEmpty || (modules.count == 1 && modules.first == .coreBluetooth) {
+      throw ExpoFpError.locationProviderError(message: Self.message(for: .noModulesAreActive))
+    }
 
-    self.credentials = SDKCredentials(appKey: appKey, token: token, secret: secret)
+    if modules.contains(where: \.isBluetoothEnabled) { try Self.checkBluetoothPermissions() }
 
-    let trackingMode = settings.isBackgroundUpdateEnabled ? LocationTrackingMode.foregroundAndBackground : .foregroundOnly
     try Self.checkLocationPermissions(for: trackingMode)
-    self.trackingMode = trackingMode
-    self.navigationType = settings.navigationType
 
-    if settings.isBluetoothEnabled { try Self.checkBluetoothPermissions() }
-    self.isBluetoothEnabled = settings.isBluetoothEnabled
+    self.configuration = Configuration(
+      credentials: credentials,
+      modules: modules,
+      trackingMode: trackingMode
+    )
 
     self.isHeadingEnabled = settings.isHeadingEnabled
     self.aliases = settings.aliases ?? [:]
@@ -87,7 +100,7 @@ struct ExpoFpCrowdConnectedLocationProviderSettings {
     }
   }
 
-  private static func message(for result: CrowdConnectedValidationResult) -> String {
+  private static func message(for result: ErrorCode) -> String {
     result.description
   }
 

package/ios/Extensions/{LocationTrackingMode+Extensions.swift → CrowdConnected+Extensions.swift}

@@ -1,5 +1,5 @@
 //
-//  LocationTrackingMode+Extensions.swift
+//  CrowdConnected+Extensions.swift
 //  ExpoFpCrowdConnected
 //
 //  Created by Nikita Kolesnikov on 24.09.2025.
@@ -9,8 +9,9 @@
 import CrowdConnectedCore
 
 extension LocationTrackingMode {
+  var isAllowedInBackground: Bool { self == .background }
+}
 
-    var isAllowedInBackground: Bool {
-        self == .foregroundAndBackground
-    }
+extension Module {
+  var isBluetoothEnabled: Bool { self == .coreBluetooth }
 }

package/ios/Frameworks/CrowdConnectedCore.xcframework/Info.plist

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>CrowdConnectedCore.framework/CrowdConnectedCore</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>CrowdConnectedCore.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>CrowdConnectedCore.framework/CrowdConnectedCore</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>CrowdConnectedCore.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>