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

package/ios/Frameworks/CrowdConnectedShared.xcframework/ios-arm64_x86_64-simulator/CrowdConnectedShared.framework/_CodeSignature/CodeResources

@@ -0,0 +1,256 @@
+<?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>files</key>
+	<dict>
+		<key>Headers/CrowdConnectedShared-Swift.h</key>
+		<data>
+		r0JBpBHRtvFloGf17pBpisUymcw=
+		</data>
+		<key>Headers/CrowdConnectedShared.h</key>
+		<data>
+		Rrnvd7Jt7D3huSxGLMPJ2Kv2OW8=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		9SDDLHYp0SFNb0fSfaNV6J+0mKE=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<data>
+		sTxMwgzj8lPg1mReAjh4O8sU//Y=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
+		<data>
+		1xwVvqvupU0VuIr+Wdq68t3Z48g=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		aKl69gJlyfJgPOwqSecKI0+pSLQ=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		1xwVvqvupU0VuIr+Wdq68t3Z48g=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
+		<data>
+		ISWOUR3+UekY0g7gRDhmj6/XL4E=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<data>
+		sTxMwgzj8lPg1mReAjh4O8sU//Y=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
+		<data>
+		oYzveTaCQIPTsboWSeE230LKzFw=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		2wKVgX9bf9smcxWt4qsXnZdAKWs=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		oYzveTaCQIPTsboWSeE230LKzFw=
+		</data>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
+		<data>
+		O1zUVkGeWC1cX19VF+jf8uzJ4gQ=
+		</data>
+		<key>Modules/module.modulemap</key>
+		<data>
+		Ieafy8Vyy1IYBwALA9nolFKH+2c=
+		</data>
+		<key>PrivacyInfo.xcprivacy</key>
+		<data>
+		S+cZ+F4+uaR8+vJWU59/hSnJEOo=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/CrowdConnectedShared-Swift.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			fGaESR4C9RlezIIL9YnCMUEbutiPxTWrUYGnUAbiXJE=
+			</data>
+		</dict>
+		<key>Headers/CrowdConnectedShared.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			+Bvylx6hJGf3syQDNz6Lich/UmsteNtD1FrI4QyfIx0=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			sNd7Hk2lscuh1Yt9hHShRBZ9YqDxEL5g/iHQgassUEY=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Tdy2qCUxF6/ZTSNuRXl1QaXiOHTZec1V/necN8JL6O0=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			BOGVkcsgr5O7OGxcF5TOvhin/sckbTxurCWs2PPSmM4=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Tdy2qCUxF6/ZTSNuRXl1QaXiOHTZec1V/necN8JL6O0=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			2wJf6A/acINqIPFZTZRUl7FdE57i7YrAtsT3nGCCs3s=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			sNd7Hk2lscuh1Yt9hHShRBZ9YqDxEL5g/iHQgassUEY=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			bZYHt8JOi1bFPyXa4sQDSBtwvNuLNke6S/Q5uyYCW4w=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			1rYNe+Fpfip+mXfFbBcLITC/eVl2ynZs99pdQa1JXQ8=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			bZYHt8JOi1bFPyXa4sQDSBtwvNuLNke6S/Q5uyYCW4w=
+			</data>
+		</dict>
+		<key>Modules/CrowdConnectedShared.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			GoF71vKwzmwf86ms1mTvGnR4nnme5at5s9xqZaDOwlc=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			OvJDbHuVUk7UUlanm0Z+yX0DeG8vxQb4zGwOAnA7xLo=
+			</data>
+		</dict>
+		<key>PrivacyInfo.xcprivacy</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			ALjgPrONNXR6MChqrc9BhE0g8gwwPpdkq5t8eMbpprc=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/RCTCrowdConnectedLocationProvider.swift

@@ -8,28 +8,33 @@
 
 import CoreLocation
 import CrowdConnectedCore
-import CrowdConnectedCoreBluetooth
-import CrowdConnectedGeo
-import CrowdConnectedIPS
-import CrowdConnectedShared
 import React
 import UIKit
 
 // See example https://github.com/nathvarun/react-native-native-module-swift-tutorial/blob/master/ios/Counter.swift
+@MainActor
 @objc(RCTCrowdConnectedLocationProvider)
-class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDelegate, CrowdConnectedDelegate {
+class RCTCrowdConnectedLocationProvider: RCTEventEmitter, @MainActor CLLocationManagerDelegate {
 
   // MARK: - Properties
 
+  override var methodQueue: DispatchQueue! { .main }
+
   private let locationEventName = "onLocationChange"
   private let locationErrorName = "onLocationError"
 
+  private var updatingResolver: RCTPromiseResolveBlock?
+  private var updatingRejecter: RCTPromiseRejectBlock?
+
   private let ccLocationManager = CrowdConnected.shared
   private let clLocationManager = CLLocationManager()
   private var timeoutTask: Task<Void, Error>?
 
   private var settings: ExpoFpCrowdConnectedLocationProviderSettings?
-  private var providerInfo = ExpoFpProviderInfo()
+  private var providerInfo: ExpoFpProviderInfo {
+    ExpoFpProviderInfo(isLocationUpdating: ccLocationManager.isRunning, deviceId: ccLocationManager.deviceID)
+  }
+
   private var position = ExpoFpPosition() {
     didSet {
       guard providerInfo.isLocationUpdating, let position = try? position.toDict() else { return }
@@ -43,6 +48,8 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
     [locationEventName, locationErrorName]
   }
 
+  @objc override static func requiresMainQueueSetup() -> Bool { true }
+
   @objc func setup(
     _ settings: NSDictionary,
     resolver resolve: @escaping RCTPromiseResolveBlock,
@@ -53,24 +60,12 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
       self.settings = settings
 
       let isLocationUpdating = providerInfo.isLocationUpdating
-      if isLocationUpdating { stopUpdatingLocation({_ in }, rejecter: {_,_,_ in }) }
+      if isLocationUpdating { stopUpdatingLocation(nil, rejecter: nil) }
 
       ccLocationManager.delegate = self
       clLocationManager.delegate = self
 
-      switch settings.navigationType {
-      case .all:
-        CrowdConnectedGeo.activate()
-        CrowdConnectedIPS.activate()
-      case .geo:
-        CrowdConnectedGeo.activate()
-      case .ips:
-        CrowdConnectedIPS.activate()
-      }
-
-      if settings.isBluetoothEnabled {
-        CrowdConnectedCoreBluetooth.activate()
-      }
+      settings.aliases.forEach(ccLocationManager.setAlias)
 
       isLocationUpdating
       ? startUpdatingLocation(resolve, rejecter: reject)
@@ -99,46 +94,27 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
       return
     }
 
-    providerInfo.isLocationUpdating = true
     requestPermission(settings)
-    startCrowdConnected(settings, resolve, reject)
+    startTimeoutTask(resolve, reject)
+    ccLocationManager.start(with: settings.configuration)
+
+    updatingResolver = resolve
+    updatingRejecter = reject
   }
 
-  @objc func stopUpdatingLocation(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+  @objc func stopUpdatingLocation(_ resolve: RCTPromiseResolveBlock?, rejecter reject: RCTPromiseRejectBlock?) {
     stopTimeoutTask()
     ccLocationManager.stop()
     clLocationManager.stopUpdatingHeading()
-    providerInfo.isLocationUpdating = false
-    (try? providerInfo.toDict()).map(resolve)
+    (try? providerInfo.toDict()).map { resolve?($0) }
+    updatingResolver = nil
+    updatingRejecter = nil
   }
 
   @objc func isLocationUpdating(_ resolve: RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) {
     (try? providerInfo.toDict()).map(resolve)
   }
 
-  @objc func didUpdateLocation(_ locations: [Location]) {
-    guard let location = locations.last,
-          let navType = ExpoFpCrowdConnectedNavigationType(rawValue: location.type)
-    else { return }
-
-    position = switch navType {
-    case .ips:
-      ExpoFpPosition(
-        x: location.pixelCoordinates?.xPixels,
-        y: location.pixelCoordinates?.yPixels,
-        z: .index(location.floor),
-        angle: position.angle
-      )
-    default:
-      ExpoFpPosition(
-        z: .index(location.floor),
-        angle: position.angle,
-        lat: location.latitude,
-        lng: location.longitude
-      )
-    }
-  }
-
   func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
     guard position != ExpoFpPosition() else { return }
     position = position.updateHeading(newHeading: newHeading.trueHeading)
@@ -161,56 +137,6 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
     }
   }
 
-  private func startCrowdConnected(
-    _ settings: ExpoFpCrowdConnectedLocationProviderSettings,
-    _ resolve: @escaping RCTPromiseResolveBlock,
-    _ reject: @escaping RCTPromiseRejectBlock
-  ) {
-    startTimeoutTask(resolve, reject)
-
-    ccLocationManager.start(
-      credentials: settings.credentials,
-      trackingMode: settings.trackingMode
-    ) { [weak self] deviceID, result in
-
-      self?.stopTimeoutTask()
-
-      if deviceID != nil {
-        self?.providerInfo.deviceId = deviceID
-      }
-
-      switch result {
-      case .alreadyRunning, .success:
-        if settings.isHeadingEnabled {
-          self?.clLocationManager.startUpdatingHeading()
-        }
-
-        settings.aliases.forEach(CrowdConnected.shared.setAlias)
-        (try? self?.providerInfo.toDict()).map(resolve)
-
-      case .missingAppKey, // will crash the app
-          .missingToken, // will crash the app
-          .missingSecret, // will crash the app
-          .deviceRegistrationFailed,
-          .noModulesAreActive, // will crash the app
-          .missingBluetoothPermissionItem, // will crash the app
-          .missingWhileInUseLocationPermissionItem, // will crash the app
-          .missingAlwaysLocationPermissionItem, // will crash the app
-          .missingLocationBackgroundModeItem, // will crash the app
-          .missingBluetoothBackgroundModeItem: // will crash the app
-        self?.stopUpdatingLocation({_ in }, rejecter: {_,_,_ in })
-
-        let error = ExpoFpError.locationProviderError(message: result.description)
-        self?.rejectWith(error, reject)
-
-      @unknown default:
-        self?.stopUpdatingLocation({_ in }, rejecter: {_,_,_ in })
-        let error = ExpoFpError.locationProviderError(message: "@unknown start result!")
-        self?.rejectWith(error, reject)
-      }
-    }
-  }
-
   private func startTimeoutTask(_ resolve: @escaping RCTPromiseResolveBlock, _ reject: @escaping RCTPromiseRejectBlock) {
     timeoutTask?.cancel()
 
@@ -219,7 +145,7 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
       guard !Task.isCancelled else { return }
 
       self?.sendError(with: "Start Timeout! Restarting...")
-      self?.stopUpdatingLocation({_ in }, rejecter: {_,_,_ in })
+      self?.stopUpdatingLocation(nil, rejecter: nil)
       self?.startUpdatingLocation(resolve, rejecter: reject)
     }
   }
@@ -242,7 +168,54 @@ class RCTCrowdConnectedLocationProvider: RCTEventEmitter, CLLocationManagerDeleg
     sendEvent(withName: locationErrorName, body: message + deviceId)
   }
 
-  private func rejectWith(_ error: Error, _ reject: RCTPromiseRejectBlock) {
-    reject("500", "\(error)", error)
+  private func rejectWith(_ error: Error, _ reject: RCTPromiseRejectBlock?) {
+    reject?("500", "\(error)", error)
+    updatingResolver = nil
+    updatingRejecter = nil
+  }
+}
+
+// MARK: - CrowdConnectedDelegate
+
+extension RCTCrowdConnectedLocationProvider: @MainActor CrowdConnectedDelegate {
+
+  public func locationProvider(_ crowdConnected: CrowdConnected, didStartSuccess deviceId: DeviceID) {
+    stopTimeoutTask()
+
+    guard let settings else {
+      let error = ExpoFpError.locationProviderError(message: "Settings are missing. Use `setup` method first.")
+      rejectWith(error, updatingRejecter)
+      return
+    }
+
+    if settings.isHeadingEnabled {
+      clLocationManager.startUpdatingHeading()
+    }
+
+    (try? providerInfo.toDict()).map { updatingResolver?($0) }
+    updatingResolver = nil
+    updatingRejecter = nil
+  }
+
+  public func locationProvider(_ crowdConnected: CrowdConnected, didStartFailure errorCode: ErrorCode) {
+    let error = ExpoFpError.locationProviderError(message: errorCode.description)
+    rejectWith(error, updatingRejecter)
+    stopUpdatingLocation(nil, rejecter: nil)
+  }
+
+  public func locationProvider(_ crowdConnected: CrowdConnected, didUpdateLocation location: Location) {
+    position = location.type == "IPS"
+    ? ExpoFpPosition(
+      x: location.pixelCoordinates?.xPixels,
+      y: location.pixelCoordinates?.yPixels,
+      z: .index(location.floor),
+      angle: position.angle
+    )
+    : ExpoFpPosition(
+      z: .index(location.floor),
+      angle: position.angle,
+      lat: location.latitude,
+      lng: location.longitude
+    )
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/react-native-efp-crowdconnected",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "React Native wrapper for ExpoFP around CrowdConnected SDK",
   "keywords": [
     "react-native",